Fix broken nesting in lib/mv/plugins/postfixadmin.rb.

[mailshears.git] / mailshears.example.conf.yml

diff --git a/mailshears.example.conf.yml b/mailshears.example.conf.yml
index fd703ff485183a9eb04eb277fed06058df961a34..0764153c71cdbb7d9ed415990117c13d54af77c3 100644 (file)
--- a/mailshears.example.conf.yml
+++ b/mailshears.example.conf.yml
@@ -1,4 +1,23 @@
 i_mean_business: false
+plugins: [agendav, davical, dovecot, postfixadmin, roundcube]
+
+agendav_dbhost: localhost
+agendav_dbport: 5432
+agendav_dbopts:
+agendav_dbtty:
+agendav_dbuser: postgres
+agendav_dbpass:
+agendav_dbname: agendav
+
+davical_dbhost: localhost
+davical_dbport: 5432
+davical_dbopts:
+davical_dbtty:
+davical_dbuser: postgres
+davical_dbpass:
+davical_dbname: davical
+
+dovecot_mail_root: /var/spool/mail/vhosts
 
 postfixadmin_dbhost: localhost
 postfixadmin_dbport: 5432
@@ -8,10 +27,6 @@ postfixadmin_dbuser: postgres
 postfixadmin_dbpass:
 postfixadmin_dbname: postfixadmin
 
-plugins: [postfixadmin, dovecot, roundcube, agendav, davical]
-
-mail_root: /var/spool/mail/vhosts
-
 roundcube_dbhost: localhost
 roundcube_dbport: 5432
 roundcube_dbopts:
@@ -20,18 +35,3 @@ roundcube_dbuser: postgres
 roundcube_dbpass:
 roundcube_dbname: roundcube
 
-agendav_dbhost: localhost
-agendav_dbport: 5432
-agendav_dbopts:
-agendav_dbtty:
-agendav_dbuser: postgres
-agendav_dbpass:
-agendav_dbname: agendav
-
-davical_dbhost: localhost
-davical_dbport: 5432
-davical_dbopts:
-davical_dbtty:
-davical_dbuser: postgres
-davical_dbpass:
-davical_dbname: davical