File tree Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Expand file tree Collapse file tree 3 files changed +9
-1
lines changed Original file line number Diff line number Diff line change 1212#  @param arch Architecture of consul binary to download
1313#  @param archive_path Path used when installing consul via the url
1414#  @param bash_completion Whether to setup bash completion. Adjust bin_dir when install_method == package.
15+ #  @param bash_completion_compat_dir Directory to place bash-completion file for Consul into.
1516#  @param bin_dir Directory to create the symlink to the consul binary in.
1617#  @param binary_group The group that the file belongs to.
1718#  @param binary_mode Permissions mode for the file.
9798  String[1]                             $arch                         = $consul::params::arch ,
9899  Optional[Stdlib::Absolutepath]        $archive_path                 = undef ,
99100  Boolean                               $bash_completion              = $consul::params::bash_completion ,
101+   String[1]                             $bash_completion_compat_dir   = $consul::params::bash_completion_compat_dir ,
100102  Stdlib::Absolutepath                  $bin_dir                      = $consul::params::bin_dir ,
101103  Optional[String[1]]                   $binary_group                 = $consul::params::binary_group ,
102104  String[1]                             $binary_mode                  = $consul::params::binary_mode ,
Original file line number Diff line number Diff line change 121121  }
122122
123123  if  ($consul::bash_completion ) and ($consul::install_method  != ' docker'   ) {
124-       file  { '/etc/bash_completion.d/consul' :
124+ 
125+       file  { $consul::bash_completion_compat_dir :
126+         ensure  => ' directory'  ,
127+       }
128+ 
129+       file  { "${consul::bash_completion_compat_dir}/consul" :
125130        ensure   => file ,
126131        owner    => ' root'  ,
127132        group    => ' root'  ,
Original file line number Diff line number Diff line change 4747    default:  {
4848      #  0 instead of root because OS X uses "wheel".
4949      $data_dir_mode  = ' 0755' 
50+       $bash_completion_compat_dir  = ' /etc/bash_completion.d/' 
5051      $binary_group  = ' 0' 
5152      $binary_mode  = ' 0555' 
5253      $binary_name  = ' consul' 
    
 
   
 
     
   
   
          
     
  
    
     
 
    
      
     
 
     
    You can’t perform that action at this time.
  
 
    
  
     
    
      
        
     
 
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments