merge...

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

.pct-helpers

@@ -119,7 +119,9 @@ fillsection(){ (
 
 ct2hostname(){
 	local ct=${CT_DIR}/${1}.conf
-	local host=$(cat $ct | grep hostname | head -1)
+	local host=$(cat $ct \
+		| grep -e '^\s*hostname:' \
+		| head -1)
 	echo ${host/hostname: /}
 }
 

gitea/make.sh

@@ -78,6 +78,9 @@ pctSetNotes $ID
 
 saveLastRunConfig
 
+echo "# Traefik config..."
+traefikPushConfig
+
 showNotes
 echo "# Done."
 

host/make.sh

@@ -106,6 +106,9 @@ echo "# Building config..."
 buildAssets
 
 
+# XXX /etc/hosts???
+
+
 # DNS
 if xreadYes "# Update DNS?" DNS ; then
 	file=/etc/resolv.conf

make-shares

@@ -23,8 +23,7 @@ fi
 for ct in $CT_DIR/*.conf ; do
 	id=$(basename ${ct/.conf/})
 
-	# XXX this seems to break on 302...
+	host=$(ct2hostname $id)
-	host=$(cat $ct | grep hostname | head -1)
 	host=${host/hostname: /}
 
 	# skip templates...

nextcloud/make.sh

@@ -141,6 +141,9 @@ pctSetNotes $ID
 
 saveLastRunConfig
 
+echo "# Traefik config..."
+traefikPushConfig
+
 showNotes
 echo "# Done."
 

ssh/make.sh

@@ -95,6 +95,7 @@ pctSetNotes $ID
 
 saveLastRunConfig
 
+echo "# Traefik config..."
 traefikPushConfig
 
 showNotes

wireguard/make.sh

@@ -105,6 +105,9 @@ pctSetNotes $ID
 
 saveLastRunConfig
 
+echo "# Traefik config..."
+traefikPushConfig
+
 showNotes
 echo "# Done."