X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fconfiguration.rb;h=c9bf9ea3e04fbd5959fee48b3ad361adaf93b02e;hp=f9a07bf1f7c81df2b5166991cb9d20dcfb7c2131;hb=650e23790019880da91c7c7248a214a13763fd3e;hpb=c6cab6b71770d14dad1115db90a00b990c44a58d

diff --git a/lib/common/configuration.rb b/lib/common/configuration.rb
index f9a07bf..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|
@@ -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['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'] = ['dovecot_mailstore', 'roundcube_db']
+    d['plugins'] = ['postfixadmin',
+                    'dovecot',
+                    'roundcube',
+                    'agendav',
+                    'davical']
 
     d['mail_root'] = '/var/spool/mail/vhosts'
 
@@ -61,6 +65,22 @@ class Configuration
     d['roundcube_dbpass'] = ''
     d['roundcube_dbname'] = 'roundcube'
 
+    d['agendav_dbhost'] = 'localhost'
+    d['agendav_dbport'] = 5432
+    d['agendav_dbopts'] = ''
+    d['agendav_dbtty'] = ''
+    d['agendav_dbuser'] = 'postgres'
+    d['agendav_dbpass'] = ''
+    d['agendav_dbname'] = 'agendav'
+
+    d['davical_dbhost'] = 'localhost'
+    d['davical_dbport'] = 5432
+    d['davical_dbopts'] = ''
+    d['davical_dbtty'] = ''
+    d['davical_dbuser'] = 'postgres'
+    d['davical_dbpass'] = ''
+    d['davical_dbname'] = 'davical'
+
     return d
   end