Version increment for new feature

Pass consul servers in as comma-deliminated list
thrashwerk · May 2, 2023 · 5156cb5 · 5156cb5
1 parent 667758f
commit 5156cb5
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 9 deletions.
diff --git a/openldap/CHANGELOG.md b/openldap/CHANGELOG.md
@@ -1,3 +1,10 @@
+1.8
+
+* Version increment for new feature
+* Pass consul servers in as comma-deliminated list
+
+---
+
 1.7
 
 * Version bump for new base image

diff --git a/openldap/README.md b/openldap/README.md
@@ -64,10 +64,10 @@ Thereafter these files will load automatically, along with any updates, from per
   sudo pot set-env -p <jailname> \
   -E NODENAME=name \
   -E DATACENTER=<datacenter> \
-  -E CONSULSERVERS='"1.2.3.4"' \
-  -E GOSSIPKEY=<key> \
+  -E CONSULSERVERS="<comma-deliminated list of consul servers>" \
+  -E GOSSIPKEY="<key>" \
   -E IP=<IP address> \
-  -E DOMAIN=<domain name> \
+  -E DOMAIN="<domain name>" \
   -E MYCREDS=<openldap root pass> \
   -E HOSTNAME=<hostname> \
   [ -E CRONBACKUP=/mnt/openldap-data/backups ] \
@@ -84,7 +84,9 @@ The NODENAME parameter is the name of the node.
 
 The DATACENTER parameter is the name of the datacenter.
 
-The CONSULSERVERS parameter defines the consul server instances, and must be set as ```CONSULSERVERS='"10.0.0.2"'``` or ```CONSULSERVERS='"10.0.0.2", "10.0.0.3", "10.0.0.4"'``` or ```CONSULSERVERS='"10.0.0.2", "10.0.0.3", "10.0.0.4", "10.0.0.5", "10.0.0.6"'```
+The CONSULSERVERS parameter is a comma-deliminated list of consul servers. Do not include spaces!
+
+e.g. ```CONSULSERVERS="10.0.0.2"``` or ```CONSULSERVERS="10.0.0.2,10.0.0.3,10.0.0.4,10.0.0.5,10.0.0.6"```
 
 The GOSSIPKEY parameter is the gossip encryption key for consul agent.
 

diff --git a/openldap/openldap.d/local/bin/cook b/openldap/openldap.d/local/bin/cook
@@ -28,6 +28,10 @@ log() {
     echo "$(date '+%Y-%m-%dT%H:%M:%S') $*" | tee -a $COOKLOG
 }
 
+convert_to_required_format() {
+    echo "$1" | sed 's/\([^,]*\)/"\1"/g'
+}
+
 set -e
 export HOME=/root
 
@@ -63,16 +67,23 @@ for var in $optional_args; do
   fi
 done
 
+########################################################################
+## Provision image
+########################################################################
+
 # split domain argument into parts
 MYSUFFIX=$(echo "$DOMAIN" | awk -F '.' 'NF>=2 {print $(NF-1)}')
 export MYSUFFIX
 MYTLD=$(echo "$DOMAIN" | awk -F '.' 'NF>=2 {print $(NF)}')
 export MYTLD
 echo "From DOMAIN of $DOMAIN we get MYSUFFIX of $MYSUFFIX and MYTLD of $MYTLD"
 
-########################################################################
-## Provision image
-########################################################################
+# Input is "10.0.0.1,10.2.0.1,10.45.2.4"
+# Expected output is "10.0.0.1","10.2.0.1","10.45.2.4"
+if [ -n "${CONSULSERVERS+x}" ]; then
+    FIXCONSULSERVERS=$(convert_to_required_format "$CONSULSERVERS")
+    export FIXCONSULSERVERS
+fi
 
 # stop services
 timeout --foreground 10 \

diff --git a/openldap/openldap.d/local/share/cook/bin/configure-consul.sh b/openldap/openldap.d/local/share/cook/bin/configure-consul.sh
@@ -28,11 +28,13 @@ sep=$'\001'
   sed "s${sep}%%datacenter%%${sep}$DATACENTER${sep}g" | \
   sed "s${sep}%%nodename%%${sep}$NODENAME${sep}g" | \
   sed "s${sep}%%ip%%${sep}$IP${sep}g" | \
-  sed "s${sep}%%consulservers%%${sep}$CONSULSERVERS${sep}g" \
+  sed "s${sep}%%consulservers%%${sep}$FIXCONSULSERVERS${sep}g" \
   > /usr/local/etc/consul.d/agent.hcl
 
 chmod 600 \
   /usr/local/etc/consul.d/agent.hcl
+
+# gossipkey
 echo "s${sep}%%gossipkey%%${sep}$GOSSIPKEY${sep}" | sed -i '' -f - \
   /usr/local/etc/consul.d/agent.hcl
 

diff --git a/openldap/openldap.ini b/openldap/openldap.ini
@@ -1,6 +1,6 @@
 [manifest]
 potname="openldap"
 author = "Stephan Lichtenauer, Bretton Vine, Michael Gmelin"
-version="1.7.2"
+version="1.8.1"
 origin="freebsd"
 runs_in_nomad="false"