[PR PATCH] consul: add service

[PR PATCH] consul: add service

[altosys]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

There is a new pull request by altosys against master on the void-packages repository

https://github.com/altosys/void-packages consul-add-service
https://github.com/void-linux/void-packages/pull/44037

consul: add service
This adds a bundled service file to the consul package, similar to [nomad](https://github.com/void-linux/void-packages/tree/master/srcpkgs/nomad).

#### Testing the changes
- I tested the changes in this PR: **YES**

@iaroki 

A patch file from https://github.com/void-linux/void-packages/pull/44037.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-consul-add-service-44037.patch --]
[-- Type: text/x-diff, Size: 969 bytes --]

From 11c878f416ed641689d5b7fd2d54b5515f198df2 Mon Sep 17 00:00:00 2001
From: Tommy Alatalo <tommy.alatalo@gmail.com>
Date: Tue, 23 May 2023 09:01:19 +0200
Subject: [PATCH] consul: add service

---
 srcpkgs/consul/files/consul/run | 4 ++++
 srcpkgs/consul/template         | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 srcpkgs/consul/files/consul/run

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
new file mode 100644
index 000000000000..ece1efba0ce4
--- /dev/null
+++ b/srcpkgs/consul/files/consul/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec 2>&1
+exec consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ed5683591ac2..ea5e565a2e66 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -15,4 +15,5 @@ checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
 
 post_install() {
 	vlicense LICENSE
+  vsv consul
 }

Re: [PR PATCH] [Updated] consul: add service

[altosys]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

There is an updated pull request by altosys against master on the void-packages repository

https://github.com/altosys/void-packages consul-add-service
https://github.com/void-linux/void-packages/pull/44037

consul: add service
This adds a bundled service file to the consul package, similar to [nomad](https://github.com/void-linux/void-packages/tree/master/srcpkgs/nomad).

#### Testing the changes
- I tested the changes in this PR: **YES**

@iaroki 

A patch file from https://github.com/void-linux/void-packages/pull/44037.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-consul-add-service-44037.patch --]
[-- Type: text/x-diff, Size: 968 bytes --]

From 2cb06ad32f98344ffdbb1439cad87f10333c8297 Mon Sep 17 00:00:00 2001
From: Tommy Alatalo <tommy.alatalo@gmail.com>
Date: Tue, 23 May 2023 09:01:19 +0200
Subject: [PATCH] consul: add service

---
 srcpkgs/consul/files/consul/run | 4 ++++
 srcpkgs/consul/template         | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 srcpkgs/consul/files/consul/run

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
new file mode 100644
index 000000000000..ece1efba0ce4
--- /dev/null
+++ b/srcpkgs/consul/files/consul/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec 2>&1
+exec consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ed5683591ac2..c1ebcad82977 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -15,4 +15,5 @@ checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
 
 post_install() {
 	vlicense LICENSE
+	vsv consul
 }

Re: [PR PATCH] [Updated] consul: add service

[altosys]

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

There is an updated pull request by altosys against master on the void-packages repository

https://github.com/altosys/void-packages consul-add-service
https://github.com/void-linux/void-packages/pull/44037

consul: add service
This adds a bundled service file to the consul package, similar to [nomad](https://github.com/void-linux/void-packages/tree/master/srcpkgs/nomad).

#### Testing the changes
- I tested the changes in this PR: **YES**

@iaroki 

A patch file from https://github.com/void-linux/void-packages/pull/44037.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-consul-add-service-44037.patch --]
[-- Type: text/x-diff, Size: 1203 bytes --]

From bbda751b576d3ddcea208478680faa193b60c457 Mon Sep 17 00:00:00 2001
From: Tommy Alatalo <tommy.alatalo@gmail.com>
Date: Tue, 23 May 2023 09:01:19 +0200
Subject: [PATCH] consul: add service

---
 srcpkgs/consul/files/consul/run | 4 ++++
 srcpkgs/consul/template         | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/consul/files/consul/run

diff --git a/srcpkgs/consul/files/consul/run b/srcpkgs/consul/files/consul/run
new file mode 100644
index 000000000000..ece1efba0ce4
--- /dev/null
+++ b/srcpkgs/consul/files/consul/run
@@ -0,0 +1,4 @@
+#!/bin/sh
+[ -r conf ] && . ./conf
+exec 2>&1
+exec consul agent -config-dir=/etc/consul.d
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index ed5683591ac2..189ef2eaf55b 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -1,7 +1,7 @@
 # Template file for 'consul'
 pkgname=consul
 version=1.15.1
-revision=2
+revision=3
 build_style=go
 go_import_path="github.com/hashicorp/consul"
 _git_commit=7c04b6a0dd433619e788617434a4c236b7d4f892
@@ -15,4 +15,5 @@ checksum=3f5f698aad0343642949d1c442e6e8bbcd835e3c173e4ee8ebb087758d1e31a4
 
 post_install() {
 	vlicense LICENSE
+	vsv consul
 }

Re: [PR REVIEW] consul: add service

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

New review comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/44037#discussion_r1204608770

Comment:
I'd feel better if this config dir was configurable. Maybe just have all the flags configurable with a sane default.

Re: [PR REVIEW] consul: add service

[altosys]

[-- Attachment #1: Type: text/plain, Size: 527 bytes --]

New review comment by altosys on void-packages repository

https://github.com/void-linux/void-packages/pull/44037#discussion_r1204655344

Comment:
I was matching this to how the [nomad service](https://github.com/void-linux/void-packages/blob/master/srcpkgs/nomad/files/nomad/run#L5) is executed, and `/etc/consul.d` is the de facto standard for where consul config files are put. We could of course change it to something like `-config-dir=${CONSUL_CONFIG_DIR:-/etc/consul.d}` but I'm not sure if that's what you had in mind.

Re: [PR PATCH] [Merged]: consul: add service

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There's a merged pull request on the void-packages repository

consul: add service
https://github.com/void-linux/void-packages/pull/44037

Description:
This adds a bundled service file to the consul package, similar to [nomad](https://github.com/void-linux/void-packages/tree/master/srcpkgs/nomad).

#### Testing the changes
- I tested the changes in this PR: **YES**

@iaroki 

Re: [PR REVIEW] consul: add service

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

New review comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/44037#discussion_r1204931281

Comment:
Fair points.