mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 04:16:46 +02:00
testing/etcd: fix inability to read config options
Fixes #7161 Options in /etc/conf.d/etcd aren't passed to the daemon. This patch configures etcd to read options from a YAML file instead.
This commit is contained in:
Gareth Williams
Leonardo Arena
parent
cf730eaa47
commit
8a89854d9f
@ -2,7 +2,7 @@
|
||||
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
|
||||
pkgname=etcd
|
||||
pkgver=3.3.10
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="A highly-available key value store for shared configuration and service discovery"
|
||||
url="https://github.com/coreos/etcd"
|
||||
arch="x86_64 ppc64le"
|
||||
@ -13,6 +13,7 @@ pkgusers="$pkgname"
|
||||
pkggroups="$pkgname"
|
||||
subpackages="$pkgname-doc $pkgname-ctl $pkgname-openrc"
|
||||
source="$pkgname-$pkgver.tar.gz::https://github.com/coreos/etcd/archive/v$pkgver.tar.gz
|
||||
$pkgname.yaml::https://raw.githubusercontent.com/etcd-io/etcd/release-3.3/etcd.conf.yml.sample
|
||||
$pkgname.confd
|
||||
$pkgname.initd"
|
||||
builddir="$srcdir"/$pkgname-$pkgver
|
||||
@ -35,6 +36,7 @@ package() {
|
||||
mkdir -p "$pkgdir"/var/lib/$pkgname
|
||||
chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/$pkgname
|
||||
install -Dm755 bin/etcd "$pkgdir"/usr/bin/etcd
|
||||
install -Dm644 $srcdir/$pkgname.yaml "$pkgdir"/etc/etcd/conf.yml
|
||||
install -Dm644 $srcdir/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
|
||||
install -Dm755 $srcdir/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
|
||||
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
|
||||
@ -46,5 +48,6 @@ ctl() {
|
||||
}
|
||||
|
||||
sha512sums="848e241e816312307f74520b99aeabf7def6862093897035ace16cb230817d8e2681d7d2f1c1ac220d7c2b4c7c0a1262bbe3e4db927524f785de888566d2097c etcd-3.3.10.tar.gz
|
||||
440c9f23decb318c565a79d376b107dbd2333e72d5d812ec1460732543348737468b3e66e82e06a1afa0f09760c1eb066804a668a24e92a23977758727e049d2 etcd.confd
|
||||
cee78d665c6449aceed2e12e13a461e614b7c71a4e4800c967bdfff0175e58aad1f8b0b186b8fa49ceffe315e5e68eccf24b8f3a3e3f805df8850f7e81b4ad12 etcd.initd"
|
||||
1fd53fccc524ab07f2780039d8155ef66af7fb23e13783ac24ab47e7841f417ac98973e7e6eaa6424c4122a9a6826cb0e20f453e02492c789514f096f0243d87 etcd.yaml
|
||||
bd385f6eddd88e7bef77470c5f19f1bea839c3cfcbb08679037d2d7d1f761249430d1eee70dab62ca00c5f2c361f5aa0b0b0435b02aba72c62cd9e06aacf8a7b etcd.confd
|
||||
b86181b6dc4e9336c533086e80f88b28e7c3af2a9415a21cfde058ece11419e93f36664592f762785db3c64a41b79e1e372dc794d649927394b5644630d53cb5 etcd.initd"
|
||||
|
||||
@ -2,13 +2,9 @@ SVCNAME=etcd
|
||||
PIDPATH=/var/run/${SVCNAME}
|
||||
PIDFILE=${PIDPATH}/${SVCNAME}.pid
|
||||
LOGPATH=/var/log/${SVCNAME}
|
||||
DATADIR=/var/lib/${SVCNAME}
|
||||
USER=$SVCNAME
|
||||
|
||||
#
|
||||
# default: "default"
|
||||
#
|
||||
ETCD_NAME="default"
|
||||
ETCD_CONFIG=/etc/etcd/conf.yml
|
||||
|
||||
# Path to the data directory.
|
||||
#
|
||||
@ -17,240 +13,8 @@ ETCD_NAME="default"
|
||||
#
|
||||
ETCD_DATA_DIR="/var/lib/etcd"
|
||||
|
||||
# Path to the dedicated wal directory.
|
||||
# If this flag is set, etcd will write the WAL files
|
||||
# to the walDir rather than the dataDir.
|
||||
# Any additional command-line options
|
||||
#
|
||||
# default: ""
|
||||
#
|
||||
# ETCD_WAL_DIR=""
|
||||
|
||||
# Number of committed transactions to trigger a snapshot to disk.
|
||||
#
|
||||
# default: 10000
|
||||
#
|
||||
# ETCD_SNAPSHOT_COUNT=10000
|
||||
|
||||
# Time (in milliseconds) of a heartbeat interval.
|
||||
#
|
||||
# default: 100
|
||||
#
|
||||
# ETCD_HEARTBEAT_INTERVAL=100
|
||||
|
||||
# Time (in milliseconds) for an election to timeout.
|
||||
#
|
||||
# default: 1000
|
||||
#
|
||||
# ETCD_ELECTION_TIMEOUT=1000
|
||||
|
||||
# List of URLs to listen on for peer traffic.
|
||||
#
|
||||
# default: "http://localhost:2380,http://localhost:7001"
|
||||
#
|
||||
# ETCD_LISTEN_PEER_URLS="http://localhost:2380,http://localhost:7001"
|
||||
|
||||
# List of URLs to listen on for client traffic.
|
||||
#
|
||||
# default: "http://localhost:2379,http://localhost:4001"
|
||||
#
|
||||
# ETCD_LISTEN_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
|
||||
|
||||
# Maximum number of snapshot files to retain (0 is unlimited)
|
||||
#
|
||||
# default: 5
|
||||
#
|
||||
# ETCD_MAX_SNAPSHOTS=5
|
||||
|
||||
# Maximum number of wal files to retain (0 is unlimited)
|
||||
#
|
||||
# default: 5
|
||||
#
|
||||
# ETCD_MAX_WALS=5
|
||||
|
||||
# Comma_separated white list of origins for CORS (cross_origin resource sharing).
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_CORS=
|
||||
|
||||
# List of this member's peer URLs to advertise to the rest of the cluster.
|
||||
# These addresses are used for communicating etcd data around the cluster.
|
||||
# At least one must be routable to all cluster members.
|
||||
#
|
||||
# default: "http://localhost:2380,http://localhost:7001"
|
||||
#
|
||||
# ETCD_INITIAL_ADVERTISE_PEER_URLS="http://localhost:2380,http://localhost:7001"
|
||||
|
||||
# Initial cluster configuration for bootstrapping.
|
||||
#
|
||||
# default: "default=http://localhost:2380,default=http://localhost:7001"
|
||||
# distribution default: "default=http://localhost:2380,default=http://localhost:7001"
|
||||
#
|
||||
# ETCD_INITIAL_CLUSTER="default=http://localhost:2380,default=http://localhost:7001"
|
||||
|
||||
# Initial cluster state ("new" or "existing").
|
||||
# Set to new for all members present during initial static or DNS bootstrapping.
|
||||
# If this option is set to existing, etcd will attempt to join the existing cluster.
|
||||
# If the wrong value is set, etcd will attempt to start but fail safely.
|
||||
#
|
||||
# default: "new"
|
||||
#
|
||||
# ETCD_INITIAL_CLUSTER_STATE="new"
|
||||
|
||||
# Initial cluster token for the etcd cluster during bootstrap.
|
||||
#
|
||||
# default: "etcd_cluster"
|
||||
#
|
||||
# ETCD_INITIAL_CLUSTER_TOKEN="etcd_cluster"
|
||||
|
||||
# List of this member's client URLs to advertise to the rest of the cluster.
|
||||
#
|
||||
# default: "http://localhost:2379,http://localhost:4001"
|
||||
#
|
||||
# ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
|
||||
|
||||
# Discovery URL used to bootstrap the cluster.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_DISCOVERY=
|
||||
|
||||
# DNS srv domain used to bootstrap the cluster.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_DISCOVERY_SRV=
|
||||
|
||||
# Expected behavior ("exit" or "proxy") when discovery services fails.
|
||||
#
|
||||
# default: "proxy"
|
||||
#
|
||||
# ETCD_DISCOVERY_FALLBACK="proxy"
|
||||
|
||||
# HTTP proxy to use for traffic to discovery service.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_DISCOVERY_PROXY=
|
||||
|
||||
# Proxy mode setting ("off", "readonly" or "on").
|
||||
#
|
||||
# default: "off"
|
||||
#
|
||||
# ETCD_PROXY="off"
|
||||
|
||||
# Time (in milliseconds) an endpoint will be held
|
||||
# in a failed state before being reconsidered for proxied requests.
|
||||
#
|
||||
# default: 5000
|
||||
#
|
||||
# ETCD_PROXY_FAILURE_WAIT=5000
|
||||
|
||||
# Time (in milliseconds) of the endpoints refresh interval.
|
||||
#
|
||||
# default: 30000
|
||||
#
|
||||
# ETCD_PROXY_REFRESH_INTERVAL=30000
|
||||
|
||||
# Time (in milliseconds) for a dial to timeout or 0 to disable the timeout.
|
||||
#
|
||||
# default: 1000
|
||||
#
|
||||
# ETCD_PROXY_DIAL_TIMEOUT=1000
|
||||
|
||||
# Time (in milliseconds) for a write to timeout or 0 to disable the timeout.
|
||||
#
|
||||
# default: 5000
|
||||
#
|
||||
# ETCD_PROXY_WRITE_TIMEOUT=5000
|
||||
|
||||
# Time (in milliseconds) for a read to timeout or 0 to disable the timeout.
|
||||
# Don't change this value if you use watches because they are using long polling requests.
|
||||
#
|
||||
# default: 0
|
||||
#
|
||||
# ETCD_PROXY_READ_TIMEOUT=0
|
||||
|
||||
# Path to the client server TLS CA file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_CA_FILE=
|
||||
|
||||
# Path to the client server TLS cert file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_CERT_FILE=
|
||||
|
||||
# Path to the client server TLS key file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_KEY_FILE=
|
||||
|
||||
# Enable client cert authentication.
|
||||
#
|
||||
# default: false
|
||||
#
|
||||
# ETCD_CLIENT_CERT_AUTH=false
|
||||
|
||||
# Path to the client server TLS trusted CA key file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_TRUSTED_CA_FILE=
|
||||
|
||||
# [DEPRECATED] Path to the peer server TLS CA file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_PEER_CA_FILE=
|
||||
|
||||
# Path to the peer server TLS cert file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_PEER_CERT_FILE=
|
||||
|
||||
# Path to the peer server TLS key file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_PEER_KEY_FILE=
|
||||
|
||||
# Enable peer client cert authentication.
|
||||
#
|
||||
# default: false
|
||||
#
|
||||
# ETCD_PEER_CLIENT_CERT_AUTH=false
|
||||
|
||||
# Path to the peer server TLS trusted CA file.
|
||||
#
|
||||
# default: none
|
||||
#
|
||||
# ETCD_PEER_TRUSTED_CA_FILE=
|
||||
|
||||
# Drop the default log level to DEBUG for all subpackages.
|
||||
#
|
||||
# default: false (INFO for all packages)
|
||||
#
|
||||
# ETCD_DEBUG=false
|
||||
|
||||
# Set individual etcd subpackages to specific log levels.
|
||||
# An example being etcdserver=WARNING,security=DEBUG
|
||||
#
|
||||
# default: none (INFO for all packages)
|
||||
#
|
||||
# ETCD_LOG_PACKAGE_LEVELS=
|
||||
|
||||
# Force to create a new one_member cluster.
|
||||
# It commits configuration changes in force to remove all existing members in the cluster and add itself.
|
||||
# It needs to be set to restore a backup.
|
||||
#
|
||||
# default: false
|
||||
#
|
||||
# ETCD_FORCE_NEW_CLUSTER=false
|
||||
|
||||
# vim:ft=sh:
|
||||
|
||||
#ETCD_OPTS=""
|
||||
|
||||
@ -22,7 +22,7 @@ start() {
|
||||
--background \
|
||||
--make-pidfile \
|
||||
--exec /usr/bin/etcd -- \
|
||||
--name=$ETCD_NAME \
|
||||
--config-file=$ETCD_CONFIG \
|
||||
--data-dir="$ETCD_DATA_DIR" \
|
||||
$ETCD_OPTS
|
||||
eend $? "Failed to start $SVCNAME"
|
||||
@ -34,4 +34,3 @@ stop() {
|
||||
eend $? "Failed to stop $SVCNAME"
|
||||
rm -f "$PIDFILE"
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user