aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGennady Feldman <gena01@gmail.com>2016-12-08 22:54:24 +0000
committerJakub Jirutka <jakub@jirutka.cz>2016-12-15 17:24:01 +0100
commit1021d173063aea1bf8cc245e0542738869594c59 (patch)
treebc3e24c2dad2cdea028106b695d537409beeb8d5
parentcab940a0509aafae5adbeb92a29d27b93b0fa77f (diff)
downloadalpine_aports-1021d173063aea1bf8cc245e0542738869594c59.tar.bz2
alpine_aports-1021d173063aea1bf8cc245e0542738869594c59.tar.xz
alpine_aports-1021d173063aea1bf8cc245e0542738869594c59.zip
testing/vault: upgrade to 0.6.3 and fix runscript
I had issues with service start in my testing. It would assume that the service started and then report that it crashed (instead of start failed). In my setup I setup "consul" service as backend. So if "consul" is not running vault should fail to start.
-rw-r--r--testing/vault/APKBUILD15
-rw-r--r--testing/vault/vault.initd3
2 files changed, 10 insertions, 8 deletions
diff --git a/testing/vault/APKBUILD b/testing/vault/APKBUILD
index c9a554ad81..9bfd91bd59 100644
--- a/testing/vault/APKBUILD
+++ b/testing/vault/APKBUILD
@@ -1,7 +1,8 @@
1# Contributor: Christian Kampka <christian@kampka.net> 1# Contributor: Christian Kampka <christian@kampka.net>
2# Contributor: Gennady Feldman <gena01@gmail.com>
2# Maintainer: 3# Maintainer:
3pkgname=vault 4pkgname=vault
4pkgver=0.6.2 5pkgver=0.6.3
5pkgrel=0 6pkgrel=0
6pkgdesc="Vault is a tool for securely accessing secrets" 7pkgdesc="Vault is a tool for securely accessing secrets"
7url="https://www.vaultproject.io/" 8url="https://www.vaultproject.io/"
@@ -49,15 +50,15 @@ package() {
49 install -m750 -o vault -g vault -d "$pkgdir/var/lib/$pkgname" || return 1 50 install -m750 -o vault -g vault -d "$pkgdir/var/lib/$pkgname" || return 1
50} 51}
51 52
52md5sums="06b1253f0aa1f3ac39e6e23d929c6ea5 vault-0.6.2.tar.gz 53md5sums="13e8bce4b15cc97e6131e3bb2d5f5cd9 vault-0.6.3.tar.gz
532148a788620484be07e1e24feb1cbd34 vault.confd 542148a788620484be07e1e24feb1cbd34 vault.confd
541f7802f479024809856e3be2e44a1b19 vault.hcl 551f7802f479024809856e3be2e44a1b19 vault.hcl
55ca400b34773b25367acc85a950c3c887 vault.initd" 5629f9404e7f3f51639a7a03016e2650f2 vault.initd"
56sha256sums="295197e8ec7d03d4e141733579250ed653b13862a2d83dfd0d11a6e82f28b436 vault-0.6.2.tar.gz 57sha256sums="cdc57cec5371b4d77f6220f08791a1ea384bcb5a54ef1d1c53fe9bcacf51d03b vault-0.6.3.tar.gz
57f197536bc5bf4531072c0a5cb17627bf01abd188b0cc2005e0ff1768e6143d32 vault.confd 58f197536bc5bf4531072c0a5cb17627bf01abd188b0cc2005e0ff1768e6143d32 vault.confd
58cacbd75cbaccf1034cd21d3015797cf0c1c1ce9c7e7ef7c1e4db4b54b92fe696 vault.hcl 59cacbd75cbaccf1034cd21d3015797cf0c1c1ce9c7e7ef7c1e4db4b54b92fe696 vault.hcl
598274a9c735906980a734a8a720232d8816bfbeb8294d4c96baac2e9885abf6a2 vault.initd" 60fdc9044f7f830e4684edd813d4b06fa1c491dcbc49448ebb776c9f0d39c54a25 vault.initd"
60sha512sums="5d444c32ee1dc464f9210331ed26ab56b9aaeb5fbdcb5c2fcc4d9363c6d1e60780d7c2f5020ebc3345fb8c3f32b3b8f8acc58533d5a036202685252b2affbe3e vault-0.6.2.tar.gz 61sha512sums="57bec92c1bfb4453dd14f7f01f7c579fe7eb9f44ca5bc2b99125dbb0aef1522e948e9c2b6d4205aefb8e9c911843d527b3c356a290abe287e85225c8ec834ef7 vault-0.6.3.tar.gz
616f3f30e5c9d9dd5117f18fce0e669f0cd752a6be4910405d6b394f15273372731ee887a5ba4c700293e5b8bc2bf40fd69d4337156f77b03549d2dc2c0a666bec vault.confd 626f3f30e5c9d9dd5117f18fce0e669f0cd752a6be4910405d6b394f15273372731ee887a5ba4c700293e5b8bc2bf40fd69d4337156f77b03549d2dc2c0a666bec vault.confd
628c064aa5dcca84822c1fa85e9d0ff520df46f794b2e9c689a9b4f81f74279387b3aebc08b3ca26cf786c2fcf1a330e765bf5a511074c24f87e5346672346ba1c vault.hcl 638c064aa5dcca84822c1fa85e9d0ff520df46f794b2e9c689a9b4f81f74279387b3aebc08b3ca26cf786c2fcf1a330e765bf5a511074c24f87e5346672346ba1c vault.hcl
6334993256eb1700ef0738e24227af7732ea81f9e096b34b5f6a282fce364e9c92319c2fc219083eec0185927dde89d565dfcc0d0507bcdbebd3e003027760d447 vault.initd" 641e436932647b191e691f5c60bec4ad926588cee5119c7cbe61345249a6768472387b6dd8b19b954c8ac80fb97f6e68f93749229b216300b0438dbeb0bdb57957 vault.initd"
diff --git a/testing/vault/vault.initd b/testing/vault/vault.initd
index b334546df9..2ed3152b34 100644
--- a/testing/vault/vault.initd
+++ b/testing/vault/vault.initd
@@ -2,10 +2,11 @@
2 2
3VAULT_LOG_FILE="/var/log/${SVCNAME}.log" 3VAULT_LOG_FILE="/var/log/${SVCNAME}.log"
4 4
5description="Vault is a tool for securely accessing secrets"
5command=/usr/sbin/${SVCNAME} 6command=/usr/sbin/${SVCNAME}
6command_args="${vault_opts}" 7command_args="${vault_opts}"
7command_background="true" 8command_background="true"
8start_stop_daemon_args="--user ${SVCNAME}:${SVCNAME} --stdout $VAULT_LOG_FILE --stderr $VAULT_LOG_FILE" 9start_stop_daemon_args="-w 100 --user ${SVCNAME}:${SVCNAME} --stdout $VAULT_LOG_FILE --stderr $VAULT_LOG_FILE"
9pidfile="/run/${SVCNAME}.pid" 10pidfile="/run/${SVCNAME}.pid"
10 11
11start_pre() { 12start_pre() {