diff --git a/.pct-helpers b/.pct-helpers index 326739b..e8792ac 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -451,12 +451,25 @@ readVars(){ # Gateways can be: # # + # XXX these are the same... xread "WAN ip: " WAN_IP - xread "WAN gateway: " WAN_GATE + if [[ $WAN_IP != "dhcp" ]] ; then + xread "WAN gateway: " WAN_GATE + else + WAN_GATE= + fi xread "LAN ip: " LAN_IP - xread "LAN gateway: " LAN_GATE + if [[ $LAN_IP != "dhcp" ]] ; then + xread "LAN gateway: " LAN_GATE + else + LAN_GATE= + fi xread "ADMIN ip: " ADMIN_IP - xread "ADMIN gateway: " ADMIN_GATE + if [[ $ADMIN_IP != "dhcp" ]] ; then + xread "ADMIN gateway: " ADMIN_GATE + else + ADMIN_GATE= + fi # root password... if [ -z $ROOTPASS ] ; then diff --git a/config.global.example b/config.global.example index 7a9a116..1990b09 100644 --- a/config.global.example +++ b/config.global.example @@ -18,14 +18,6 @@ # #------------------------------------------------------------------------ -EMAIL=user@example.com - -DOMAIN=example.com - -DFL_WAN_IP=192.168.1.101/24 -DFL_WAN_GATE=192.168.1.252 - - # CT interface bridge configuration. # # These are set to the bridge number (the number in 'vmbr#') used for @@ -41,6 +33,17 @@ LAN_BRIDGE= ADMIN_BRIDGE= +DFL_WAN_IP=192.168.1.101/24 +DFL_WAN_GATE=192.168.1.252 + + +# Doman and email configuration +# +EMAIL=user@example.com + +DOMAIN=example.com + + # Web app/service domain configuration # # Here two optional variables are provided per service: @@ -56,7 +59,7 @@ NEXTCLOUD_SUBDOMAIN=nc. # Gitea #GITEA_DOMAIN= -#GITEA_SUBDOMAIN= +#GITEA_SUBDOMAIN=git. # Extra options passed to each CT created. @@ -66,6 +69,9 @@ NEXTCLOUD_SUBDOMAIN=nc. # see: # man pct # +# Example: +# DFL_PCT_EXTRA="--ssh-public-keys /path/to/autohrized_keys" +# DFL_PCT_EXTRA=SKIP