Compare commits

..

No commits in common. "95369a63add5f38a0691aa248fb2777bc4b769ff" and "443e48e051e2a789a35354df07eee779c40da19b" have entirely different histories.

5 changed files with 66 additions and 70 deletions

View File

@ -2,7 +2,7 @@
config.global: config.global.example config.global: config.global.example
vim "+0r config.global.example" $@ vim "+0r config.global.example" $<
config: config.global config: config.global
@ -21,17 +21,13 @@ ns:
ssh: ssh:
$@/make.sh $@/make.sh
.PHONY: wireguard
wireguard:
$@/make.sh
.PHONY: syncthing .PHONY: syncthing
syncthing: syncthing:
$@/make.sh $@/make.sh
.PHONY: all .PHONY: all
all: config gate ns ssh wireguard syncthing all: config gate ns ssh syncthing

View File

@ -47,8 +47,8 @@ OPTS_STAGE_1="\
--hostname $CTHOSTNAME \ --hostname $CTHOSTNAME \
--memory $RAM \ --memory $RAM \
--swap $SWAP \ --swap $SWAP \
--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \ --net0 name=lan,bridge=vmbr0,firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \
--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1${ADMIN_IP:+,ip=$ADMIN_IP},type=veth \ --net1 name=admin,bridge=vmbr1,firewall=1${ADMIN_IP:+,ip=$ADMIN_IP},type=veth \
--storage local-lvm \ --storage local-lvm \
--rootfs local-lvm:$DRIVE \ --rootfs local-lvm:$DRIVE \
--unprivileged 1 \ --unprivileged 1 \

View File

@ -47,8 +47,8 @@ OPTS_STAGE_1="\
--hostname $CTHOSTNAME \ --hostname $CTHOSTNAME \
--memory $RAM \ --memory $RAM \
--swap $SWAP \ --swap $SWAP \
--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \ --net0 name=lan,bridge=vmbr0,firewall=1,ip=dhcp,type=veth \
--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \ --net1 name=admin,bridge=vmbr1,firewall=1,ip=dhcp,type=veth \
--storage local-lvm \ --storage local-lvm \
--rootfs local-lvm:$DRIVE \ --rootfs local-lvm:$DRIVE \
--unprivileged 1 \ --unprivileged 1 \

View File

@ -46,8 +46,8 @@ OPTS_STAGE_1="\
--hostname $CTHOSTNAME \ --hostname $CTHOSTNAME \
--memory $RAM \ --memory $RAM \
--swap $SWAP \ --swap $SWAP \
--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \ --net0 name=lan,bridge=vmbr0,firewall=1,ip=dhcp,type=veth \
--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \ --net1 name=admin,bridge=vmbr1,firewall=1,ip=dhcp,type=veth \
--storage local-lvm \ --storage local-lvm \
--rootfs local-lvm:$DRIVE \ --rootfs local-lvm:$DRIVE \
--unprivileged 1 \ --unprivileged 1 \