diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/postfixadmin.pp | 4 | ||||
| -rw-r--r-- | manifests/system.pp | 16 | ||||
| -rw-r--r-- | manifests/web.pp | 8 |
3 files changed, 18 insertions, 10 deletions
diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp index f5970ae..f2eeb77 100644 --- a/manifests/postfixadmin.pp +++ b/manifests/postfixadmin.pp @@ -2,8 +2,8 @@ class mail::postfixadmin { # # Database configuration # - database::instance { "$postfixadmin_dbname": - password => "$postfixadmin_password", + database::instance { "$postfixadmin_database_name": + password => "$postfixadmin_database_password", } # diff --git a/manifests/system.pp b/manifests/system.pp index 3e39d68..f5008a7 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -7,20 +7,20 @@ class mail::system { '': { $postfix_mynetworks = "127.0.0.0/8" } } - case $postfixadmin_password { - '': { fail("You need to define \$postfixadmin_password host config") } + case $postfixadmin_database_password { + '': { fail("You need to define \$postfixadmin_database_password host config") } } - case $postfixadmin_user { - '': { $postfixadmin_user = "postfix" } + case $postfixadmin_database_user { + '': { $postfixadmin_database_user = "postfix" } } - case $postfixadmin_hosts { - '': { $postfixadmin_hosts = "localhost" } + case $postfixadmin_database_host { + '': { $postfixadmin_database_host = "localhost" } } - case $postfixadmin_dbname { - '': { $postfixadmin_dbname= "postfix" } + case $postfixadmin_database_name { + '': { $postfixadmin_database_name= "postfix" } } # Module requirements diff --git a/manifests/web.pp b/manifests/web.pp index 9783a71..d8bb58a 100644 --- a/manifests/web.pp +++ b/manifests/web.pp @@ -8,4 +8,12 @@ class mail::web inherits websites::setup { docroot => "/usr/share/squirrelmail", source => true, } + + file { "${apache_sites_folder}/postfixadmin/site/config.inc.php": + ensure => present, + owner => root, + mode => 0600, + content => template('mail/postfixadmin/config.inc.php.erb'), + require => File["${apache_sites_folder}/postfixadmin/site"], + } } |