flynx/proxmox-utils
1
0
Fork 0
mirror of https://github.com/flynx/proxmox-utils.git synced 2025-12-25 12:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: flynx:443e48e051e2a789a35354df07eee779c40da19b
Branches Tags
flynx:master
..
compare: flynx:95369a63add5f38a0691aa248fb2777bc4b769ff
Branches Tags
flynx:master

3 Commits
443e48e051 ... 95369a63ad

Author SHA1 Message Date
Alex A. Naanou
95369a63ad now bridge config is read correctly.. 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
 2024-01-06 19:37:31 +03:00
Alex A. Naanou
4fcf728e77 minor fixes... 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
 2024-01-06 18:31:13 +03:00
Alex A. Naanou
fa24385ffb notes... 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
 2024-01-06 11:50:15 +03:00
5 changed files with 70 additions and 66 deletions
Show Stats Expand all files Collapse all files

70
Makefile
View File

@ -1,33 +1,37 @@
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
.PHONY: gate .PHONY: gate
gate: ./gate-traefik gate: ./gate-traefik
$</make.sh $</make.sh
.PHONY: ns .PHONY: ns
ns: ns:
$@/make.sh $@/make.sh
.PHONY: ssh .PHONY: ssh
ssh: ssh:
$@/make.sh $@/make.sh
.PHONY: syncthing .PHONY: wireguard
syncthing: wireguard:
$@/make.sh $@/make.sh
.PHONY: syncthing
.PHONY: all syncthing:
all: config gate ns ssh syncthing $@/make.sh
.PHONY: all
all: config gate ns ssh wireguard syncthing

54
config.global.example
View File

@ -1,27 +1,27 @@
# #
# Setting an option here will disable its interactive dialog. prefixing # Setting an option here will disable its interactive dialog. prefixing
# an option (except for ROOTPASS) with "DFL_" will set the default value # an option (except for ROOTPASS) with "DFL_" will set the default value
# and show the dialog enabling the user to tweak/confirm the value. # and show the dialog enabling the user to tweak/confirm the value.
# #
DFL_EMAIL=user@example.com DFL_EMAIL=user@example.com
DFL_DOMAIN=example.com DFL_DOMAIN=example.com
DFL_WAN_IP=192.168.1.101/24 DFL_WAN_IP=192.168.1.101/24
DFL_WAN_GATE=192.168.1.252 DFL_WAN_GATE=192.168.1.252
DFL_WAN_BRIDGE=2 DFL_WAN_BRIDGE=2
DFL_LAN_BRIDGE=0 DFL_LAN_BRIDGE=0
DFL_ADMIN_BRIDGE=1 DFL_ADMIN_BRIDGE=1
# this can be used for passing in ssh keys, etc... # this can be used for passing in ssh keys, etc...
DFL_PCT_EXTRA= DFL_PCT_EXTRA=
NS_HOSTNAME=ns NS_HOSTNAME=ns
NS_ADMIN_IP=10.0.0.1/24 NS_ADMIN_IP=10.0.0.1/24
NS_LAN_IP=10.1.1.1/24 NS_LAN_IP=10.1.1.1/24
GATE_HOSTNAME=gate GATE_HOSTNAME=gate
GATE_ADMIN_IP=10.0.0.2/24 GATE_ADMIN_IP=10.0.0.2/24
GATE_LAN_IP=10.1.1.2/24 GATE_LAN_IP=10.1.1.2/24

4
ns/make.sh
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=vmbr0,firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \ --net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \
--net1 name=admin,bridge=vmbr1,firewall=1${ADMIN_IP:+,ip=$ADMIN_IP},type=veth \ --net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},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 \

4
ssh/make.sh
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=vmbr0,firewall=1,ip=dhcp,type=veth \ --net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--net1 name=admin,bridge=vmbr1,firewall=1,ip=dhcp,type=veth \ --net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--storage local-lvm \ --storage local-lvm \
--rootfs local-lvm:$DRIVE \ --rootfs local-lvm:$DRIVE \
--unprivileged 1 \ --unprivileged 1 \

4
syncthing/make.sh
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=vmbr0,firewall=1,ip=dhcp,type=veth \ --net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--net1 name=admin,bridge=vmbr1,firewall=1,ip=dhcp,type=veth \ --net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--storage local-lvm \ --storage local-lvm \
--rootfs local-lvm:$DRIVE \ --rootfs local-lvm:$DRIVE \
--unprivileged 1 \ --unprivileged 1 \