diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2010-08-08 00:53:32 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2010-08-08 00:53:32 -0300 |
| commit | f9b0480e5bd251275325a0c317d910a8b531ebe7 (patch) | |
| tree | fe3bc8136df4256e2608fd9147b902c1987b55c9 /manifests | |
| parent | 920b30eb9ec9fd974b5db63aaacbb731c55bba66 (diff) | |
| download | puppet-mail-f9b0480e5bd251275325a0c317d910a8b531ebe7.tar.gz puppet-mail-f9b0480e5bd251275325a0c317d910a8b531ebe7.tar.bz2 | |
Moving postfixadmin variables to system.pp
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/postfixadmin.pp | 16 | ||||
| -rw-r--r-- | manifests/system.pp | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/manifests/postfixadmin.pp b/manifests/postfixadmin.pp index d410539..e1ab73b 100644 --- a/manifests/postfixadmin.pp +++ b/manifests/postfixadmin.pp @@ -2,22 +2,6 @@ class mail::postfixadmin { # # Database configuration # - case $postfixadmin_password { - '': { fail("You need to define \$postfixadmin_password host config") } - } - - case $postfixadmin_user { - '': { $postfixadmin_user = "postfix" } - } - - case $postfixadmin_hosts { - '': { $postfixadmin_hosts = "localhost" } - } - - case $postfixadmin_dbname { - '': { $postfixadmin_dbname= "postfix" } - } - database::instance { "$postfixadmin_dbname": password => "$postfixadmin_password", } diff --git a/manifests/system.pp b/manifests/system.pp index 1c2a4d5..b6db2d2 100644 --- a/manifests/system.pp +++ b/manifests/system.pp @@ -7,6 +7,22 @@ class mail::system { '': { $postfix_mynetworks = "127.0.0.0/8" } } + case $postfixadmin_password { + '': { fail("You need to define \$postfixadmin_password host config") } + } + + case $postfixadmin_user { + '': { $postfixadmin_user = "postfix" } + } + + case $postfixadmin_hosts { + '': { $postfixadmin_hosts = "localhost" } + } + + case $postfixadmin_dbname { + '': { $postfixadmin_dbname= "postfix" } + } + # Module requirements include postfix include database |