.pct-helpers

@@ -17,10 +17,10 @@ ECHO_PREFIX="### "
 @(){
 	if [ -z $DRY_RUN ] ; then
 		! [ $QUIET ] \
-			&& echo -e "${ECHO_PREFIX}$@"
+			&& echo "${ECHO_PREFIX}$@"
 		"$@"
 	else
-		echo -e $@
+		echo $@
 	fi
 	return $?
 }
@@ -660,35 +660,19 @@ pctUpdateTurnkey(){
 pctSet(){
 	[ "$2" ] \
 		&& @ pct set $1 \
-			${2}
+			${2} \
 	[ "$3" ] \
 		&& @ pct reboot $1
 }
 
 #
-#	pctSetNotes ID [DESCRIPTION]
+#	pctSetNotes ID
 #
+# XXX BUG: this deos not work yet...
 pctSetNotes(){
-	# XXX for some reason this complains quote alot...
+	[ "$DESCRIPTION" ] \
-	#[ "$DESCRIPTION" ] \
+		&& @ pct set $1 \
-	#	&& @ pct set $1 \
+			"${DESCRIPTION:+--description \""${DESCRIPTION}"\"}"
-	#		"${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 $(MINIMAL_CTs)
+minimal: core $(BASE_CTs)
 
 
 .PHONY: dev

gate-traefik/NOTES.md

@@ -1,12 +0,0 @@
-# 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

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

nextcloud/NOTES.md

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

ns/NOTES.md

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

ssh/NOTES.md

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

syncthing/NOTES.md

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

wireguard/NOTES.md

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