diff options
| author | Gareth Williams <gareth@garethwilliams.me.uk> | 2019-03-01 11:30:55 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-03-06 12:48:09 +0000 |
| commit | 8a89854d9f7c19e766652fc8618f65db8a1c73eb (patch) | |
| tree | e9b8252ee5aa2f1f3737ff50cffc439fada2d104 /testing/etcd/APKBUILD | |
| parent | cf730eaa47bdc83194792a44547c58a801d1d53b (diff) | |
| download | aports-8a89854d9f7c19e766652fc8618f65db8a1c73eb.tar.bz2 aports-8a89854d9f7c19e766652fc8618f65db8a1c73eb.tar.xz | |
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.
Diffstat (limited to 'testing/etcd/APKBUILD')
| -rw-r--r-- | testing/etcd/APKBUILD | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/testing/etcd/APKBUILD b/testing/etcd/APKBUILD index 753a52ab14..d29fae74db 100644 --- a/testing/etcd/APKBUILD +++ b/testing/etcd/APKBUILD @@ -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" |