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-23 23:22:46 +01:00
commit a5cdbc4656
3 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/docker/command/docker_run_install.sh
View File

@ -14,11 +14,14 @@
dockerCommandRunInstallUser()
{
local silent_flag=""
if [ "$1" == "--silent" ]; then
silent_flag="$1"
shift
fi
local remote_command="$1"
local argv_mode=""
while true; do
case "$1" in
--silent) silent_flag="1"; shift ;;
--argv) argv_mode="1"; shift ;;
*) break ;;
esac
done
local uid
uid=$(id -u "$CFG_DOCKER_INSTALL_USER" 2>/dev/null)
@ -36,9 +39,22 @@ dockerCommandRunInstallUser()
"PATH=/home/$CFG_DOCKER_INSTALL_USER/bin:/usr/bin:/bin:/usr/local/bin"
)
# --argv: exec the remaining args verbatim (no shell re-parse) so regex/
# quotes/backslashes in arguments (e.g. sed scripts) survive intact. Default:
# treat $1 as a shell snippet via bash -c (needed for pipes/redirects/
# systemctl --user/etc.).
if [ -n "$argv_mode" ]; then
if [ -n "$silent_flag" ]; then
sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" "$@" >/dev/null 2>&1
else
sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" "$@"
fi
else
local remote_command="$1"
if [ -n "$silent_flag" ]; then
sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" bash -c "$remote_command" >/dev/null 2>&1
else
sudo -u "$CFG_DOCKER_INSTALL_USER" env "${run_env[@]}" bash -c "$remote_command"
fi
fi
}

5
scripts/docker/command/run_privileged.sh
View File

