Enhanced postfixadmin configuration

diff --git a/manifests/system.pp b/manifests/system.pp
index f5008a7cba01c3b506c6a7d85e919269fd4f4e6b..b018fc1d21de77f30dadbac08f1592db6f91400d 100644 (file)
--- a/manifests/system.pp
+++ b/manifests/system.pp
@@ -11,6 +11,12 @@ class mail::system {
     '': { fail("You need to define \$postfixadmin_database_password host config") }
   }
 
+  case $postfixadmin_setup_hash {
+    '': {
+      warning("You need to define \$postfixadmin_setup_hash host config")
+      $postfixadmin_setup_hash = 'changeme'
+    }
+  }
   case $postfixadmin_database_user {
     '': { $postfixadmin_database_user = "postfix" }
   }

diff --git a/templates/postfixadmin/config.inc.php.erb b/templates/postfixadmin/config.inc.php.erb
index fce9039295a4dca948e5dd8f4f0164474c0da2fa..d694b90838baba8a3d5ca50a4d5236043039352d 100644 (file)
--- a/templates/postfixadmin/config.inc.php.erb
+++ b/templates/postfixadmin/config.inc.php.erb
@@ -28,7 +28,7 @@ $CONF['configured'] = true;
 // In order to setup Postfixadmin, you MUST specify a hashed password here.
 // To create the hash, visit setup.php in a browser and type a password into the field,
 // on submission it will be echoed out to you as a hashed value.
-$CONF['setup_password'] = 'changeme';
+$CONF['setup_password'] = '<%= postfixadmin_setup_hash %>';
 
 // Postfix Admin Path
 // Set the location of your Postfix Admin installation here.
@@ -80,7 +80,7 @@ $CONF['database_tables'] = array (
 // Site Admin
 // Define the Site Admins email address below.
 // This will be used to send emails from to create mailboxes.
-$CONF['admin_email'] = 'postmaster@change-this-to-your.domain.tld';
+$CONF['admin_email'] = 'postmaster@<%= domain %>';
 
 // Mail Server
 // Hostname (FQDN) of your mail server.
@@ -131,10 +131,10 @@ $CONF['page_size'] = '10';
 // Default Aliases
 // The default aliases that need to be created for all domains.
 $CONF['default_aliases'] = array (
-    'abuse' => 'abuse@change-this-to-your.domain.tld',
-    'hostmaster' => 'hostmaster@change-this-to-your.domain.tld',
-    'postmaster' => 'postmaster@change-this-to-your.domain.tld',
-    'webmaster' => 'webmaster@change-this-to-your.domain.tld'
+    'abuse' => 'abuse@<%= domain %>',
+    'hostmaster' => 'hostmaster@<%= domain %>',
+    'postmaster' => 'postmaster@<%= domain %>',
+    'webmaster' => 'webmaster@<%= domain %>'
 );
 
 // Mailboxes
@@ -214,7 +214,7 @@ $CONF['vacation'] = 'NO';
 // This is the autoreply domain that you will need to set in your Postfix
 // transport maps to handle virtual vacations. It does not need to be a
 // real domain (i.e. you don't need to setup DNS for it).
-$CONF['vacation_domain'] = 'autoreply.change-this-to-your.domain.tld';
+$CONF['vacation_domain'] = 'autoreply.<%= domain %>';
 
 // Vacation Control
 // If you want users to take control of vacation set this to 'YES'.
@@ -279,7 +279,7 @@ $CONF['show_header_text'] = 'NO';
 $CONF['header_text'] = ':: Postfix Admin ::';
 
 // link to display under 'Main' menu when logged in as a user.
-$CONF['user_footer_link'] = "http://change-this-to-your.domain.tld/main";
+$CONF['user_footer_link'] = "http://<%= domain %>/main";
 
 // Footer
 // Below information will be on all pages.