Merge pull request #215 from miguelwhite/master

Add rhel6 support for ldap auth plugin
voxpupuli · Feb 13, 2017 · f987b14 · f987b14
2 parents 3a59c68 + d337aba
commit f987b14
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -311,7 +311,7 @@
         Concat["${etc_directory}/openvpn/${server}/download-configs/${name}.ovpn"],
         File["${etc_directory}/openvpn/${server}/download-configs/${name}.tblk"],
       ],
-      before =>  Exec["tar the thing ${server} with ${name}"];
+      before  =>  Exec["tar the thing ${server} with ${name}"];
   }
 
   file { "${etc_directory}/openvpn/${server}/download-configs/${name}/${name}.conf":

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -23,19 +23,25 @@
       $group               = 'nobody'
       $link_openssl_cnf    = true
       $pam_module_path     = '/usr/lib64/openvpn/plugin/lib/openvpn-auth-pam.so'
-      $additional_packages = ['easy-rsa']
       $easyrsa_source      = '/usr/share/easy-rsa/2.0'
       $namespecific_rclink = false
 
       # Redhat/Centos >= 7.0
       if(versioncmp($::operatingsystemrelease, '7.0') >= 0) and $::operatingsystem != 'Amazon' {
+        $additional_packages = ['easy-rsa']
+        $ldap_auth_plugin_location = undef
         $systemd = true
-      # Redhat/Centos < 7
+      # Redhat/Centos == 6.0
+      } elsif(versioncmp($::operatingsystemrelease, '6.0') >= 0) and $::operatingsystem != 'Amazon' {
+        $additional_packages = ['easy-rsa','openvpn-auth-ldap']
+        $ldap_auth_plugin_location = '/usr/lib64/openvpn/plugin/lib/openvpn-auth-ldap.so'
+        $systemd = false
+      # Redhat/Centos < 6.0
       } else {
+        $additional_packages = ['easy-rsa']
+        $ldap_auth_plugin_location = undef
         $systemd = false
       }
-
-      $ldap_auth_plugin_location = undef # no ldap plugin on redhat/centos
     }
     'Debian': { # Debian/Ubuntu
       $etc_directory       = '/etc'