New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
decoupled openvpn-ldap-auth package from additional packages. #247
Changes from 4 commits
131ff16
7edc281
958edd0
a2b8ca5
2861df1
90f8bc3
e7965d5
81f3bdf
b253943
115526b
55cddc1
88cce19
aa43843
f57b1f1
e115f23
9a1ab7d
75353a3
131fa6e
db8a1bf
2217592
d52f545
d8ed6a8
9b711d5
eace060
abbd32b
7547553
42a5770
45aa029
0537b0c
43cf1b1
c7759f3
bddfaef
3e8ab63
e991fb9
13f5ddd
d0fd9f3
ff5cd1d
e1e063c
9f3eb23
085eb26
652f33a
e77dad3
9d3569a
271683a
0fda65e
d595d2d
224dab1
79c2eea
47dc7c8
e45abb3
a5c50af
7451c63
0d80e1a
2f26544
f35ff82
64072b7
fe4c95d
30fbaf5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,11 +29,13 @@ | |
# Redhat/Centos >= 7.0 | ||
if(versioncmp($::operatingsystemrelease, '7.0') >= 0) and $::operatingsystem != 'Amazon' { | ||
$additional_packages = ['easy-rsa'] | ||
$ldap_auth_plugin_location = undef | ||
$ldap_auth_plugin_package = ['openvpn-auth-ldap'] | ||
$ldap_auth_plugin_location = '/usr/lib64/openvpn/plugin/lib/openvpn-auth-ldap.so' | ||
$systemd = true | ||
# Redhat/Centos == 6.0 | ||
} elsif(versioncmp($::operatingsystemrelease, '6.0') >= 0) and $::operatingsystem != 'Amazon' { | ||
$additional_packages = ['easy-rsa','openvpn-auth-ldap'] | ||
$additional_packages = ['easy-rsa'] | ||
$ldap_auth_plugin_package = ['openvpn-auth-ldap'] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please also do this for the other OS-variants, for consistency. |
||
$ldap_auth_plugin_location = '/usr/lib64/openvpn/plugin/lib/openvpn-auth-ldap.so' | ||
$systemd = false | ||
# Redhat/Centos < 6.0 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -478,6 +478,7 @@ | |
$ldap_tls_ca_cert_dir = '', | ||
$ldap_tls_client_cert_file = '', | ||
$ldap_tls_client_key_file = '', | ||
$ldap_auth_plugin_package = '', | ||
$ca_expire = 3650, | ||
$key_expire = 3650, | ||
$key_cn = '', | ||
|
@@ -679,6 +680,9 @@ | |
} | ||
|
||
if $ldap_enabled == true { | ||
package {$openvpn::params::ldap_auth_plugin_package: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you add ldap_auth_plugin_package as additional param to the server class? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi, yeah sure. Thanks! |
||
ensure => present, | ||
} | ||
file { | ||
"${etc_directory}/openvpn/${name}/auth/ldap.conf": | ||
ensure => present, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does it need to be a an array or should we stick with a string? I think string is enough.