diff options
Diffstat (limited to 'puppet/modules')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/init.pp | 3 | ||||
-rw-r--r-- | puppet/modules/site_mx/manifests/init.pp | 1 | ||||
-rw-r--r-- | puppet/modules/site_nagios/manifests/init.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_nickserver/manifests/init.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_openvpn/manifests/init.pp | 2 | ||||
-rw-r--r-- | puppet/modules/site_tor/manifests/init.pp | 3 | ||||
-rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 2 |
7 files changed, 13 insertions, 2 deletions
diff --git a/puppet/modules/site_couchdb/manifests/init.pp b/puppet/modules/site_couchdb/manifests/init.pp index 6bc4f6a3..f4f93828 100644 --- a/puppet/modules/site_couchdb/manifests/init.pp +++ b/puppet/modules/site_couchdb/manifests/init.pp @@ -31,7 +31,8 @@ class site_couchdb { class { 'couchdb::bigcouch::package::cloudant': } - Class ['couchdb::bigcouch::package::cloudant'] + Class['site_config::default'] + -> Class ['couchdb::bigcouch::package::cloudant'] -> Service ['couchdb'] -> Class ['site_couchdb::bigcouch::add_nodes'] -> Couchdb::Create_db['users'] diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index 4cf3f41a..3d8469fd 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -1,5 +1,6 @@ class site_mx { tag 'leap_service' + Class['site_config::default'] -> Class['site_mx'] include site_postfix::mx include site_mx::haproxy diff --git a/puppet/modules/site_nagios/manifests/init.pp b/puppet/modules/site_nagios/manifests/init.pp index cab32905..c3cfa02e 100644 --- a/puppet/modules/site_nagios/manifests/init.pp +++ b/puppet/modules/site_nagios/manifests/init.pp @@ -1,4 +1,6 @@ class site_nagios { tag 'leap_service' + Class['site_config::default'] -> Class['site_nagios'] + include site_nagios::server } diff --git a/puppet/modules/site_nickserver/manifests/init.pp b/puppet/modules/site_nickserver/manifests/init.pp index 153355f1..45503d8a 100644 --- a/puppet/modules/site_nickserver/manifests/init.pp +++ b/puppet/modules/site_nickserver/manifests/init.pp @@ -11,6 +11,8 @@ class site_nickserver { tag 'leap_service' + Class['site_config::default'] -> Class['site_nickserver'] + include site_config::ruby # diff --git a/puppet/modules/site_openvpn/manifests/init.pp b/puppet/modules/site_openvpn/manifests/init.pp index b2bb0d3a..fe5ef87f 100644 --- a/puppet/modules/site_openvpn/manifests/init.pp +++ b/puppet/modules/site_openvpn/manifests/init.pp @@ -20,6 +20,8 @@ class site_openvpn { tag 'leap_service' + Class['site_config::default'] -> Class['site_openvpn'] + $openvpn_config = hiera('openvpn') $x509_config = hiera('x509') $openvpn_ports = $openvpn_config['ports'] diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp index ac830f0d..16ee4c30 100644 --- a/puppet/modules/site_tor/manifests/init.pp +++ b/puppet/modules/site_tor/manifests/init.pp @@ -1,6 +1,7 @@ class site_tor { tag 'leap_service' - + Class['site_config::default'] -> Class['site_tor'] + $tor = hiera('tor') $bandwidth_rate = $tor['bandwidth_rate'] $tor_type = $tor['type'] diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index b4d5bb14..97a75010 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -11,6 +11,8 @@ class site_webapp { $api_version = $webapp['api_version'] $secret_token = $webapp['secret_token'] + Class['site_config::default'] -> Class['site_webapp'] + include site_config::ruby include site_webapp::apache include site_webapp::couchdb |