Remove a superclass from DovecotMv that no longer exists.

[mailshears.git] / lib / common / configuration.rb

diff --git a/lib/common/configuration.rb b/lib/common/configuration.rb
index b2a37d01177551cb51c56752e601c7a66f43a976..c9bf9ea3e04fbd5959fee48b3ad361adaf93b02e 100644 (file)
--- a/lib/common/configuration.rb
+++ b/lib/common/configuration.rb
@@ -5,13 +5,13 @@ class Configuration
   USERCONF_PATH = ENV['HOME'] + '/.mailshears.conf.yml'
   @dict = {}
 
-  def initialize()
+  def initialize(path = USERCONF_PATH)
     cfg = default_configuration()
 
     # Now, load the user configuration which will override the
     # variables defined above.
     begin
-      user_config = YAML.load(File.open(USERCONF_PATH))
+      user_config = YAML.load(File.open(path))
 
       # Write our own update() method for Ruby 1.8.
       user_config.each do |key, value|
@@ -41,15 +41,19 @@ class Configuration
 
     d['i_mean_business'] = false
 
-    d['dbhost'] = 'localhost'
-    d['dbport'] = 5432
-    d['dbopts'] = ''
-    d['dbtty'] = ''
-    d['dbuser'] = 'postgres'
-    d['dbpass'] = ''
-    d['dbname'] = 'postfix'
-
-    d['plugins'] = ['dovecot_mailstore', 'roundcube_db']
+    d['postfixadmin_dbhost'] = 'localhost'
+    d['postfixadmin_dbport'] = 5432
+    d['postfixadmin_dbopts'] = ''
+    d['postfixadmin_dbtty'] = ''
+    d['postfixadmin_dbuser'] = 'postgres'
+    d['postfixadmin_dbpass'] = ''
+    d['postfixadmin_dbname'] = 'postfixadmin'
+
+    d['plugins'] = ['postfixadmin',
+                    'dovecot',
+                    'roundcube',
+                    'agendav',
+                    'davical']
 
     d['mail_root'] = '/var/spool/mail/vhosts'