diff options
| author | varac <varacanero@zeromail.org> | 2015-04-13 23:16:00 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-01-22 09:50:33 +0100 |
| commit | 150579fb14716892cc3e4d7d9c0f81b30d56f03a (patch) | |
| tree | 1cec18fffe6d70edd64696802cba264693f38ff5 /puppet/modules/site_openvpn/manifests/init.pp | |
| parent | d87a8787908fb1c82901d9611a971c9bed0a3907 (diff) | |
restructured site.pp, now only one class gets included in site.pp per service (Bug #6851)
Also, moved global Exec{} defaults to site.pp
Change-Id: I9ae91b77afde944d2f1312613b9d9030e32239dd
Diffstat (limited to 'puppet/modules/site_openvpn/manifests/init.pp')
| -rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index ede35a9e..4777464e 100644 --- a/puppet/modules/site_openvpn/manifests/init.pp +++ b/puppet/modules/site_openvpn/manifests/init.pp @@ -24,9 +24,11 @@ class site_openvpn { include site_config::x509::key include site_config::x509::ca_bundle - + include site_config::default Class['site_config::default'] -> Class['site_openvpn'] + include ::site_obfsproxy + $openvpn = hiera('openvpn') $openvpn_ports = $openvpn['ports'] $openvpn_config = $openvpn['configuration'] |