diff --git a/setup-base.sh b/setup-base.sh index 70156a7..ea750ae 100755 --- a/setup-base.sh +++ b/setup-base.sh @@ -183,7 +183,7 @@ if [[ -n "$REPO_DIR" && -f "$WG_CONF" ]]; then WG_ADDR=$(grep -oP 'Address\s*=\s*\K.*' "$WG_CONF") WG_PUBKEY=$(grep -oP 'PublicKey\s*=\s*\K.*' "$WG_CONF") WG_PSK=$(grep -oP 'PresharedKey\s*=\s*\K.*' "$WG_CONF") - WG_ALLOWED=$(grep -oP 'AllowedIPs\s*=\s*\K.*' "$WG_CONF" | tr -d ' ') + WG_ALLOWED=$(grep -oP 'AllowedIPs\s*=\s*\K.*' "$WG_CONF" | tr -d ' ' | tr ',' ';') WG_ENDPOINT=$(grep -oP 'Endpoint\s*=\s*\K.*' "$WG_CONF") WG_KEEPALIVE=$(grep -oP 'PersistentKeepalive\s*=\s*\K.*' "$WG_CONF") # NM-Verbindungsdatei direkt schreiben (laeuft als root, Keys persistent) diff --git a/wireguard/m13.conf b/wireguard/m13.conf index 66e7d39..177a5e1 100755 --- a/wireguard/m13.conf +++ b/wireguard/m13.conf @@ -4,7 +4,7 @@ ListenPort = 51820 Address = 10.13.13.8/24 [Peer] -PublicKey = 7WrqHPof31gcCYMjLWPoP1EIxPR2896/3KL1pQ3YZGs= +PublicKey = mp0YKEjsUbnld3aTAnF6cSzTfixhZETQCoKiFHIcF30= PresharedKey = JNq27UrO94P1eSBWfID4TsgQXNKa/PhAKquIHtsq89w= AllowedIPs = 10.47.11.0/24,10.13.13.0/24 Endpoint = 24.134.39.137:443 diff --git a/wireguard/m16.conf b/wireguard/m16.conf index d20dde8..5b25c10 100755 --- a/wireguard/m16.conf +++ b/wireguard/m16.conf @@ -4,7 +4,7 @@ ListenPort = 51820 Address = 10.13.13.7/24 [Peer] -PublicKey = J/dD1t3Bo9Zbcvxg6PvGP78kgMlL4s4yYfrUMpcoS2w= +PublicKey = mp0YKEjsUbnld3aTAnF6cSzTfixhZETQCoKiFHIcF30= PresharedKey = vReUFqlQoOG1eUMTje+F2OOtgisgp/vNsDyx6lq3KXE= AllowedIPs = 10.47.11.0/24,10.13.13.0/24 Endpoint = 24.134.39.137:443