commit 76b8f494d34ab91533ff800e7d28d9ac85a7c8f0
Author: Jan Chaloupka <jchal...@redhat.com>
Date: Mon Jan 26 13:53:26 2015 +0100
default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit
byt eparis)
- related: #1176138
etcd.conf | 4 ++--
etcd.spec | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/etcd.conf b/etcd.conf
index 1b43f65..4d5d50e 100644
--- a/etcd.conf
+++ b/etcd.conf
@@ -6,7 +6,7 @@
# cert_file = ""
# cors = []
# cpu_profile_file = ""
-# data_dir = "."
+data_dir = "/var/lib/etcd/default.etcd"
# discovery = "http://etcd.local:4001/v2/keys/_etcd/registry/examplecluster";
# http_read_timeout = 10
# http_write_timeout = 10
@@ -16,7 +16,7 @@
# max_cluster_size = 9
# max_result_buffer = 1024
# max_retry_attempts = 3
-# name = "default-name"
+name = "default"
# snapshot = false
# verbose = false
# very_verbose = false
diff --git a/etcd.spec b/etcd.spec
index 30caad5..e063fb3 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -8,7 +8,7 @@
Name: %{repo}
Version: 2.0.0
-Release: 0.2.rc1%{?dist}
+Release: 0.3.rc1%{?dist}
Summary: A highly-available key value store for shared configuration
License: ASL 2.0
URL: https://%{import_path}
@@ -104,7 +104,8 @@ install -D -p -m 0755 bin/%{name}
%{buildroot}%{_bindir}/%{name}
install -D -p -m 0755 bin/%{name}ctl %{buildroot}%{_bindir}/%{name}ctl
install -D -p -m 0755 bin/%{name}-migrate
%{buildroot}%{_bindir}/%{name}-migrate
install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
-install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}
+install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}
+install -m 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
# And create /var/lib/etcd
install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
@@ -173,6 +174,11 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name}
-d %{_sharedstatedir}/
%{gopath}/src/%{import_path}
%changelog
+* Mon Jan 26 2015 jchaloup <jchal...@redhat.com> - 2.0.0-0.3.rc1
+- default to /var/lib/etcd/default.etcd as 2.0 uses that default (f21 commit
byt eparis)
+ related: #1176138
+ fix /etc/etcd/etcd.conf path
+
* Tue Jan 20 2015 jchaloup <jchal...@redhat.com> - 2.0.0-0.2.rc1
- Update of BuildRequires/Requires, Provides and test
Add BuildRequire on jonboulle/clockwork
_______________________________________________
golang mailing list
golang@lists.fedoraproject.org
https://lists.fedoraproject.org/mailman/listinfo/golang
