README.md

@@ -4,23 +4,22 @@ A set of scripts for automating setup and tasks in proxmox.
 
 ## TODO
 - revise defaults
-- separate templates/assets into distribution and user directories
+
-  ...this is needed to allow the user to change the configs without the 
+## Goals
-  fear of them being overwritten by git (similar to how config is handlerd)
+- support the basic CT lifecicle:
-- automate:
+  - setup/build/update
-  - create/destory -- DONE
+  - run
-  - updates
+  - destroy
-  - backup/restore
 - basic infrastructure CT's
-  - ns -- DONE
+  - ns
-  - gate / reverse proxy -- DONE
+  - gate / reverse proxy
 - basic service CT's
-  - syncthing -- DONE
+  - syncthing
-  - git -- DONE
+  - git
-  - nextcloud -- DONE
+  - nextcloud
-  - vpn -- DONE
+  - vpn
-  - ssh -- DONE
+  - ssh
-  - mail
+  - mail (???)
 - basic recurent tasks
   - backups
   - archiving

wireguard/make.sh

@@ -98,21 +98,20 @@ echo "# Copying assets..."
 @ lxc-attach $ID -- chmod +x /root/getFreeClientIP
 
 #echo "# Setup: wireguard server..."
-@ lxc-attach $ID -- bash -c "cd /root && make server"
+@ lxc-attach $ID -- bash -c 'cd /root && make server'
 
 echo "# Setup: wireguard default profile..."
-@ lxc-attach $ID -- bash -c "cd /root \
+@ lxc-attach $ID -- bash -c "cd /root && make default.client" 
-	&& QRCODE=${QRCODE} make default.client" 
 @ lxc-attach $ID -- chmod 600 /etc/wireguard/wg0.conf
 
 echo "# client config:"
 @ mkdir -p clients
 @ pct pull $ID /etc/wireguard/clients/default.conf clients/default.conf
 # show the profile as a qrcode...
-#if [ "$QRCODE" ] ; then
+if [ "$QRCODE" ] ; then
-#	echo "# default profile:"
+	echo "# default profile:"
-#	@ lxc-attach $ID -- qrencode -t UTF8 -r /etc/wireguard/clients/default.conf
+	@ lxc-attach $ID -- qrencode -t UTF8 -r /etc/wireguard/clients/default.conf
-#fi
+fi
 
 #echo "# Setup: bridge device..."
 @ lxc-attach $ID wg-quick up wg0 

wireguard/templates/root/Makefile

@@ -11,7 +11,6 @@ SERVER_PUBLIC_KEY := $(SERVER_DIR)/server_id.pub
 CLIENT_TPL := templates/client.conf
 CLIENT_DIR := $(SERVER_DIR)/clients/
 
-QRCODE ?= 1
 
 ENDPOINT ?= ${ENDPOINT}
 ENDPOINT_PORT ?= ${ENDPOINT_PORT}
@@ -62,9 +61,7 @@ $(SERVER_CONF): $(SERVER_TPL) $(SERVER_KEY)
 			-e 's/\$${\CLIENT_PUBLIC_KEY}/'$$(sed -e 's/\//\\\//g' "$(CLIENT_DIR)/$*_id.pub")'/g' \
 			-e 's/\$${\SERVER_PUBLIC_KEY}/'$$(sed -e 's/\//\\\//g' "$(SERVER_PUBLIC_KEY)")'/g' \
 		>> "$(SERVER_CONF)"
-	@ [ -z "$$QRCODE" ] \
+
-		|| ( echo "# Profile: $*" \
-			&& qrencode -t UTF8 -r "$(CLIENT_DIR)/$*.conf" )
 
 
 server: $(SERVER_CONF)