diff options
| author | Micah Anderson <micah@riseup.net> | 2016-11-04 10:54:28 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2016-11-04 10:54:28 -0400 |
| commit | 34a381efa8f6295080c843f86bfa07d4e41056af (patch) | |
| tree | 9282cf5d4c876688602705a7fa0002bc4a810bde /puppet/modules/site_mx/manifests | |
| parent | 0a72bc6fd292bf9367b314fcb0347c4d35042f16 (diff) | |
| parent | 5821964ff7e16ca7aa9141bd09a77d355db492a9 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/site_mx/manifests')
| -rw-r--r-- | puppet/modules/site_mx/manifests/init.pp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index a9b0198b..c910a45a 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -1,20 +1,23 @@ +# Configure leap_mx on mx server class site_mx { tag 'leap_service' - Class['site_config::default'] -> Class['site_mx'] + Class['::site_config::default'] -> Class['::site_mx'] - include site_config::default - include site_config::x509::cert - include site_config::x509::key - include site_config::x509::ca - include site_config::x509::client_ca::ca - include site_config::x509::client_ca::key + include ::site_config::default + include ::site_config::x509::cert + include ::site_config::x509::key + include ::site_config::x509::ca + include ::site_config::x509::client_ca::ca + include ::site_config::x509::client_ca::key - include site_stunnel + include ::site_stunnel - include site_postfix::mx - include site_haproxy - include site_shorewall::mx - include site_shorewall::service::smtp - include leap_mx - include site_check_mk::agent::mx + include ::site_postfix::mx + include ::site_haproxy + include ::site_shorewall::mx + include ::site_shorewall::service::smtp + include ::leap_mx + include ::site_check_mk::agent::mx + # install twisted from jessie backports + include ::site_apt::preferences::twisted } |