From a6471d540b46ad1a76fcaad306a59929be147ecd Mon Sep 17 00:00:00 2001
From: Francesco Colista <fcolista@alpinelinux.org>
Date: Wed, 6 Jun 2018 10:38:05 +0000
Subject: testing/consul: upgrade to 1.1.0. Fixed init.d, Fixes #8838.

According with https://www.consul.io/docs/commands/validate.html the checkconfig
in the init.d script should have been fixed.
---
 testing/consul/APKBUILD     | 7 ++++---
 testing/consul/consul.initd | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'testing')

diff --git a/testing/consul/APKBUILD b/testing/consul/APKBUILD
index d78d0989e1..47e0782561 100644
--- a/testing/consul/APKBUILD
+++ b/testing/consul/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Olivier Mauras <olivier@mauras.ch>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=consul
-pkgver=1.0.7
+pkgver=1.1.0
 pkgrel=0
 pkgdesc="Tool for service discovery, monitoring and configuration"
 url="https://www.consul.io"
@@ -11,6 +11,7 @@ makedepends="bash go"
 install="$pkgname.pre-install"
 pkgusers="consul"
 pkggroups="consul"
+subpackages="$pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/$pkgname/archive/v$pkgver.tar.gz
 	consul.initd
 	consul.confd
@@ -60,8 +61,8 @@ package() {
 		install -m640 -o root -g consul "$srcdir"/$cf "$pkgdir"/etc/$pkgname
 	done
 }
-sha512sums="0abedfeef1fd46e3885ef43e1a60e73380e67c3bb29eb3014e35cb2b64d3a158e1958306ce2144e0f6a26e94ea720528827dfcb448fa2fbeeab9263ae3abe03b  consul-1.0.7.tar.gz
-b0b6ba59d5b2c07f269bf901a24d1dcfbf96953185582577cecf7e17a2909a98673ec780d107b6264e910425aeadcf21d4adcedb89d4616c4eb9840e08639c17  consul.initd
+sha512sums="80c16a42fc58930234cb277bfdd21c3f1d9f7fe1cf2fea6284056a47f602a40a15ddd447779e83fc5b42502ca8a507a819f5ad7d11689c0bcbb0da739b217721  consul-1.1.0.tar.gz
+818cd9696a6306a85cbb007f9437dbe3d17e70d8dcbc16fa2e7c399571cc71d9da197160abbad86ab37d6a4f4aff873ff8b6f5f3418869a82274a5a265c5281a  consul.initd
 f2c5af74dfcbca2fea8ebea31139d93f44455b93ef17ec611b880d7071af4125615dbbd23969d0d04ca636c26d7b4e7eb97f1266baa89252097f4cbc5173d817  consul.confd
 d4310dde63d3b8fc4791124bd255bf2a1402b86d00f6b1732e18b0caedb75eae6c77382e1a48f12469828ef4bb363db4580fb1aafa63fcdc97b1431f6ea96d58  acl.json.sample
 ec30ad73c13f9dd5ba15389567436dbf74c24e822cb959c6ccc40a35e36e212313c70f3cf1ccee3f63a7bb98760173d6c2478161a25b85e14dd889a47572aff1  encrypt.json.sample
diff --git a/testing/consul/consul.initd b/testing/consul/consul.initd
index 24d727d93d..ef3adf1803 100644
--- a/testing/consul/consul.initd
+++ b/testing/consul/consul.initd
@@ -19,7 +19,7 @@ depend() {
 }
 
 checkconfig() {
-        consul configtest -config-dir /etc/consul
+        consul validate /etc/consul
 }
 
 start() {
-- 
cgit v1.2.3