[etcd/f22] Fix .service files to work if no config file

[Eric Paris]

commit fd5768bfa2a33032d00e06f18e56b21810b3d76f
Author: Eric Paris <eparis at redhat.com>
Date:   Tue Mar 10 12:54:05 2015 -0400

    Fix .service files to work if no config file

 etcd.conf    | 2 +-
 etcd.service | 3 +--
 etcd.spec    | 5 ++++-
 3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/etcd.conf b/etcd.conf
index 37a53ea..086b740 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -5,7 +5,7 @@ ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
 #ETCD_HEARTBEAT_INTERVAL="100"
 #ETCD_ELECTION_TIMEOUT="1000"
 #ETCD_LISTEN_PEER_URLS="http://localhost:2380,http://localhost:7001"
-#ETCD_LISTEN_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
+ETCD_LISTEN_CLIENT_URLS="http://localhost:4001"
 #ETCD_MAX_SNAPSHOTS="5"
 #ETCD_MAX_WALS="5"
 #ETCD_CORS=""
diff --git a/etcd.service b/etcd.service
index 55c1bba..7b8169a 100644
--- a/etcd.service
+++ b/etcd.service
@@ -4,8 +4,7 @@ After=network.target
 
 [Service]
 Type=simple
-# etc logs to the journal directly, suppress double logging
-StandardOutput=null
+WorkingDirectory=/var/lib/etcd/
 EnvironmentFile=-/etc/etcd/etcd.conf
 User=etcd
 ExecStart=/usr/bin/etcd
diff --git a/etcd.spec b/etcd.spec
index d01f580..ac501cd 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -10,7 +10,7 @@
 
 Name:		%{repo}
 Version:	2.0.3
-Release:	0.1%{?dist}
+Release:	0.2%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
 URL:		https://%{import_path}
@@ -185,6 +185,9 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %{gopath}/src/%{import_path}
 
 %changelog
+* Tue Mar 10 2015 Eric Paris <eparis at redhat.com> - 2.0.3-0.2
+- Fix .service files to work if no config file
+
 * Fri Feb 20 2015 jchaloup <jchaloup at redhat.com> - 2.0.3-0.1
 - Bump to upstream 4d728cc8c488a545a8bdeafd054d9ccc2bfb6876