Webstar/LibrePortal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge claude/1

Browse Source
This commit is contained in:
librelad 2026-05-24 17:37:14 +01:00
commit 574146c75e
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/network/traefik/traefik_login_credentials.sh
View File

@ -16,9 +16,9 @@ traefikSetupLoginCredentials()
# Setup BasicAuth credentials # Setup BasicAuth credentials
local login_credentials=$(htpasswd -Bbn "$CFG_TRAEFIK_USER" "$CFG_TRAEFIK_PASS") local login_credentials=$(htpasswd -Bbn "$CFG_TRAEFIK_USER" "$CFG_TRAEFIK_PASS")
local result=$(sudo sed -i '/#protection credentials/d' "$protectionauth_file") local result=$(runFileOp sed -i '/#protection credentials/d' "$protectionauth_file")
checkSuccess "Delete the line containing protection credentials" checkSuccess "Delete the line containing protection credentials"
local result=$(sudo sed -i "/users:/a\\ - '$login_credentials' #protection credentials" "$protectionauth_file") local result=$(runFileOp sed -i "/users:/a\\ - '$login_credentials' #protection credentials" "$protectionauth_file")
checkSuccess "Add the new line with new protection credentials" checkSuccess "Add the new line with new protection credentials"
fi fi
} }

6
scripts/network/traefik/traefik_port_subdomains.sh
View File

@ -72,7 +72,7 @@ tagsProcessorPortRouterBlocks()
done done
local tmp="${file}.routers.$$" local tmp="${file}.routers.$$"
sudo awk -v active="$active" ' runFileOp awk -v active="$active" '
BEGIN { off = 0 } BEGIN { off = 0 }
/#[[:space:]]*TRAEFIK_PORT_[0-9]+_BEGIN/ { /#[[:space:]]*TRAEFIK_PORT_[0-9]+_BEGIN/ {
match($0, /TRAEFIK_PORT_[0-9]+/); key = substr($0, RSTART, RLENGTH) match($0, /TRAEFIK_PORT_[0-9]+/); key = substr($0, RSTART, RLENGTH)
@ -91,6 +91,6 @@ tagsProcessorPortRouterBlocks()
} }
print print
} }
' "$file" | sudo tee "$tmp" >/dev/null ' "$file" | runFileWrite "$tmp" >/dev/null
sudo mv "$tmp" "$file" runFileOp mv "$tmp" "$file"
} }

2
scripts/network/traefik/traefik_whitelist.sh
View File

@ -22,7 +22,7 @@ traefikUpdateWhitelist()
YAML_CONTENT+="\n - \"$CFG_NETWORK_SUBNET\"" YAML_CONTENT+="\n - \"$CFG_NETWORK_SUBNET\""
# Now update the YAML file with the new content using sudo # Now update the YAML file with the new content using sudo
echo -e "$YAML_CONTENT" | sudo tee "$whitelist_file" > /dev/null echo -e "$YAML_CONTENT" | runFileWrite "$whitelist_file" > /dev/null
isSuccessful "Traefik has been updated with the latest whitelist IPs." isSuccessful "Traefik has been updated with the latest whitelist IPs."
fi fi
} }

2
scripts/wireguard/client/list_clients.sh
View File

@ -6,5 +6,5 @@ wireguardListClients()
wireguardCheckClients; wireguardCheckClients;
sudo grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') ' runSystem grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
} }

8
scripts/wireguard/client/revoke_client.sh
View File

