From: Zoltán Felleg Date: Wed, 27 Sep 2023 13:24:16 +0000 (+0200) Subject: Updated vpn.in (added/removed vpn users). X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=677bf23365731bf4d3cc7b50fcac553b8d28fabe;p=user-lxc.git Updated vpn.in (added/removed vpn users). --- diff --git a/sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh index 826c95a..174bccf 100755 --- a/sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh +++ b/sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh @@ -7,36 +7,56 @@ export PAGER= sleep 1 systemctl --quiet is-active NetworkManager.service NM_RC=$? -WAITED=0 +CYCLES_WAITED=0 while [ $NM_RC -ne 0 ] do + if [ $CYCLES_WAITED -ge 10 ] + then + exit 1 + fi + if [ $CYCLES_WAITED -eq 0 ] + then + echo -n "Waiting for NetworkManager" + fi echo -n . sleep 1 - WAITED=1 + CYCLES_WAITED=$(( $CYCLES_WAITED + 1 )) systemctl --quiet is-active NetworkManager.service NM_RC=$? done -[ $WAITED -eq 1 ] && echo +[ $CYCLES_WAITED -gt 0 ] && echo -CONNECTIONS=$(nmcli --terse connection show | wc -l) -while [ $CONNECTIONS -ne 1 ] +# wait for the two network connections to come up +CONNECTION_DEVICES_UP=$(nmcli --terse connection show \ + | grep --invert-match ':$' | wc -l) +CYCLES_WAITED=0 +while [ $CONNECTION_DEVICES_UP -lt 2 ] do - echo "Number of connections: $CONNECTIONS" >&2 + if [ $CYCLES_WAITED -ge 10 ] + then + nmcli connection show + exit 1 + fi + if [ $CYCLES_WAITED -eq 0 ] + then + echo -n "Waiting for the network connection" + fi + echo -n . sleep 1 - CONNECTIONS=$(nmcli --terse connection show | wc -l) + CYCLES_WAITED=$(( $CYCLES_WAITED + 1 )) + CONNECTION_DEVICES_UP=$(nmcli --terse connection show \ + | grep --invert-match ':$' | wc -l) done +[ $CYCLES_WAITED -gt 0 ] && echo -nmcli --terse connection show | grep ':$' >/dev/null -ALL_CONNECTION_DEVICES_KNOWN=$? -while [ $ALL_CONNECTION_DEVICES_KNOWN -eq 0 ] -do - echo "Not all connection devices are known yet" >&2 - sleep 1 - nmcli --terse connection show | grep ':$' >/dev/null - ALL_CONNECTION_DEVICES_KNOWN=$? -done +CONNECTIONS=$(nmcli --terse connection show | wc -l) +if [ $CONNECTIONS -ne 2 ] +then + echo "Number of connections: $CONNECTIONS instead of 2" >&2 + exit 1 +fi -CONNECTION_LINE=$(nmcli --terse connection show) +CONNECTION_LINE=$(nmcli --terse connection show | grep ':eth0$') CONNECTION_UUID=$(echo $CONNECTION_LINE | cut -f 2 -d ':') CONNECTION_DEVICE=$(echo $CONNECTION_LINE | cut -f 4 -d ':') @@ -56,3 +76,6 @@ nmcli connection add \ save yes nmcli connection show + +hostnamectl hostname vpn.in.useribm.hu +hostnamectl diff --git a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/akic.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/akic.conf new file mode 100644 index 0000000..8121327 --- /dev/null +++ b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/akic.conf @@ -0,0 +1,10 @@ +[Interface] +Address = 172.24.232.15/24 +PrivateKey = kAXQa5anlI6zQIkHdiGK5U0BtaQ3CziX6Vpw09FISlY= +DNS = 10.228.109.159, 10.228.92.159, in.useribm.hu + +[Peer] +PublicKey = uSwGsVY6WrmP6nyPw7kN3airj7ARutQKv6+aDPgPpSo= +AllowedIPs = 172.24.232.1/32, 10.228.0.0/16, 192.168.42.0/24, 192.168.43.0/24 +Endpoint = vpn.useribm.hu:51820 +PersistentKeepalive = 25 diff --git a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/keys.txt b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/keys.txt index 2b13cb3..6834dd9 100644 --- a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/keys.txt +++ b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/keys.txt @@ -3,6 +3,8 @@ private: gMMrtKBqMnLFPmQZwtf7tOxghylOAto0BVSJ4FiqJ1Y= public: uSwGsVY6WrmP6nyPw7 akosztolanyi private: aIsQc1k9KMElBSr3Jy9V0f7U9wIGrf8Hpx9GQntRD3s= public: AKoS0kccfwrAcqCIXyUduirX2U3xmg66Wxo0Ls2EgDQ= +akosztolanyi irrigation controller +private: kAXQa5anlI6zQIkHdiGK5U0BtaQ3CziX6Vpw09FISlY= public: AKicmwTscIAkyIiHr0nQBdrlYr3Z8x9ZNvmosr0epWM= csgulyas private: wMhSuxvfpr6xbuJ7r7nDrJgYBs1RRml2nHpj3MGInmM= public: CSgU7TPb8r8Xq4ZZEZsYAbrO2IW1bfbpnKxFdEfDpis= cslevai diff --git a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/lpaldi.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/lpaldi.conf new file mode 100644 index 0000000..3e127f0 --- /dev/null +++ b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/lpaldi.conf @@ -0,0 +1,10 @@ +[Interface] +Address = 172.24.232.95/24 +PrivateKey = mEjvJGINhlcfv2SaV42MkRCCBud0fjX3nBNiB4aZSkI= +DNS = 10.228.109.159, 10.228.92.159, in.useribm.hu + +[Peer] +PublicKey = uSwGsVY6WrmP6nyPw7kN3airj7ARutQKv6+aDPgPpSo= +AllowedIPs = 172.24.232.1/32, 10.228.0.0/16, 192.168.42.0/24, 192.168.43.0/24 +Endpoint = vpn.useribm.hu:51820 +PersistentKeepalive = 25 diff --git a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/wgs.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/wgs.conf index 89654bc..a989aff 100644 --- a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/wgs.conf +++ b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/wgs.conf @@ -8,6 +8,11 @@ ListenPort = 51820 PublicKey = AKoS0kccfwrAcqCIXyUduirX2U3xmg66Wxo0Ls2EgDQ= AllowedIPs = 172.24.232.10/32 +[Peer] +# akosztolanyi irrigation controller +PublicKey = AKicmwTscIAkyIiHr0nQBdrlYr3Z8x9ZNvmosr0epWM= +AllowedIPs = 172.24.232.15/32 + [Peer] # csgulyas PublicKey = CSgU7TPb8r8Xq4ZZEZsYAbrO2IW1bfbpnKxFdEfDpis= @@ -48,6 +53,11 @@ AllowedIPs = 172.24.232.80/32 PublicKey = KvAjD9BtnfsSmUZbwCRpVCOvlitCh7aDTGqi0DiBryE= AllowedIPs = 172.24.232.90/32 +[Peer] +# lpaldi +PublicKey = lpaLzlmcPCTM95svC86Gn51WvtVUgKTjWI0BDEpK2Bk= +AllowedIPs = 172.24.232.95/32 + [Peer] # mszabo PublicKey = mSzafcgJP3OIELE9G8WA6SXuov1vXZQQ6JY6YikLSxs= @@ -73,22 +83,22 @@ AllowedIPs = 172.24.232.130/32 PublicKey = QqcS3jXx59JEnUN6zAVoIohTjwTIrooG9oLbTSGeZw4= AllowedIPs = 172.24.232.135/32, 10.162.0.0/16 -[Peer] +#[Peer] # flex -PublicKey = fLeXEE4gpmAKgVUzJ14tdMH0Hm146syDwbBdXgwWdTo= -AllowedIPs = 172.24.232.200/32 +#PublicKey = fLeXEE4gpmAKgVUzJ14tdMH0Hm146syDwbBdXgwWdTo= +#AllowedIPs = 172.24.232.200/32 -[Peer] +#[Peer] # thering -PublicKey = tHErTa5QXL5FTEUUcYnR0dbvKgm4YVCz3nvOxc4pvEw= -AllowedIPs = 172.24.232.210/32 +#PublicKey = tHErTa5QXL5FTEUUcYnR0dbvKgm4YVCz3nvOxc4pvEw= +#AllowedIPs = 172.24.232.210/32 -[Peer] +#[Peer] # gpiros -PublicKey = gPiRIJlwxYT6uTdprYmEzMn5oqeu8lUNI7jmMHLX0kM= -AllowedIPs = 172.24.232.220/32 +#PublicKey = gPiRIJlwxYT6uTdprYmEzMn5oqeu8lUNI7jmMHLX0kM= +#AllowedIPs = 172.24.232.220/32 -[Peer] +#[Peer] # gypolik -PublicKey = GYPo3XOUVT48N8Zg1yRzyv6fvMzBBrXA7hvWvCbrTVA= -AllowedIPs = 172.24.232.230/32 +#PublicKey = GYPo3XOUVT48N8Zg1yRzyv6fvMzBBrXA7hvWvCbrTVA= +#AllowedIPs = 172.24.232.230/32 diff --git a/sources/vpn.in/envvars b/sources/vpn.in/envvars index 11dab07..a363654 100644 --- a/sources/vpn.in/envvars +++ b/sources/vpn.in/envvars @@ -1,3 +1,3 @@ DISTRIBUTION=Fedora -DISTRIBUTION_VERSION=37 +DISTRIBUTION_VERSION=38 SPEC_PACKAGES="wireguard-tools"