@ -6,8 +6,7 @@
# rooted — app/container files under /docker are root-owned, so ops run via
# sudo. This is byte-for-byte the historical behaviour.
# rootless — those files are owned by the unprivileged Docker install user, so
# ops run AS that user over the existing SSH channel and need no
# root at all.
# ops run AS that user (via `sudo -u`, no root over the data plane).
# Centralising the branch here means each call site is written once and is
# correct in both modes, and rooted installs (incl. live boxes) are unchanged.
@ -19,7 +18,7 @@
# this helper is for self-contained commands.
runFileOp() {
if [[ "$CFG_DOCKER_INSTALL_TYPE" == "rootless" ]]; then
dockerCommandRunInstallUser "$*"
dockerCommandRunInstallUser --argv "$@"
else
sudo "$@"
fi

34
scripts/network/dns/setup_dns.sh
View File

@ -8,14 +8,14 @@ updateDNS()
if [[ "$OS_TYPE" == "Ubuntu" || "$OS_TYPE" == "Debian" ]]; then
dnsRemoveNameservers()
{
result=$(sudo sed -i '/^nameserver/d' /etc/resolv.conf)
result=$(runSystem sed -i '/^nameserver/d' /etc/resolv.conf)
checkSuccess "Removing all instances of Nameserver from Resolv.conf"
}
if [[ "$flag" == "standalonewireguard" ]]; then
dnsRemoveNameservers;
echo "nameserver $CFG_DNS_SERVER_1" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $CFG_DNS_SERVER_2" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $CFG_DNS_SERVER_1" | runSystem tee -a /etc/resolv.conf > /dev/null
echo "nameserver $CFG_DNS_SERVER_2" | runSystem tee -a /etc/resolv.conf > /dev/null
else
# Check if AdGuard is installed
local status=$(dockerCheckAppInstalled "adguard" "docker")
@ -23,7 +23,7 @@ updateDNS()
setupDNSIP adguard;
local adguard_ip="$dns_ip_setup"
# Testing Docker IP Address
result=$(sudo ping -c 1 $adguard_ip)
result=$(runSystem ping -c 1 $adguard_ip)
if [ $? -eq 0 ]; then
isSuccessful "Ping to $adguard_ip was successful."
else
@ -31,7 +31,7 @@ updateDNS()
isNotice "Defaulting to DNS 1 Server $CFG_DNS_SERVER_1."
local adguard_ip="$CFG_DNS_SERVER_1"
# Fallback to Quad9 if DNS has issues
result=$(sudo ping -c 1 $adguard_ip)
result=$(runSystem ping -c 1 $adguard_ip)
if [ $? -eq 0 ]; then
isSuccessful "Ping to $adguard_ip was successful."
else
@ -43,7 +43,7 @@ updateDNS()
else
local adguard_ip="$CFG_DNS_SERVER_1"
# Fallback to Quad9 if DNS has issues
result=$(sudo ping -c 1 $adguard_ip)
result=$(runSystem ping -c 1 $adguard_ip)
if [ $? -eq 0 ]; then
isSuccessful "Ping to $adguard_ip was successful."
else
@ -59,7 +59,7 @@ updateDNS()
setupDNSIP pihole;
local pihole_ip="$dns_ip_setup"
# Testing Docker IP Address
result=$(sudo ping -c 1 $pihole_ip)
result=$(runSystem ping -c 1 $pihole_ip)
if [ $? -eq 0 ]; then
isSuccessful "Ping to $pihole_ip was successful."
else
@ -67,7 +67,7 @@ updateDNS()
isNotice "Defaulting to DNS 2 Server $CFG_DNS_SERVER_2."
local pihole_ip="$CFG_DNS_SERVER_2"
# Fallback to Quad9 if DNS has issues
result=$(sudo ping -c 1 $pihole_ip)
result=$(runSystem ping -c 1 $pihole_ip)
if [ $? -eq 0 ]; then
isSuccessful "Ping to $pihole_ip was successful."
else
@ -98,12 +98,12 @@ updateDNS()
elif [[ $compose_setup == "app" ]]; then
local compose_file="docker-compose.$app_name.yml"
fi
result=$(sudo sed -i "s/\(WG_DEFAULT_DNS=\).*/\1$adguard_ip/" $containers_dir$app_name/$compose_file)
result=$(runFileOp sed -i "s/\(WG_DEFAULT_DNS=\).*/\1$adguard_ip/" $containers_dir$app_name/$compose_file)
checkSuccess "Updated Wireguard default DNS to $adguard_ip"
fi
dnsRemoveNameservers;
echo "nameserver $adguard_ip" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $pihole_ip" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $adguard_ip" | runSystem tee -a /etc/resolv.conf > /dev/null
echo "nameserver $pihole_ip" | runSystem tee -a /etc/resolv.conf > /dev/null
elif [[ "$pihole_ip" == *10.100.0* ]]; then
# Wireguard update
local status=$(dockerCheckAppInstalled "wireguard" "docker")
@ -114,12 +114,12 @@ updateDNS()
elif [[ $compose_setup == "app" ]]; then
local compose_file="docker-compose.$app_name.yml"
fi
result=$(sudo sed -i "s/\(WG_DEFAULT_DNS=\).*/\1$pihole_ip/" $containers_dir$app_name/$compose_file)
result=$(runFileOp sed -i "s/\(WG_DEFAULT_DNS=\).*/\1$pihole_ip/" $containers_dir$app_name/$compose_file)
checkSuccess "Updated Wireguard default DNS to $pihole_ip"
fi
dnsRemoveNameservers;
echo "nameserver $pihole_ip" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $adguard_ip" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $pihole_ip" | runSystem tee -a /etc/resolv.conf > /dev/null
echo "nameserver $adguard_ip" | runSystem tee -a /etc/resolv.conf > /dev/null
else
# Wireguard update
local status=$(dockerCheckAppInstalled "wireguard" "docker")
@ -130,12 +130,12 @@ updateDNS()
elif [[ $compose_setup == "app" ]]; then
local compose_file="docker-compose.$app_name.yml"
fi
result=$(sudo sed -i "s/\(WG_DEFAULT_DNS=\).*/\1$adguard_ip/" $containers_dir$app_name/$compose_file)
result=$(runFileOp sed -i "s/\(WG_DEFAULT_DNS=\).*/\1$adguard_ip/" $containers_dir$app_name/$compose_file)
checkSuccess "Updated Wireguard default DNS to $adguard_ip"
fi
dnsRemoveNameservers;
echo "nameserver $adguard_ip" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $pihole_ip" | sudo tee -a /etc/resolv.conf > /dev/null
echo "nameserver $adguard_ip" | runSystem tee -a /etc/resolv.conf > /dev/null
echo "nameserver $pihole_ip" | runSystem tee -a /etc/resolv.conf > /dev/null
fi
if [ "$flag" == "install" ]; then
initializeAppVariables $app_name;