X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fconfiguration.rb;h=c9bf9ea3e04fbd5959fee48b3ad361adaf93b02e;hp=43ef03b3e726f5fd694b44c6bac1a4416a0e5d52;hb=41b5e74bedf1def1ef22cd77ed26d87fae859a13;hpb=7f8654ed6582062a295e1be75ae70e99de41b323

diff --git a/lib/common/configuration.rb b/lib/common/configuration.rb
index 43ef03b..c9bf9ea 100644
--- 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|
@@ -49,7 +49,11 @@ class Configuration
     d['postfixadmin_dbpass'] = ''
     d['postfixadmin_dbname'] = 'postfixadmin'
 
-    d['plugins'] = ['postfixadmin', 'dovecot', 'roundcube']
+    d['plugins'] = ['postfixadmin',
+                    'dovecot',
+                    'roundcube',
+                    'agendav',
+                    'davical']
 
     d['mail_root'] = '/var/spool/mail/vhosts'