diff options
| author | elijah <elijah@riseup.net> | 2012-11-22 11:43:23 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2012-11-22 11:43:23 -0800 |
| commit | f3704fc0ac81ca6ccb7e7d19ae931d9c391f3975 (patch) | |
| tree | d74d17c098583de180be140c06b8090be753d106 | |
| parent | 7b803d54a625e13f52a33e1c7a9264b344474df8 (diff) | |
clean up openvpn and x509 paths
| -rw-r--r-- | provider_base/services/openvpn.json | 9 | ||||
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/keys.pp | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/provider_base/services/openvpn.json b/provider_base/services/openvpn.json index 71d1d2c7..15deab70 100644 --- a/provider_base/services/openvpn.json +++ b/provider_base/services/openvpn.json @@ -1,7 +1,9 @@ { "service_type": "user_service", "x509": { - "use": true + "use": true, + "ca_cert": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'", + "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'" }, "openvpn": { "location": "Location Unknown", @@ -9,9 +11,6 @@ "protocols": ["tcp", "udp"], "filter_dns": false, "adblock": false, - "user_ips": false, - "ca_crt": "= file :ca_cert, :missing => 'Certificate Authority. Run `leap init-ca`'", - "ca_key": "= file :ca_key, :missing => 'Certificate Authority. Run `leap init-ca`'", - "dh": "= file :dh_params, :missing => 'Diffie-Hellman parameters. Run `leap init-dh`'" + "user_ips": false } } diff --git a/puppet/modules/site_openvpn/manifests/keys.pp b/puppet/modules/site_openvpn/manifests/keys.pp index e198cbf8..12c1bd8f 100644 --- a/puppet/modules/site_openvpn/manifests/keys.pp +++ b/puppet/modules/site_openvpn/manifests/keys.pp @@ -1,17 +1,12 @@ class site_openvpn::keys { - file { '/etc/openvpn/keys/ca.key': - content => $site_openvpn::openvpn_config['ca_key'], - mode => '0600', - } - file { '/etc/openvpn/keys/ca.crt': - content => $site_openvpn::openvpn_config['ca_crt'], + content => $site_openvpn::x509_config['ca_cert'], mode => '0644', } file { '/etc/openvpn/keys/dh.pem': - content => $site_openvpn::openvpn_config['dh'], + content => $site_openvpn::x509_config['dh'], mode => '0644', } |