fix...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

.pct-helpers

@@ -17,10 +17,10 @@ ECHO_PREFIX="### "
 @(){
 	if [ -z $DRY_RUN ] ; then
 		! [ $QUIET ] \
-			&& echo "${ECHO_PREFIX}$@"
+			&& echo -e "${ECHO_PREFIX}$@"
 		"$@"
 	else
-		echo $@
+		echo -e $@
 	fi
 	return $?
 }
@@ -660,19 +660,35 @@ pctUpdateTurnkey(){
 pctSet(){
 	[ "$2" ] \
 		&& @ pct set $1 \
-			${2} \
+			${2}
 	[ "$3" ] \
 		&& @ pct reboot $1
 }
 
 #
-#	pctSetNotes ID
+#	pctSetNotes ID [DESCRIPTION]
 #
-# XXX BUG: this deos not work yet...
 pctSetNotes(){
-	[ "$DESCRIPTION" ] \
+	# XXX for some reason this complains quote alot...
-		&& @ pct set $1 \
+	#[ "$DESCRIPTION" ] \
-			"${DESCRIPTION:+--description \""${DESCRIPTION}"\"}"
+	#	&& @ pct set $1 \
+	#		"${DESCRIPTION:+--description \""${DESCRIPTION}"\"}"
+	local ID=$1
+	local NOTES="$(\
+		echo -e "${2:-${DESCRIPTION}}" \
+			| sed -e 's/^/#/')"
+	local CONF="$(cat "${CT_DIR}/${ID}.conf")"
+	local TEXT="\
+"${NOTES}"
+"${CONF}"
+"
+	if [ "$DRY_RUN" ] ; then
+		echo "--- ${CT_DIR}/${ID}.conf ---"
+		echo -e "${TEXT}"
+		echo "--- ${CT_DIR}/${ID}.conf ---"
+	else
+		echo -e "${TEXT}" > "${CT_DIR}/${ID}.conf"
+	fi
 }
 
 

Makefile

@@ -84,11 +84,11 @@ gate: gate-traefik
 
 
 .PHONY: core
-core: config $CORE_CTs)
+core: config $(CORE_CTs)
 
 
 .PHONY: minimal
-minimal: core $(BASE_CTs)
+minimal: core $(MINIMAL_CTs)
 
 
 .PHONY: dev

gate-traefik/NOTES.md

@@ -0,0 +1,12 @@
+# Gateway
+
+- NAT/Firewall (iptables)
+- Reverse-Proxy (traefik)
+
+WAN: `${WAN_IPn}`  
+LAN: `${GATE_LAN_IPn}`  
+
+**Dashboard**:
+- http://${CTHOSTNAME}.srv:8080/
+- http://${GATE_LAN_IPn}:8080/
+

gitea/NOTES.md

@@ -0,0 +1,5 @@
+# Gitea
+
+https://${CTHOSTNAME}.srv
+
+

nextcloud/NOTES.md

@@ -1,5 +1,5 @@
 # Nextcloud
 
-Hostname: `${CTHOSTNAME}`
+https://${CTHOSTNAME}.srv
 
 

ns/NOTES.md

@@ -0,0 +1,5 @@
+# DHCP / DNS
+
+admin: `${ADMIN_IPn}`  
+lan: `${LAN_IPn}`
+

ssh/NOTES.md

@@ -0,0 +1,9 @@
+# SSH (admin)
+
+SSH landing into the network
+
+${HOSTNAME}  
+${CTHOSTNAME}.srv  
+${WAN_SSH_IPn}  
+${LAN_IP} (DHCP)  
+

syncthing/NOTES.md

@@ -0,0 +1,5 @@
+# Syncthing
+
+https://${CTHOSTNAME}.srv
+
+

wireguard/NOTES.md

@@ -0,0 +1,3 @@
+# WireGuard
+
+