diff options
| author | Varac <varac@leap.se> | 2017-03-15 18:25:41 +0000 |
|---|---|---|
| committer | Varac <varac@leap.se> | 2017-03-15 18:25:41 +0000 |
| commit | 8b9cf218766e0075102db09562293835ab73f432 (patch) | |
| tree | 67ef14ec1748ce68bc9751d2fa0d2a1bf9baf7f1 /puppet/modules/site_mx/manifests | |
| parent | e4a2d54b3571a8f4ce46485db762acbc4b919d84 (diff) | |
| parent | 8c1c4c102936dd779c74d615763e7adef7033ec1 (diff) | |
Merge branch '8144_remove_haproxy' into 'master'
8144 remove haproxy
Closes #8144
See merge request !70
Diffstat (limited to 'puppet/modules/site_mx/manifests')
| -rw-r--r-- | puppet/modules/site_mx/manifests/init.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index c910a45a..5876e555 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -13,7 +13,6 @@ class site_mx { include ::site_stunnel include ::site_postfix::mx - include ::site_haproxy include ::site_shorewall::mx include ::site_shorewall::service::smtp include ::leap_mx |