@ -8,7 +8,7 @@ wireguardRevokeClient()
echo "" echo ""
echo "Select the existing client you want to revoke" echo "Select the existing client you want to revoke"
sudo grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') ' runSystem grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
until [[ ${WIREGUARD_CLIENT_NUMBER} -ge 1 && ${WIREGUARD_CLIENT_NUMBER} -le ${WIREGUARD_NUMBER_OF_CLIENTS} ]]; do until [[ ${WIREGUARD_CLIENT_NUMBER} -ge 1 && ${WIREGUARD_CLIENT_NUMBER} -le ${WIREGUARD_NUMBER_OF_CLIENTS} ]]; do
if [[ ${WIREGUARD_CLIENT_NUMBER} == '1' ]]; then if [[ ${WIREGUARD_CLIENT_NUMBER} == '1' ]]; then
read -rp "Select one client [1]: " WIREGUARD_CLIENT_NUMBER read -rp "Select one client [1]: " WIREGUARD_CLIENT_NUMBER
@ -18,12 +18,12 @@ wireguardRevokeClient()
done done
# match the selected number to a client name # match the selected number to a client name
local WIREGUARD_CLIENT_NAME=$(sudo grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${WIREGUARD_CLIENT_NUMBER}"p) local WIREGUARD_CLIENT_NAME=$(runSystem grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${WIREGUARD_CLIENT_NUMBER}"p)
result=$(sudo sed -i "/^### Client ${WIREGUARD_CLIENT_NAME}\$/,/^$/d" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf") result=$(runSystem sed -i "/^### Client ${WIREGUARD_CLIENT_NAME}\$/,/^$/d" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf")
checkSuccess "Removed [Peer] block matching $WIREGUARD_CLIENT_NAME" checkSuccess "Removed [Peer] block matching $WIREGUARD_CLIENT_NAME"
result=$(sudo rm -f "${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf") result=$(runSystem rm -f "${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf")
checkSuccess "Removed generated client file for $WIREGUARD_CLIENT_NAME" checkSuccess "Removed generated client file for $WIREGUARD_CLIENT_NAME"
result=$(runSystem wg syncconf "${CFG_WG_SERVER_NIC}" <(runSystem wg-quick strip "${CFG_WG_SERVER_NIC}")) result=$(runSystem wg syncconf "${CFG_WG_SERVER_NIC}" <(runSystem wg-quick strip "${CFG_WG_SERVER_NIC}"))

46
scripts/wireguard/install_standalone.sh
View File

@ -40,11 +40,11 @@ installStandaloneWireGuard()
# Check if the directory exists; if not, create it # Check if the directory exists; if not, create it
if [ ! -d "/etc/wireguard" ]; then if [ ! -d "/etc/wireguard" ]; then
result=$(sudo mkdir /etc/wireguard) result=$(runSystem mkdir /etc/wireguard)
checkSuccess "Created the WireGuard folder" checkSuccess "Created the WireGuard folder"
fi fi
result=$(sudo chmod 600 -R /etc/wireguard/) result=$(runSystem chmod 600 -R /etc/wireguard/)
checkSuccess "Updated permissions for /etc/wireguard" checkSuccess "Updated permissions for /etc/wireguard"
local SERVER_PRIV_KEY=$(wg genkey) local SERVER_PRIV_KEY=$(wg genkey)
@ -60,16 +60,16 @@ SERVER_PRIV_KEY=${SERVER_PRIV_KEY}
SERVER_PUB_KEY=${SERVER_PUB_KEY} SERVER_PUB_KEY=${SERVER_PUB_KEY}
CLIENT_DNS_1=${CFG_DNS_SERVER_1} CLIENT_DNS_1=${CFG_DNS_SERVER_1}
CLIENT_DNS_2=${CFG_DNS_SERVER_2} CLIENT_DNS_2=${CFG_DNS_SERVER_2}
ALLOWED_IPS=${CFG_WG_ALLOWED_IPS}" | sudo tee /etc/wireguard/params >/dev/null ALLOWED_IPS=${CFG_WG_ALLOWED_IPS}" | runSystem tee /etc/wireguard/params >/dev/null
result=$(sudo chmod 644 /etc/wireguard/params) result=$(runSystem chmod 644 /etc/wireguard/params)
checkSuccess "Updating permissions for /etc/wireguard/params" checkSuccess "Updating permissions for /etc/wireguard/params"
# Add server interface # Add server interface
echo "[Interface] echo "[Interface]
Address = ${CFG_WG_SERVER_IPV4}/32 Address = ${CFG_WG_SERVER_IPV4}/32
ListenPort = ${CFG_WG_SERVER_PORT} ListenPort = ${CFG_WG_SERVER_PORT}
PrivateKey = ${SERVER_PRIV_KEY}" | sudo tee "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" >/dev/null PrivateKey = ${SERVER_PRIV_KEY}" | runSystem tee "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" >/dev/null
echo "PostUp = iptables -I INPUT -p udp --dport ${CFG_WG_SERVER_PORT} -j ACCEPT echo "PostUp = iptables -I INPUT -p udp --dport ${CFG_WG_SERVER_PORT} -j ACCEPT
PostUp = iptables -I FORWARD -i ${server_nic} -o ${CFG_WG_SERVER_NIC} -j ACCEPT PostUp = iptables -I FORWARD -i ${server_nic} -o ${CFG_WG_SERVER_NIC} -j ACCEPT
@ -78,21 +78,21 @@ PostUp = iptables -t nat -A POSTROUTING -o ${server_nic} -j MASQUERADE
PostDown = iptables -D INPUT -p udp --dport ${CFG_WG_SERVER_PORT} -j ACCEPT PostDown = iptables -D INPUT -p udp --dport ${CFG_WG_SERVER_PORT} -j ACCEPT
PostDown = iptables -D FORWARD -i ${server_nic} -o ${CFG_WG_SERVER_NIC} -j ACCEPT PostDown = iptables -D FORWARD -i ${server_nic} -o ${CFG_WG_SERVER_NIC} -j ACCEPT
PostDown = iptables -D FORWARD -i ${CFG_WG_SERVER_NIC} -j ACCEPT PostDown = iptables -D FORWARD -i ${CFG_WG_SERVER_NIC} -j ACCEPT
PostDown = iptables -t nat -D POSTROUTING -o ${server_nic} -j MASQUERADE" | sudo tee -a "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" >/dev/null PostDown = iptables -t nat -D POSTROUTING -o ${server_nic} -j MASQUERADE" | runSystem tee -a "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" >/dev/null
result=$(sudo chmod 644 /etc/wireguard/${CFG_WG_SERVER_NIC}.conf) result=$(runSystem chmod 644 /etc/wireguard/${CFG_WG_SERVER_NIC}.conf)
checkSuccess "Updating permissions for /etc/wireguard/${CFG_WG_SERVER_NIC}.conf" checkSuccess "Updating permissions for /etc/wireguard/${CFG_WG_SERVER_NIC}.conf"
result=$(sudo sed -i '/^net.ipv4.ip_forward/d' /etc/sysctl.conf) result=$(runSystem sed -i '/^net.ipv4.ip_forward/d' /etc/sysctl.conf)
checkSuccess "Removing all instances of net.ipv4.ip_forward from sysctl.conf" checkSuccess "Removing all instances of net.ipv4.ip_forward from sysctl.conf"
local result=$(echo '# WIREGUARD START' | sudo tee -a "$sysctl" > /dev/null) local result=$(echo '# WIREGUARD START' | runSystem tee -a "$sysctl" > /dev/null)
checkSuccess "Adding wireguard header to sysctl" checkSuccess "Adding wireguard header to sysctl"
result=$(echo "net.ipv4.ip_forward = 1" | sudo tee -a $sysctl) result=$(echo "net.ipv4.ip_forward = 1" | runSystem tee -a $sysctl)
checkSuccess "Add the configuration for IPv4 IP forwarding" checkSuccess "Add the configuration for IPv4 IP forwarding"
local result=$(echo '# WIREGUARD END' | sudo tee -a "$sysctl" > /dev/null) local result=$(echo '# WIREGUARD END' | runSystem tee -a "$sysctl" > /dev/null)
checkSuccess "Adding wireguard header to sysctl" checkSuccess "Adding wireguard header to sysctl"
result=$(runSystem systemctl start "wg-quick@${CFG_WG_SERVER_NIC}") result=$(runSystem systemctl start "wg-quick@${CFG_WG_SERVER_NIC}")
@ -145,7 +145,7 @@ wireguardNewClient()
else else
read -rp "Client name: " -e WIREGUARD_CLIENT_NAME read -rp "Client name: " -e WIREGUARD_CLIENT_NAME
fi fi
local WIREGUARD_CLIENT_EXISTS=$(sudo grep -c -E "^### Client ${WIREGUARD_CLIENT_NAME}\$" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf") local WIREGUARD_CLIENT_EXISTS=$(runSystem grep -c -E "^### Client ${WIREGUARD_CLIENT_NAME}\$" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf")
if [[ ${WIREGUARD_CLIENT_EXISTS} != 0 ]]; then if [[ ${WIREGUARD_CLIENT_EXISTS} != 0 ]]; then
echo "" echo ""
@ -155,7 +155,7 @@ wireguardNewClient()
done done
for WIREGUARD_DOT_IP in {2..254}; do for WIREGUARD_DOT_IP in {2..254}; do
local WIREGUARD_DOT_EXISTS=$(sudo grep -c "${CFG_WG_SERVER_IPV4::-1}${WIREGUARD_DOT_IP}" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf") local WIREGUARD_DOT_EXISTS=$(runSystem grep -c "${CFG_WG_SERVER_IPV4::-1}${WIREGUARD_DOT_IP}" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf")
if [[ ${WIREGUARD_DOT_EXISTS} == '0' ]]; then if [[ ${WIREGUARD_DOT_EXISTS} == '0' ]]; then
break break
fi fi
@ -186,14 +186,14 @@ DNS = ${CFG_DNS_SERVER_1},${CFG_DNS_SERVER_2}
PublicKey = ${SERVER_PUB_KEY} PublicKey = ${SERVER_PUB_KEY}
PresharedKey = ${WIREGUARD_CLIENT_PRE_SHARED_KEY} PresharedKey = ${WIREGUARD_CLIENT_PRE_SHARED_KEY}
Endpoint = ${WIREGUARD_ENDPOINT} Endpoint = ${WIREGUARD_ENDPOINT}
AllowedIPs = ${CFG_WG_ALLOWED_IPS}" | sudo tee "${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf" >/dev/null AllowedIPs = ${CFG_WG_ALLOWED_IPS}" | runSystem tee "${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf" >/dev/null
# Add the client as a peer to the server # Add the client as a peer to the server
echo -e "\n### Client ${WIREGUARD_CLIENT_NAME} echo -e "\n### Client ${WIREGUARD_CLIENT_NAME}
[Peer] [Peer]
PublicKey = ${WIREGUARD_CLIENT_PUB_KEY} PublicKey = ${WIREGUARD_CLIENT_PUB_KEY}
PresharedKey = ${WIREGUARD_CLIENT_PRE_SHARED_KEY} PresharedKey = ${WIREGUARD_CLIENT_PRE_SHARED_KEY}
AllowedIPs = ${CFG_WG_ALLOWED_IPS}" | sudo tee -a "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" >/dev/null AllowedIPs = ${CFG_WG_ALLOWED_IPS}" | runSystem tee -a "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" >/dev/null
#result=$(runSystem wg syncconf ${CFG_WG_SERVER_NIC} /etc/wireguard/${CFG_WG_SERVER_NIC}.conf) #result=$(runSystem wg syncconf ${CFG_WG_SERVER_NIC} /etc/wireguard/${CFG_WG_SERVER_NIC}.conf)
#checkSuccess "Syncing config file for $CFG_WG_SERVER_NIC" #checkSuccess "Syncing config file for $CFG_WG_SERVER_NIC"
@ -206,7 +206,7 @@ AllowedIPs = ${CFG_WG_ALLOWED_IPS}" | sudo tee -a "/etc/wireguard/${CFG_WG_SERVE
# Generate QR code if qrencode is installed # Generate QR code if qrencode is installed
if command -v qrencode &>/dev/null; then if command -v qrencode &>/dev/null; then
isNotice "Here is your client config file as a QR Code:" isNotice "Here is your client config file as a QR Code:"
sudo qrencode -t ansiutf8 -l L <"${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf" runSystem qrencode -t ansiutf8 -l L <"${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf"
echo "" echo ""
fi fi
@ -219,7 +219,7 @@ wireguardListClients()
wireguardCheckClients; wireguardCheckClients;
sudo grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') ' runSystem grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
} }
wireguardRevokeClient() wireguardRevokeClient()
@ -230,7 +230,7 @@ wireguardRevokeClient()
echo "" echo ""
echo "Select the existing client you want to revoke" echo "Select the existing client you want to revoke"
sudo grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') ' runSystem grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | nl -s ') '
until [[ ${WIREGUARD_CLIENT_NUMBER} -ge 1 && ${WIREGUARD_CLIENT_NUMBER} -le ${WIREGUARD_NUMBER_OF_CLIENTS} ]]; do until [[ ${WIREGUARD_CLIENT_NUMBER} -ge 1 && ${WIREGUARD_CLIENT_NUMBER} -le ${WIREGUARD_NUMBER_OF_CLIENTS} ]]; do
if [[ ${WIREGUARD_CLIENT_NUMBER} == '1' ]]; then if [[ ${WIREGUARD_CLIENT_NUMBER} == '1' ]]; then
read -rp "Select one client [1]: " WIREGUARD_CLIENT_NUMBER read -rp "Select one client [1]: " WIREGUARD_CLIENT_NUMBER
@ -240,12 +240,12 @@ wireguardRevokeClient()
done done
# match the selected number to a client name # match the selected number to a client name
local WIREGUARD_CLIENT_NAME=$(sudo grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${WIREGUARD_CLIENT_NUMBER}"p) local WIREGUARD_CLIENT_NAME=$(runSystem grep -E "^### Client" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf" | cut -d ' ' -f 3 | sed -n "${WIREGUARD_CLIENT_NUMBER}"p)
result=$(sudo sed -i "/^### Client ${WIREGUARD_CLIENT_NAME}\$/,/^$/d" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf") result=$(runSystem sed -i "/^### Client ${WIREGUARD_CLIENT_NAME}\$/,/^$/d" "/etc/wireguard/${CFG_WG_SERVER_NIC}.conf")
checkSuccess "Removed [Peer] block matching $WIREGUARD_CLIENT_NAME" checkSuccess "Removed [Peer] block matching $WIREGUARD_CLIENT_NAME"
result=$(sudo rm -f "${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf") result=$(runSystem rm -f "${CFG_WG_HOME_DIR}/${CFG_WG_SERVER_NIC}-client-${WIREGUARD_CLIENT_NAME}.conf")
checkSuccess "Removed generated client file for $WIREGUARD_CLIENT_NAME" checkSuccess "Removed generated client file for $WIREGUARD_CLIENT_NAME"
result=$(runSystem wg syncconf "${CFG_WG_SERVER_NIC}" <(runSystem wg-quick strip "${CFG_WG_SERVER_NIC}")) result=$(runSystem wg syncconf "${CFG_WG_SERVER_NIC}" <(runSystem wg-quick strip "${CFG_WG_SERVER_NIC}"))
@ -285,9 +285,9 @@ wireguardUninstall()
checkSuccess "Removed wireguard wireguard-tools qrencode" checkSuccess "Removed wireguard wireguard-tools qrencode"
fi fi
result=$(sudo rm -rf /etc/wireguard) result=$(runSystem rm -rf /etc/wireguard)
checkSuccess "Deleted /etc/wireguard folder." checkSuccess "Deleted /etc/wireguard folder."
result=$(sudo rm -f /etc/sysctl.d/wg.conf) result=$(runSystem rm -f /etc/sysctl.d/wg.conf)
checkSuccess "Delete /etc/sysctl.d/wg.conf file." checkSuccess "Delete /etc/sysctl.d/wg.conf file."
result=$(runSystem sysctl --system) result=$(runSystem sysctl --system)

4
scripts/wireguard/uninstall_standalone.sh
View File

@ -22,9 +22,9 @@ wireguardUninstall()
checkSuccess "Removed wireguard wireguard-tools qrencode" checkSuccess "Removed wireguard wireguard-tools qrencode"
fi fi
result=$(sudo rm -rf /etc/wireguard) result=$(runSystem rm -rf /etc/wireguard)
checkSuccess "Deleted /etc/wireguard folder." checkSuccess "Deleted /etc/wireguard folder."
result=$(sudo rm -f /etc/sysctl.d/wg.conf) result=$(runSystem rm -f /etc/sysctl.d/wg.conf)
checkSuccess "Delete /etc/sysctl.d/wg.conf file." checkSuccess "Delete /etc/sysctl.d/wg.conf file."
result=$(runSystem sysctl --system) result=$(runSystem sysctl --system)