diff options
| -rw-r--r-- | manifests/init.pp | 1 | ||||
| -rw-r--r-- | manifests/postfixadmin.pp | 6 | ||||
| -rw-r--r-- | manifests/system.pp | 2 | ||||
| -rw-r--r-- | manifests/web.pp | 11 |
4 files changed, 13 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d0359dd..2f32cfb 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -10,3 +10,4 @@ import "postfixadmin" import "sasl.pp" import "tls.pp" import "amavisd.pp" +import "web.pp" diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp index 7156bd3..2546225 100644 --- a/manifests/postfixadmin.pp +++ b/manifests/postfixadmin.pp @@ -6,12 +6,6 @@ class mail::postfixadmin { password => "$postfixadmin_password", } - # Web configuration - apache::site { "postfixadmin": - docroot => "${apache_sites_folder}/postfixadmin/site", - use => [ "Site postfixadmin" ], - } - # # Postfix configuration # diff --git a/manifests/system.pp b/manifests/system.pp index ae5b2ed..3e39d68 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -27,7 +27,6 @@ class mail::system { include postfix include database include ssl::mail - include websites::setup # Subsystems include mail::packages @@ -37,6 +36,7 @@ class mail::system { include mail::amavisd include mail::header_checks include mail::postfixadmin + include mail::web # Postfix configuration postfix::config { diff --git a/manifests/web.pp b/manifests/web.pp new file mode 100644 index 0000000..9783a71 --- /dev/null +++ b/manifests/web.pp @@ -0,0 +1,11 @@ +class mail::web inherits websites::setup { + apache::site { "postfixadmin": + docroot => "${apache_sites_folder}/postfixadmin/site", + use => [ "Site postfixadmin" ], + } + + apache::site { "mail": + docroot => "/usr/share/squirrelmail", + source => true, + } +} |