Skip to content

Commit 74306f9

Browse files
committed
Remove deprecated source_permissions
1 parent 1bf3b6b commit 74306f9

File tree

1 file changed

+37
-13
lines changed

1 file changed

+37
-13
lines changed

manifests/ca.pp

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,45 @@
6262
mode => '0750'
6363
})
6464

65-
file { "${etc_directory}/openvpn/${name}/easy-rsa" :
66-
ensure => directory,
67-
recurse => true,
68-
links => 'follow',
69-
source_permissions => 'use',
70-
group => 0,
71-
source => "file:${openvpn::easyrsa_source}",
72-
require => File["${etc_directory}/openvpn/${name}"],
73-
}
74-
75-
file { "${etc_directory}/openvpn/${name}/easy-rsa/revoked":
65+
file { "${etc_directory}/openvpn/${name}/easy-rsa":
7666
ensure => directory,
77-
mode => '0750',
7867
recurse => true,
79-
require => File["${etc_directory}/openvpn/${name}/easy-rsa"],
68+
links => 'follow',
69+
ignore => '*.cnf',
70+
owner => 0,
71+
group => 0,
72+
mode => '0755',
73+
source => "file:${openvpn::easyrsa_source}",
74+
require => File["${etc_directory}/openvpn/${name}"],
75+
}
76+
77+
exec { "copy *.cnf files from easyrsa source to ${name}":
78+
command => "cp '${openvpn::easyrsa_source}/'*.cnf .",
79+
cwd => "${etc_directory}/openvpn/${name}/easy-rsa",
80+
unless => 'ls *.cnf',
81+
provider => 'shell',
82+
require => File["${etc_directory}/openvpn/${name}/easy-rsa"],
83+
before => Exec["initca ${name}"];
84+
}
85+
86+
file {
87+
"${etc_directory}/openvpn/${name}/easy-rsa/.rnd":
88+
ensure => present,
89+
owner => 0,
90+
group => 0,
91+
mode => '0600',
92+
require => File["${etc_directory}/openvpn/${name}/easy-rsa"];
93+
"${etc_directory}/openvpn/${name}/easy-rsa/keys":
94+
ensure => directory,
95+
owner => 0,
96+
group => 0,
97+
mode => '0700',
98+
require => File["${etc_directory}/openvpn/${name}/easy-rsa"];
99+
"${etc_directory}/openvpn/${name}/easy-rsa/revoked":
100+
ensure => directory,
101+
mode => '0750',
102+
recurse => true,
103+
require => File["${etc_directory}/openvpn/${name}/easy-rsa"];
80104
}
81105

82106
case $openvpn::easyrsa_version {

0 commit comments

Comments
 (0)