Skip to content
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.

Sign up for GitHub

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

Explicitly specify the path to the easy-rsa vars file #449

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −19
Open

Explicitly specify the path to the easy-rsa vars file #449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions manifests/ca.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,11 @@
}
}
'3.0': {
file { "${server_directory}/${name}/easy-rsa/vars":
$vars_file = "${server_directory}/${name}/easy-rsa/vars"
$environment = [
"EASYRSA_VARS_FILE=${vars_file}",
]
file { $vars_file:
ensure => file,
mode => '0550',
content => epp('openvpn/vars-30.epp',
Expand Down Expand Up @@ -185,28 +189,30 @@
command => './easyrsa --batch init-pki && ./easyrsa --batch build-ca nopass',
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/ca.crt",
environment => $_initca_environment,
environment => $environment + $_initca_environment,
provider => 'shell',
require => File["${server_directory}/${name}/easy-rsa/vars"],
require => File[$vars_file],
}

if ($ssl_key_algo == 'rsa') {
exec { "generate dh param ${name}":
command => './easyrsa --batch gen-dh',
timeout => 20000,
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/dh.pem",
provider => 'shell',
require => Exec["generate server cert ${name}"],
command => './easyrsa --batch gen-dh',
timeout => 20000,
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/dh.pem",
environment => $environment,
provider => 'shell',
require => Exec["generate server cert ${name}"],
}
}

exec { "generate server cert ${name}":
command => "./easyrsa build-server-full '${common_name}' nopass",
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/private/${common_name}.key",
provider => 'shell',
require => Exec["initca ${name}"],
command => "./easyrsa build-server-full '${common_name}' nopass",
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/private/${common_name}.key",
environment => $environment,
provider => 'shell',
require => Exec["initca ${name}"],
}

file { "${server_directory}/${name}/easy-rsa/keys/ca.crt":
Expand All @@ -215,11 +221,12 @@
}

exec { "create crl.pem on ${name}":
command => './easyrsa gen-crl',
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/crl.pem",
provider => 'shell',
require => Exec["generate server cert ${name}"],
command => './easyrsa gen-crl',
cwd => "${server_directory}/${name}/easy-rsa",
creates => "${server_directory}/${name}/easy-rsa/keys/crl.pem",
environment => $environment,
provider => 'shell',
require => Exec["generate server cert ${name}"],
}
-> exec { "copy created crl.pem to ${name} keys directory":
command => "cp ${server_directory}/${name}/easy-rsa/keys/crl.pem ${server_directory}/${name}/crl.pem",
Expand Down