Make "postfixadmin" the only default plugin and make dovecot_mail_root safer.

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

diff --git a/lib/common/configuration.rb b/lib/common/configuration.rb
index c9bf9ea3e04fbd5959fee48b3ad361adaf93b02e..02c30d252b796073587ee961011a02ccbebb1936 100644 (file)
--- a/lib/common/configuration.rb
+++ b/lib/common/configuration.rb
@@ -1,10 +1,32 @@
 require 'yaml'
 
 require 'yaml'
 

+# A configuration object that knows how to read options out of a file
+# in <tt>~/.mailshears.conf.yml</tt>. The configuration options can be
+# accessed via methods even though the internal representation is a
+# hash.
+#
+# === Examples
+#
+#   >> cfg = Configuration.new()
+#   >> cfg.i_mean_business()
+#   => true
+#

 class Configuration
 
 class Configuration
 

+  # The default path to the user's configuration file.

   USERCONF_PATH = ENV['HOME'] + '/.mailshears.conf.yml'
   USERCONF_PATH = ENV['HOME'] + '/.mailshears.conf.yml'

+
+  # The hash structure in which we store our configuration options
+  # internally.

   @dict = {}
 
   @dict = {}
 

+
+  # Initialize a {Configuration} object with the config file at *path*.
+  #
+  # @param path [String] the path to the configuration file to
+  #   load. We check for a file named ".mailshears.conf.yml" in the
+  #   user's home directory by default.
+  #

   def initialize(path = USERCONF_PATH)
     cfg = default_configuration()
 
   def initialize(path = USERCONF_PATH)
     cfg = default_configuration()
 


@@ -28,42 +50,31 @@ class Configuration
   end
 
 
   end
 
 

+  # Replace all missing method calls with hash lookups. This lets us
+  # retrieve the values in our option hash by using methods named
+  # after the associated keys.
+  #
+  # @param sym [Symbol] the method that was called.
+  #
+  # @return [Object] the config file value associated with *sym*.
+  #

   def method_missing(sym, *args)
   def method_missing(sym, *args)

-    # Replace all missing method calls with dictionary lookups.

     return @dict[sym]
   end
 
 
   private;
 
     return @dict[sym]
   end
 
 
   private;
 

+
+  # A default config hash.
+  #
+  # @return [Hash] sensible default configuration values.
+  #

   def default_configuration()
     d = {}
 
     d['i_mean_business'] = false
   def default_configuration()
     d = {}
 
     d['i_mean_business'] = false

-
-    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'
-
-    d['roundcube_dbhost'] = 'localhost'
-    d['roundcube_dbport'] = 5432
-    d['roundcube_dbopts'] = ''
-    d['roundcube_dbtty'] = ''
-    d['roundcube_dbuser'] = 'postgres'
-    d['roundcube_dbpass'] = ''
-    d['roundcube_dbname'] = 'roundcube'
+    d['plugins'] = ['postfixadmin']

 
     d['agendav_dbhost'] = 'localhost'
     d['agendav_dbport'] = 5432
 
     d['agendav_dbhost'] = 'localhost'
     d['agendav_dbport'] = 5432


@@ -81,6 +92,24 @@ class Configuration
     d['davical_dbpass'] = ''
     d['davical_dbname'] = 'davical'
 
     d['davical_dbpass'] = ''
     d['davical_dbname'] = 'davical'
 

+    d['dovecot_mail_root'] = '/tmp/mailshears-test'
+
+    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['roundcube_dbhost'] = 'localhost'
+    d['roundcube_dbport'] = 5432
+    d['roundcube_dbopts'] = ''
+    d['roundcube_dbtty'] = ''
+    d['roundcube_dbuser'] = 'postgres'
+    d['roundcube_dbpass'] = ''
+    d['roundcube_dbname'] = 'roundcube'
+

     return d
   end
 
     return d
   end