Makefile

@@ -23,25 +23,6 @@ CTs := \
        nextcloud #gitea
 
 
-DEPENDENCIES = make git dig pct
-
-
-
-#----------------------------------------------------------------------
-# dependency checking...
-
-require(%):
-	@printf "%-20s %s\n" \
-		"$*" \
-		"`which $* &> /dev/null && echo '- OK' || echo '- FAIL'`"
-
-.PHONY: check-message
-check-message:
-
-.PHONY: check
-check: check-message $(foreach dep,$(DEPENDENCIES),require($(dep)))
-
-
 
 #----------------------------------------------------------------------
 
@@ -54,10 +35,7 @@ FORCE:
 
 
 config.global: config.global.example
-	@ [ ! -e "$@" ] \
+	vim "+0r config.global.example" $@
-		&& cat "$<" > "$@" \
-		&& $(EDITOR) "$@" \
-	|| true
 
 
 

config.global.example

@@ -1,73 +1,27 @@
-#------------------------------------------------------------------------
 #
-# Global config file
+# Setting an option here will disable its interactive dialog. prefixing 
+# an option (except for ROOTPASS) with "DFL_" will set the default value 
+# and show the dialog enabling the user to tweak/confirm the value.
 #
-# Prefixing an option (except for ROOTPASS) with "DFL_" will set the 
-# default value and show the dialog enabling the user to tweak/confirm 
-# the value, while options without the prefix will be set without user 
-# interaction.
-# Options left unset will be interactively requested during the make
-# process.
-# To disable an option leaving it blank set it to 'SKIP'.
-#
-# CT-specific settings can be set in <ct>/config files for each 
-# specific CT.
-#
-# It is not recomended to set passwords here or in other config files.
-#
-#
-#------------------------------------------------------------------------
 
 DFL_EMAIL=user@example.com
-
 DFL_DOMAIN=example.com
-
 DFL_WAN_IP=192.168.1.101/24
 DFL_WAN_GATE=192.168.1.252
 
+DFL_WAN_BRIDGE=2
+DFL_LAN_BRIDGE=0
+DFL_ADMIN_BRIDGE=1
 
-# CT interface bridge configuration.
+# this can be used for passing in ssh keys, etc...
-#
+DFL_PCT_EXTRA=
-# These are set to the bridge number (the number in 'vmbr#') used for 
-# a specific network.
-#
-# Example:
-# 	WAN_BRIDGE=0
-#	LAN_BRIDGE=1
-#	ADMIN_BRIDGE=2
-#
-WAN_BRIDGE=
-LAN_BRIDGE=
-ADMIN_BRIDGE=
 
-
-# Extra options passed to each CT created.
-#
-# This can be used for passing in ssh keys, etc...
-#
-# see: 
-# 	man pct
-#
-DFL_PCT_EXTRA=SKIP
-
-
-
-#------------------------------------------------------------------------
-#
-# Options afetr this point are sane defaults and in the general case 
-# can be left as-is.
-#
-
-# Nameserver
 NS_HOSTNAME=ns
 NS_ADMIN_IP=10.0.0.1/24
 NS_LAN_IP=10.1.1.1/24
 
-# Gateway / Reverse proxy
 GATE_HOSTNAME=gate
 GATE_ADMIN_IP=10.0.0.2/24
 GATE_LAN_IP=10.1.1.2/24
 
 
-
-#------------------------------------------------------------------------

gate-traefik/templates/etc/network/interfaces

@@ -2,12 +2,6 @@ auto lo
 iface lo inet loopback
 iface lo inet6 loopback
 
-auto wan
-iface wan inet static
-	address ${WAN_IP}
-	gateway ${WAN_GATE} 
-	hostname $(hostname)
-
 auto admin
 iface admin inet static
 	address ${ADMIN_IP}
@@ -18,6 +12,12 @@ iface lan inet static
 	address ${LAN_IP}
 	hostname $(hostname)
 
+auto wan
+iface wan inet static
+	address ${WAN_IP}
+	gateway ${WAN_GATE} 
+	hostname $(hostname)
+
 auto br0
 iface br0 inet static
 	pre-up echo 1 > /proc/sys/net/ipv4/ip_forward