X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fconfiguration.rb;h=02c30d252b796073587ee961011a02ccbebb1936;hp=738dc8c32c9180ebf835618ae893b8cff3dc96d5;hb=HEAD;hpb=853aaef812f6e23f17d3e24db99dfbaadafdbddf

diff --git a/lib/common/configuration.rb b/lib/common/configuration.rb
index 738dc8c..78f5c04 100644
--- a/lib/common/configuration.rb
+++ b/lib/common/configuration.rb
@@ -1,9 +1,9 @@
 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.
+# in <tt>$XDG_CONFIG_HOME/mailshears/mailshears.conf.yml</tt>. The
+# configuration options can be accessed via methods even though the
+# internal representation is a hash.
 #
 # === Examples
 #
@@ -13,21 +13,26 @@ require 'yaml'
 #
 class Configuration
 
-  # The default path to the user's configuration file.
-  USERCONF_PATH = ENV['HOME'] + '/.mailshears.conf.yml'
-
   # The hash structure in which we store our configuration options
   # internally.
   @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.
+  #   load. We check for a file named "mailshears.conf.yml" in the
+  #   user's XDG configuration directory by default.
   #
-  def initialize(path = USERCONF_PATH)
+  def initialize(path = nil)
+    if path.nil? then
+        # The default path to the user's configuration file.
+      path = ENV['HOME'] + '/.config'
+      if ENV.has_key?('XDG_CONFIG_HOME') then
+        path = ENV['XDG_CONFIG_HOME']
+      end
+      path += '/mailshears/mailshears.conf.yml'
+    end
+
     cfg = default_configuration()
 
     # Now, load the user configuration which will override the
@@ -76,13 +81,6 @@ class Configuration
     d['i_mean_business'] = false
     d['plugins'] = ['postfixadmin']
 
-    d['agendav_dbhost'] = 'localhost'
-    d['agendav_dbport'] = 5432
-    d['agendav_dbopts'] = ''
-    d['agendav_dbuser'] = 'postgres'
-    d['agendav_dbpass'] = ''
-    d['agendav_dbname'] = 'agendav'
-
     d['davical_dbhost'] = 'localhost'
     d['davical_dbport'] = 5432
     d['davical_dbopts'] = ''