diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/site.pp | 10 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/eip.pp | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index 5f58a733..3ae9ebea 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -4,7 +4,7 @@ node 'default' { # $concat_basedir = '/var/lib/puppet/modules/concat' # do we need this ? include concat::setup include apt, lsb, git - import "common" + import 'common' $services=hiera_array('services') notice("Services for $fqdn: $services") @@ -18,13 +18,7 @@ node 'default' { if 'eip' in $services { - include site_openvpn - - $tor=hiera('tor') - notice("Tor enabled: $tor") - - $openvpn_configs=hiera('openvpn_server_configs') - create_resources('site_openvpn::server_config', $openvpn_configs) + include site_config::eip } } diff --git a/puppet/modules/site_config/manifests/eip.pp b/puppet/modules/site_config/manifests/eip.pp new file mode 100644 index 00000000..56eb1452 --- /dev/null +++ b/puppet/modules/site_config/manifests/eip.pp @@ -0,0 +1,10 @@ +class site_config::eip { + include site_openvpn + + $tor=hiera('tor') + notice("Tor enabled: $tor") + + $openvpn_configs=hiera('openvpn_server_configs') + create_resources('site_openvpn::server_config', $openvpn_configs) + +} |