From 2136e15f3e8165cc805dff95844ba0702f5034e5 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Tue, 24 Dec 2013 00:49:23 -0800
Subject: move config file location to /etc/nickserver.yml

---
 CHANGES.md                | 3 +++
 README.md                 | 5 ++---
 lib/nickserver/config.rb  | 2 +-
 lib/nickserver/version.rb | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 CHANGES.md

diff --git a/CHANGES.md b/CHANGES.md
new file mode 100644
index 0000000..c4949c0
--- /dev/null
+++ b/CHANGES.md
@@ -0,0 +1,3 @@
+### version 0.2.2
+
+* move the config file location from /etc/leap/nickserver.yml to /etc/nickserver.yml
\ No newline at end of file
diff --git a/README.md b/README.md
index edeae59..d157af3 100644
--- a/README.md
+++ b/README.md
@@ -67,12 +67,11 @@ Configuration
 ==================================
 
 Nickserver loads the configuration files `config/default.yml` and
-`/etc/leap/nickserver.yml`, if it exists. See `config/default.yml` for the
+`/etc/nickserver.yml`, if it exists. See `config/default.yml` for the
 available options.
 
 The default HKP host is set to https://hkps.pool.sks-keyservers.net. The CA
-for this pool is available here https://sks-keyservers.net/sks-
-keyservers.netCA.pem
+for this pool is available here https://sks-keyservers.net/sks-keyservers.netCA.pem
 
 Usage
 ==================================
diff --git a/lib/nickserver/config.rb b/lib/nickserver/config.rb
index be401f5..31fbfea 100644
--- a/lib/nickserver/config.rb
+++ b/lib/nickserver/config.rb
@@ -4,7 +4,7 @@ module Nickserver
   class Config
     PATHS = [
       File.expand_path('../../../config/default.yml', __FILE__),
-      '/etc/leap/nickserver.yml'
+      '/etc/nickserver.yml'
     ]
 
     class << self
diff --git a/lib/nickserver/version.rb b/lib/nickserver/version.rb
index 1910fe1..fca33a0 100644
--- a/lib/nickserver/version.rb
+++ b/lib/nickserver/version.rb
@@ -1,3 +1,3 @@
 module Nickserver
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end
-- 
cgit v1.2.3