From bcb6bec67b34efa1b9665f2271d989ee8be7e71f Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Oct 06 2014 07:51:40 +0000
Subject: Fix the .service file so it can launch!

- related: #1047194

---

diff --git a/etcd.service b/etcd.service
index b095e1c..fd5733c 100644
--- a/etcd.service
+++ b/etcd.service
@@ -1,14 +1,14 @@
 [Unit]
 Description=Etcd Server
 After=network.target
-Requires=etcd.socket
 
 [Service]
 Type=simple
-StandardOutput=journal
-StandardError=journal
+# etc logs to the journal directly, suppress double logging
+StandardOutput=null
+WorkingDirectory=/var/lib/etcd
+User=etcd
 ExecStart=/usr/bin/etcd
 
 [Install]
 WantedBy=multi-user.target
-Also=etcd.socket
diff --git a/etcd.spec b/etcd.spec
index 0b00c6c..6fd7b69 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -4,7 +4,7 @@
 
 Name:		etcd
 Version:	0.4.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	A highly-available key value store for shared configuration
 
 License:	ASL 2.0
@@ -130,6 +130,10 @@ getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etc
 %{gopath}/src/%{import_path}/*
 
 %changelog
+* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-5
+- Fix the .service file so it can launch!
+  related: #1047194
+
 * Mon Sep 22 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-4
 - resolves: #1047194
   Update to 0.4.6 from https://github.com/projectatomic/etcd-package