Compare commits

..

No commits in common. "692d3aa4fe8d269073f8d5139bd306bc2302b925" and "9aa81503b03797ee46271864429a139def1b39d0" have entirely different histories.

3 changed files with 7 additions and 8 deletions

View File

@ -96,9 +96,8 @@ OPTS_STAGE_1="\
--hostname $CTHOSTNAME \ --hostname $CTHOSTNAME \
--memory 128 \ --memory 128 \
--swap 128 \ --swap 128 \
--net0 name=wan,bridge=vmbr${WAN_BRIDGE},firewall=1${WAN_GATE:+,gw=${WAN_GATE}}${WAN_IP:+,ip=${WAN_IP}},type=veth \ --net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=10.0.0.2/24,type=veth \ --net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--net2 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=10.1.1.2/24,type=veth \
--storage local-lvm \ --storage local-lvm \
--rootfs local-lvm:0.5 \ --rootfs local-lvm:0.5 \
--unprivileged 1 \ --unprivileged 1 \
@ -106,6 +105,7 @@ OPTS_STAGE_1="\
" "
OPTS_STAGE_2="\ OPTS_STAGE_2="\
--net2 name=wan,bridge=vmbr${WAN_BRIDGE},firewall=1${WAN_GATE:+,gw=${WAN_GATE}}${WAN_IP:+,ip=${WAN_IP}},type=veth \
--startup order=80 \ --startup order=80 \
--onboot 1 \ --onboot 1 \
" "

View File

@ -3,13 +3,13 @@ iface lo inet loopback
iface lo inet6 loopback iface lo inet6 loopback
auto admin auto admin
iface admin inet static iface admin inet dhcp
address 10.0.0.2 #address 10.0.0.2
hostname $(hostname) hostname $(hostname)
auto lan auto lan
iface lan inet static iface lan inet dhcp
address 10.1.1.2 #address 10.1.1.2
hostname $(hostname) hostname $(hostname)
auto wan auto wan

View File

@ -65,4 +65,3 @@ certificatesResolvers:
acme: acme:
email: '${EMAIL}' email: '${EMAIL}'
storage: '/etc/traefik/acme.json' storage: '/etc/traefik/acme.json'
tlsChallenge: {}