version 2.3.0

CHANGELOG.md

@@ -1,8 +1,8 @@
 CHANGELOG
 =========
 
-Next
-----
+version 2.3.0
+-------------
 - Security updates (docker images)
 - Support for multiple (ssh) keys per user (`listkey`, `addkey`, `delkey`)
 - Support for `exec` action to enter an application service

Makefile

@@ -6,7 +6,8 @@ DIRS = proxy dca
 ALL_SOURCES = $(wildcard $(addsuffix *,$(DIRS))) $(OCAL_SOURCES)
 
 $(INSTALLER): $(TMPL) $(ARCHIVE)
-	@(cat $(TMPL); base64 $(ARCHIVE)) > $@
+	@CAPP_VER=$$(sed -rn '/^__version__ =/{s/.*\((.+), (.+), (.+)\)/\1.\2.\3/;p}' capp); \
+	(sed -r "s/^CAPP_VER=.*/CAPP_VER=$$CAPP_VER/" $(TMPL); base64 $(ARCHIVE)) > $@
 	@chmod +x $@
 
 proxy/nginx.tmpl: proxy/get-nginx-tmpl

capp

@@ -54,7 +54,7 @@ from yaml import (
 
 from verify_dca import verify_checksum
 
-__version__ = (2, 2, 0)
+__version__ = (2, 3, 0)
 
 
 def printflush(*args, **kwargs):

capp-installer-template

@@ -1,12 +1,12 @@
 #!/bin/bash
+CAPP_VER=to_replace
 COMPOSE_SYSTEMD_VER=1.2.0
-set -e
 def_cont_mem='10G'
-usage() {
-    echo "$0 default_hostname default_email [container_max_memory_size=$def_cont_mem] [nohttps]" >&2
-    echo "  container_max_memory_size should be expressed with M or G units" >&2
-    exit 1
-}
+set -e
+if [ "$1" = "-v" ] || [ "$1" = "--version" ]; then
+    echo "$CAPP_VER"
+    exit 0
+fi
 if [ $(id -u) -ne 0 ]; then
     echo "Root required" >&2
     exit 1
@@ -19,6 +19,11 @@ for bin in useradd usermod base64 curl docker-compose sudo tar unxz; do
 done
 me=$(readlink -f "$0")
 offset=$(($(sed -rn '/#{10}/=' "$me") + 1))
+usage() {
+    echo "$0 default_hostname default_email [container_max_memory_size=$def_cont_mem] [nohttps]" >&2
+    echo "  container_max_memory_size should be expressed with M or G units" >&2
+    exit 1
+}
 dh="$1"
 [ -n "$dh" ] && shift || usage
 de="$1"