diff options
Diffstat (limited to 'puppet/modules')
-rw-r--r-- | puppet/modules/site_ca_daemon/manifests/init.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_config/manifests/default.pp (renamed from puppet/modules/site_config/manifests/init.pp) | 7 | ||||
-rw-r--r-- | puppet/modules/site_config/manifests/hosts.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_config/manifests/resolvconf.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_config/manifests/slow.pp | 6 | ||||
-rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_nagios/manifests/init.pp | 4 | ||||
-rw-r--r-- | puppet/modules/site_nagios/manifests/server/purge.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 1 | ||||
-rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 2 |
10 files changed, 20 insertions, 10 deletions
diff --git a/puppet/modules/site_ca_daemon/manifests/init.pp b/puppet/modules/site_ca_daemon/manifests/init.pp index 4ec5b00b..c00a22c8 100644 --- a/puppet/modules/site_ca_daemon/manifests/init.pp +++ b/puppet/modules/site_ca_daemon/manifests/init.pp @@ -1,5 +1,5 @@ class site_ca_daemon { - + tag 'service' #$definition_files = hiera('definition_files') #$provider = $definition_files['provider'] #$eip_service = $definition_files['eip_service'] diff --git a/puppet/modules/site_config/manifests/init.pp b/puppet/modules/site_config/manifests/default.pp index f0ce9856..577970ca 100644 --- a/puppet/modules/site_config/manifests/init.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -1,4 +1,6 @@ -class site_config { +class site_config::default { + tag 'base' + $domain_hash = hiera('domain') # default class, used by all hosts @@ -23,7 +25,4 @@ class site_config { stage => initial, } - class { 'site_apt::dist_upgrade': - stage => initial, - } } diff --git a/puppet/modules/site_config/manifests/hosts.pp b/puppet/modules/site_config/manifests/hosts.pp index a5f1b105..6c00f3b6 100644 --- a/puppet/modules/site_config/manifests/hosts.pp +++ b/puppet/modules/site_config/manifests/hosts.pp @@ -3,7 +3,7 @@ class site_config::hosts() { $hosts = hiera('hosts','') $hostname = hiera('name') - $domain_public = $site_config::domain_hash['full_suffix'] + $domain_public = $site_config::default::domain_hash['full_suffix'] file { "/etc/hostname": ensure => present, diff --git a/puppet/modules/site_config/manifests/resolvconf.pp b/puppet/modules/site_config/manifests/resolvconf.pp index b803f17e..d73f0b78 100644 --- a/puppet/modules/site_config/manifests/resolvconf.pp +++ b/puppet/modules/site_config/manifests/resolvconf.pp @@ -11,7 +11,7 @@ class site_config::resolvconf { ensure => absent; } - $domain_public = $site_config::domain_hash['full_suffix'] + $domain_public = $site_config::default::domain_hash['full_suffix'] # 127.0.0.1: caching-only local bind # 87.118.100.175: http://server.privacyfoundation.de diff --git a/puppet/modules/site_config/manifests/slow.pp b/puppet/modules/site_config/manifests/slow.pp new file mode 100644 index 00000000..a4a9f19f --- /dev/null +++ b/puppet/modules/site_config/manifests/slow.pp @@ -0,0 +1,6 @@ +class site_config::slow { + + class { 'site_apt::dist_upgrade': + stage => initial, + } +} diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 04f2ca1a..632df799 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -1,5 +1,5 @@ class site_couchdb { - + tag 'service' include couchdb $x509 = hiera('x509') diff --git a/puppet/modules/site_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp new file mode 100644 index 00000000..57da3011 --- /dev/null +++ b/puppet/modules/site_nagios/manifests/init.pp @@ -0,0 +1,4 @@ +class site_nagios { + tag 'service' + include site_nagios::server +} diff --git a/puppet/modules/site_nagios/manifests/server/purge.pp b/puppet/modules/site_nagios/manifests/server/purge.pp index 66c27dd5..39735cd3 100644 --- a/puppet/modules/site_nagios/manifests/server/purge.pp +++ b/puppet/modules/site_nagios/manifests/server/purge.pp @@ -1,6 +1,6 @@ class site_nagios::server::purge { exec {'purge_conf.d': - command => '/bin/rm -rf /etc/nagios3/conf.d', + command => '/bin/rm -rf /etc/nagios3/conf.d/*', onlyif => 'test -e /etc/nagios3/conf.d' } diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index 0ddb01ae..df4277cd 100644 --- a/puppet/modules/site_openvpn/manifests/init.pp +++ b/puppet/modules/site_openvpn/manifests/init.pp @@ -1,4 +1,5 @@ class site_openvpn { + tag 'service' # parse hiera config $ip_address = hiera('ip_address') $interface = getvar("interface_${ip_address}") diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index c7d918ae..d1951dcd 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -1,5 +1,5 @@ class site_webapp { - + tag 'service' $definition_files = hiera('definition_files') $provider = $definition_files['provider'] $eip_service = $definition_files['eip_service'] |