[arch-commits] Commit in consul/trunk (7 files)
Thore Bödecker
foxxx0 at archlinux.org
Wed Sep 13 15:51:32 UTC 2017
Date: Wednesday, September 13, 2017 @ 15:51:31
Author: foxxx0
Revision: 257442
update to 0.9.3, rework build process + improvements
Added:
consul/trunk/consul.default
consul/trunk/consul.install
consul/trunk/consul.sysusers
consul/trunk/disable-broken-api-test.patch
consul/trunk/example.json
Modified:
consul/trunk/PKGBUILD
consul/trunk/consul.service
-------------------------------+
PKGBUILD | 73 ++++++++++++++++--------
consul.default | 1
consul.install | 9 +++
consul.service | 2
consul.sysusers | 1
disable-broken-api-test.patch | 118 ++++++++++++++++++++++++++++++++++++++++
example.json | 7 ++
7 files changed, 188 insertions(+), 23 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-09-13 15:39:36 UTC (rev 257441)
+++ PKGBUILD 2017-09-13 15:51:31 UTC (rev 257442)
@@ -1,45 +1,72 @@
# $Id$
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
# Maintainer: Felix Yan <felixonmars at archlinux.org>
pkgname=consul
-pkgver=0.8.4
+pkgver=0.9.3
pkgrel=1
pkgdesc="A tool for service discovery, monitoring and configuration."
arch=('i686' 'x86_64')
+_gocli_commit='65fcae5817c8600da98ada9d7edf26dd1a84837b' # HEAD
url="https://www.consul.io"
license=('MPL')
depends=('glibc')
-makedepends=('git' 'go')
+makedepends=('git' 'go' 'procps-ng' 'syslog-ng')
source=("$pkgname-$pkgver.tar.gz::https://github.com/hashicorp/consul/archive/v$pkgver.tar.gz"
- consul.service)
-sha512sums=('4bbb167a603f1d20940330bd9615ba0f50e0113e1d96ce47773f5d2813635f76dd1aec8f43dae4c8c547cec8a891eb0726eeeda7bd7c5b1d495029b359378e68'
- '0f39434e73a3f5d79919e3fad28de834688765edebfce8793aa471f272af61d9cebd13237a7aeb4f8b89f1749a891a63cd710881d58a9590990deedd43dffdba')
+ "git+https://github.com/mitchellh/cli#commit=${_gocli_commit}"
+ consul.service
+ consul.default
+ consul.sysusers
+ example.json
+ disable-broken-api-test.patch)
+install=consul.install
+sha512sums=('a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f'
+ 'SKIP'
+ 'c70b9d1556f6c7ecb2e915ab685f289cef0e31198bd2e50c74a0483bbfb387beec67334f539a90adbf68b61b07946e98b300ab8a8e26e53b35f4ab4894adeb04'
+ 'ec5a800529a297c709fa383c094ecf106351cf0f8ac7b613b972d415d77fe001088902d7ab805e63e78a8e6360323fec1b795db5a4446df1e21b9b4ed31e7079'
+ 'ef872aedb2bc022a29292b7972a792b22e684c1ccb904a2b2cfec6d8966c28fb19be1452ce060821c419f1b646b236ba2e783175595e4bb6926d164c27a15c87'
+ 'c4292b8f56ee955ed7385a49843fd90d6434029891b3e1e724cb2fc841514c06e2554a26d3937c114371b18c2168c4e64319eb2cbd726ee8b35870df19089348'
+ 'ad5b5ea1fd4ec443c98a89da9fb581d32894c4583dec3707ce9096ed45706bc800f8eb20e5a0c68f6de437d228e09a97bad5815b5bba9b18ae339bcf9a42f8f7')
prepare() {
- cd consul-$pkgver
+ export GOPATH="${srcdir}"
+ export PATH="$PATH:$GOPATH/bin"
+ mkdir -p "src/github.com/mitchellh"
+ mkdir -p "src/github.com/hashicorp"
- mkdir build
- mkdir -p .gopath/src/github.com/hashicorp
- ln -sf "$PWD" .gopath/src/github.com/hashicorp/consul
- export GOPATH="$PWD/.gopath"
+ mv "${pkgname}-${pkgver}" "src/github.com/hashicorp/${pkgname}"
+ mv "cli" "src/github.com/mitchellh/cli"
- sed -e "s/Version = \"unknown\"/Version = \"$pkgver\"/" \
- -e "s/VersionPrerelease = \"unknown\"/VersionPrerelease = \"\"/" \
- -e "s/release = \"dev\"/release = \"\"/" \
- -i version/version.go
+ cd "src/github.com/hashicorp/${pkgname}"
+
+ # TODO: debug failing tests
+ # + TestTombstoneGC
+ #rm ./agent/consul/state/tombstone_gc_test.go
+ # + TestAPI_ClientTLSOptions
+ #patch -p0 ./api/api_test.go < "${srcdir}/disable-broken-api-test.patch"
+ # + TestSyslogFilter (need to start syslog-ng within the chroot container)
+ #rm ./logger/syslog_test.go
+ #make test
}
build() {
- cd consul-$pkgver
-
- go get github.com/mitchellh/cli
- go build -o build/consul # -gccgoflags "$CFLAGS $LDFLAGS"
+ cd "src/github.com/hashicorp/${pkgname}"
+ # build local arch only, from: https://github.com/hashicorp/consul/#developing-consul
+ CONSUL_DEV=1 make
}
package() {
- cd consul-$pkgver
-
- install -Dm755 build/consul "$pkgdir"/usr/bin/consul
- install -Dm644 "$srcdir"/consul.service "$pkgdir"/usr/lib/systemd/system/consul.service
- install -d "$pkgdir"/etc/consul.d
+ cd "src/github.com/hashicorp/${pkgname}"
+
+ install -D -d -m750 -o 208 -g 208 "${pkgdir}/var/lib/consul"
+ install -D -d -m750 -o 0 -g 208 "${pkgdir}/etc/consul.d"
+
+ install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul"
+ install -D -m640 -o 0 -g 208 "${srcdir}/example.json" "${pkgdir}/etc/consul.d/example.json"
+ install -Dm755 bin/consul "${pkgdir}/usr/bin/consul"
+
+ install -Dm644 "${srcdir}/consul.service" "${pkgdir}/usr/lib/systemd/system/consul.service"
+ install -Dm644 "${srcdir}/consul.sysusers" "${pkgdir}/usr/lib/sysusers.d/consul.conf"
}
+
+# vim:set ts=2 sw=2 et:
Added: consul.default
===================================================================
--- consul.default (rev 0)
+++ consul.default 2017-09-13 15:51:31 UTC (rev 257442)
@@ -0,0 +1 @@
+CONSUL_FLAGS=""
Added: consul.install
===================================================================
--- consul.install (rev 0)
+++ consul.install 2017-09-13 15:51:31 UTC (rev 257442)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ # improved permissions since 0.9.3-1
+ if [ "$(vercmp "$2" "0.9.3")" -lt 0 ]; then
+ chown 0:208 /etc/consul.d
+ chmod 0750 /etc/consul.d
+ echo -en "----\nThe directory permissions for /etc/consul.d/ have been fixed.\n----\n"
+ fi
+ true
+}
Modified: consul.service
===================================================================
--- consul.service 2017-09-13 15:39:36 UTC (rev 257441)
+++ consul.service 2017-09-13 15:51:31 UTC (rev 257442)
@@ -4,6 +4,8 @@
After=network-online.target
[Service]
+User=consul
+Group=consul
EnvironmentFile=-/etc/default/consul
Restart=on-failure
ExecStart=/usr/bin/consul agent $CONSUL_FLAGS -config-dir=/etc/consul.d
Added: consul.sysusers
===================================================================
--- consul.sysusers (rev 0)
+++ consul.sysusers 2017-09-13 15:51:31 UTC (rev 257442)
@@ -0,0 +1 @@
+u consul 208 - /var/lib/consul
Added: disable-broken-api-test.patch
===================================================================
--- disable-broken-api-test.patch (rev 0)
+++ disable-broken-api-test.patch 2017-09-13 15:51:31 UTC (rev 257442)
@@ -0,0 +1,118 @@
+--- ./api/api_test.go 2017-09-08 18:43:36.000000000 +0200
++++ /tmp/api_test.go 2017-09-13 16:20:25.950467396 +0200
+@@ -253,115 +253,6 @@
+ }
+ }
+
+-func TestAPI_ClientTLSOptions(t *testing.T) {
+- t.Parallel()
+- // Start a server that verifies incoming HTTPS connections
+- _, srvVerify := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
+- conf.CAFile = "../test/client_certs/rootca.crt"
+- conf.CertFile = "../test/client_certs/server.crt"
+- conf.KeyFile = "../test/client_certs/server.key"
+- conf.VerifyIncomingHTTPS = true
+- })
+- defer srvVerify.Stop()
+-
+- // Start a server without VerifyIncomingHTTPS
+- _, srvNoVerify := makeClientWithConfig(t, nil, func(conf *testutil.TestServerConfig) {
+- conf.CAFile = "../test/client_certs/rootca.crt"
+- conf.CertFile = "../test/client_certs/server.crt"
+- conf.KeyFile = "../test/client_certs/server.key"
+- conf.VerifyIncomingHTTPS = false
+- })
+- defer srvNoVerify.Stop()
+-
+- // Client without a cert
+- t.Run("client without cert, validation", func(t *testing.T) {
+- client, err := NewClient(&Config{
+- Address: srvVerify.HTTPSAddr,
+- Scheme: "https",
+- TLSConfig: TLSConfig{
+- Address: "consul.test",
+- CAFile: "../test/client_certs/rootca.crt",
+- },
+- })
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- // Should fail
+- _, err = client.Agent().Self()
+- if err == nil || !strings.Contains(err.Error(), "bad certificate") {
+- t.Fatal(err)
+- }
+- })
+-
+- // Client with a valid cert
+- t.Run("client with cert, validation", func(t *testing.T) {
+- client, err := NewClient(&Config{
+- Address: srvVerify.HTTPSAddr,
+- Scheme: "https",
+- TLSConfig: TLSConfig{
+- Address: "consul.test",
+- CAFile: "../test/client_certs/rootca.crt",
+- CertFile: "../test/client_certs/client.crt",
+- KeyFile: "../test/client_certs/client.key",
+- },
+- })
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- // Should succeed
+- _, err = client.Agent().Self()
+- if err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- // Client without a cert
+- t.Run("client without cert, no validation", func(t *testing.T) {
+- client, err := NewClient(&Config{
+- Address: srvNoVerify.HTTPSAddr,
+- Scheme: "https",
+- TLSConfig: TLSConfig{
+- Address: "consul.test",
+- CAFile: "../test/client_certs/rootca.crt",
+- },
+- })
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- // Should succeed
+- _, err = client.Agent().Self()
+- if err != nil {
+- t.Fatal(err)
+- }
+- })
+-
+- // Client with a valid cert
+- t.Run("client with cert, no validation", func(t *testing.T) {
+- client, err := NewClient(&Config{
+- Address: srvNoVerify.HTTPSAddr,
+- Scheme: "https",
+- TLSConfig: TLSConfig{
+- Address: "consul.test",
+- CAFile: "../test/client_certs/rootca.crt",
+- CertFile: "../test/client_certs/client.crt",
+- KeyFile: "../test/client_certs/client.key",
+- },
+- })
+- if err != nil {
+- t.Fatal(err)
+- }
+-
+- // Should succeed
+- _, err = client.Agent().Self()
+- if err != nil {
+- t.Fatal(err)
+- }
+- })
+-}
+-
+ func TestAPI_SetQueryOptions(t *testing.T) {
+ t.Parallel()
+ c, s := makeClient(t)
Added: example.json
===================================================================
--- example.json (rev 0)
+++ example.json 2017-09-13 15:51:31 UTC (rev 257442)
@@ -0,0 +1,7 @@
+{
+ "data_dir": "/var/lib/consul",
+ "disable_update_check": true,
+ "log_level": "INFO",
+ "node_name": "example.localdomain",
+ "server": true
+}
More information about the arch-commits
mailing list