diff --git a/etcd.conf b/etcd.conf index 003a5fe..324a4ee 100644 --- a/etcd.conf +++ b/etcd.conf @@ -1,7 +1,8 @@ # [member] ETCD_NAME=default ETCD_DATA_DIR="/var/lib/etcd/default.etcd" -#ETCD_SNAPSHOT_COUNTER="10000" +#ETCD_WAL_DIR="" +#ETCD_SNAPSHOT_COUNT="10000" #ETCD_HEARTBEAT_INTERVAL="100" #ETCD_ELECTION_TIMEOUT="1000" #ETCD_LISTEN_PEER_URLS="http://localhost:2380" @@ -21,9 +22,15 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379" #ETCD_DISCOVERY_SRV="" #ETCD_DISCOVERY_FALLBACK="proxy" #ETCD_DISCOVERY_PROXY="" +#ETCD_STRICT_RECONFIG_CHECK="false" # #[proxy] #ETCD_PROXY="off" +#ETCD_PROXY_FAILURE_WAIT="5000" +#ETCD_PROXY_REFRESH_INTERVAL="30000" +#ETCD_PROXY_DIAL_TIMEOUT="1000" +#ETCD_PROXY_WRITE_TIMEOUT="5000" +#ETCD_PROXY_READ_TIMEOUT="0" # #[security] #ETCD_CERT_FILE="" diff --git a/etcd.spec b/etcd.spec index eed448a..bf097ff 100644 --- a/etcd.spec +++ b/etcd.spec @@ -30,7 +30,7 @@ Name: %{repo} Version: 2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 URL: https://%{provider_prefix} @@ -354,6 +354,9 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/ %endif %changelog +* Mon Nov 16 2015 jchaloup - 2.2.1-4 +- Update etcd.conf: add new options, fix current + * Fri Oct 30 2015 jchaloup - 2.2.1-3 - Add After=network-online.target and Wants=network-online.target to etcd.service