[couchdb/f20] - default.d/ and local.d/ never worked with couchdb + systemd so we are dropping default.d/ defaul

[Warren Togami]

commit f4f5c04dd44786c99a79e0964aa355a95dd88405
Author: Warren Togami <wtogami at gmail.com>
Date:   Sat Jul 5 22:59:37 2014 -1000

    - default.d/ and local.d/ never worked with couchdb + systemd so we are dropping default.d/
      default.ini and local.ini are reference configuration from upstream.
      Users are meant to add overrides or custom configuration to local.d/*.ini files.
      self.ini is written to by CouchDB itself and overrides the previous *.ini.

 couchdb.service |    2 +-
 couchdb.spec    |   13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/couchdb.service b/couchdb.service
index 4be4d4f..5ae4674 100644
--- a/couchdb.service
+++ b/couchdb.service
@@ -12,7 +12,7 @@ Restart=always
 StartLimitInterval=10
 StartLimitBurst=5
 PIDFile=/var/run/couchdb/couchdb.pid
-ExecStart=/usr/libexec/couchdb +Bd -noinput -sasl errlog_type error +K true +A 4 -couch_ini /etc/couchdb/default.ini /etc/couchdb/default.d/ /etc/couchdb/local.ini /etc/couchdb/local.d/ /etc/couchdb/self.ini -s couch -pidfile /var/run/couchdb/couchdb.pid -heart
+ExecStart=/usr/libexec/couchdb +Bd -noinput -sasl errlog_type error +K true +A 4 -couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini /etc/couchdb/local.d/ /etc/couchdb/self.ini -s couch -pidfile /var/run/couchdb/couchdb.pid -heart
 
 [Install]
 WantedBy=multi-user.target
diff --git a/couchdb.spec b/couchdb.spec
index 8960d7b..6201947 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -243,12 +243,13 @@ fi
 
 %changelog
 * Sun Jul 06 2014 Warren Togami <wtogami at gmail.com> - 1.6.0-7
-- Add /usr/libexec/couchdb wrapper to ExecStart from systemd
-    which executes couchdb with couchdb_t for the first time.
-  Additional fixes to selinux-policy are required,
-   see http://wtogami.fedorapeople.org/a/2014/couchdb-selinux.txt
-- Add /etc/couchdb/self.ini as last .ini
-   CouchDB writes to only the last .ini file during runtime.
+- Add /usr/libexec/couchdb wrapper to ExecStart from systemd which executes couchdb with couchdb_t for the first time.
+  Additional fixes to selinux-policy are required, see http://wtogami.fedorapeople.org/a/2014/couchdb-selinux.txt
+- Add /etc/couchdb/self.ini as last .ini, CouchDB writes to only the last .ini file during runtime.
+- default.d/ and local.d/ never worked with couchdb + systemd so we are dropping default.d/
+  default.ini and local.ini are reference configuration from upstream.
+  Users are meant to add overrides or custom configuration to local.d/*.ini files.
+  self.ini is written to by CouchDB itself and overrides the previous *.ini.
 
 * Thu Jul 03 2014 Warren Togami <wtogami at gmail.com> - 1.6.0-6
 - silence stdout/stderr to prevent redundant flooding of /var/log/messages