From 0d814ec03ca6bf8949b737aa57fc79196beef872 Mon Sep 17 00:00:00 2001 From: Daan Selen Date: Sun, 21 Sep 2025 21:57:28 +0200 Subject: [PATCH] refac: new logic to detecting a Wireguard interface --- docker/entrypoint.sh | 68 ++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index a6da4bf9..b64e5595 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -13,15 +13,15 @@ hash_password() { set_ini() { local section="$1" key="$2" value="$3" local current_value - + # Add section if it doesn't exist grep -q "^\[${section}\]" "$config_file" \ || printf "\n[%s]\n" "${section}" >> "$config_file" - + # Check current value if key exists if grep -q "^[[:space:]]*${key}[[:space:]]*=" "$config_file"; then current_value=$(grep "^[[:space:]]*${key}[[:space:]]*=" "$config_file" | cut -d= -f2- | xargs) - + # Don't display actual value if it's a password field if [[ "$key" == *"password"* ]]; then if [ "$current_value" = "$value" ]; then @@ -40,7 +40,7 @@ set_ini() { fi else sed -i "/^\[${section}\]/a ${key} = ${value}" "$config_file" - + # Don't display actual value if it's a password field if [[ "$key" == *"password"* ]]; then echo "- Added new setting $key (value hidden)" @@ -61,58 +61,58 @@ echo "Starting the WGDashboard Docker container." ensure_installation() { echo "Quick-installing..." - + # Make the wgd.sh script executable. chmod +x "${WGDASH}"/src/wgd.sh cd "${WGDASH}"/src || exit - + # Github issue: https://github.com/donaldzou/WGDashboard/issues/723 echo "Checking for stale pids..." if [[ -f ${WGDASH}/src/gunicorn.pid ]]; then echo "Found stale pid, removing..." rm ${WGDASH}/src/gunicorn.pid fi - + # Removing clear shell command from the wgd.sh script to enhance docker logging. echo "Removing clear command from wgd.sh for better Docker logging." sed -i '/clear/d' ./wgd.sh - + # Create required directories and links if [ ! -d "/data/db" ]; then echo "Creating database dir" mkdir -p /data/db fi - + if [ ! -d "${WGDASH}/src/db" ]; then ln -s /data/db "${WGDASH}/src/db" fi - + if [ ! -f "${config_file}" ]; then echo "Creating wg-dashboard.ini file" touch "${config_file}" fi - + if [ ! -f "${WGDASH}/src/wg-dashboard.ini" ]; then ln -s "${config_file}" "${WGDASH}/src/wg-dashboard.ini" fi # Create the Python virtual environment. . "${WGDASH}/src/venv/bin/activate" - + # Use the bash interpreter to install WGDashboard according to the wgd.sh script. /bin/bash ./wgd.sh install - + echo "Looks like the installation succeeded. Moving on." - + # Setup WireGuard if needed - if [ ! -f "/etc/wireguard/wg0.conf" ]; then + if [ -z "$(ls -A /etc/wireguard)" ]; then cp -a "/configs/wg0.conf.template" "/etc/wireguard/wg0.conf" - + echo "Setting a secure private key." local privateKey privateKey=$(wg genkey) sed -i "s|^PrivateKey *=.*$|PrivateKey = ${privateKey}|g" /etc/wireguard/wg0.conf - + echo "Done setting template." else echo "Existing wg0 configuration file found, using that." @@ -121,51 +121,51 @@ ensure_installation() { set_envvars() { printf "\n------------- SETTING ENVIRONMENT VARIABLES ----------------\n" - + # Check if config file is empty if [ ! -s "${config_file}" ]; then echo "Config file is empty. Creating initial structure." fi - + echo "Checking basic configuration:" set_ini Peers peer_global_dns "${global_dns}" - + if [ -z "${public_ip}" ]; then public_ip=$(curl -s ifconfig.me) echo "Automatically detected public IP: ${public_ip}" fi - + set_ini Peers remote_endpoint "${public_ip}" set_ini Server app_port "${wgd_port}" - + # Account settings - process all parameters [[ -n "$username" ]] && echo "Configuring user account:" # Basic account variables [[ -n "$username" ]] && set_ini Account username "${username}" - + if [[ -n "$password" ]]; then echo "- Setting password" set_ini Account password "$(hash_password "${password}")" fi - + # Additional account variables [[ -n "$enable_totp" ]] && set_ini Account enable_totp "${enable_totp}" [[ -n "$totp_verified" ]] && set_ini Account totp_verified "${totp_verified}" [[ -n "$totp_key" ]] && set_ini Account totp_key "${totp_key}" - + # Welcome session [[ -n "$welcome_session" ]] && set_ini Other welcome_session "${welcome_session}" # If username and password are set but welcome_session isn't, disable it if [[ -n "$username" && -n "$password" && -z "$welcome_session" ]]; then set_ini Other welcome_session "false" fi - + # Autostart WireGuard if [[ -n "$wg_autostart" ]]; then echo "Configuring WireGuard autostart:" set_ini WireGuardConfiguration autostart "${wg_autostart}" fi - + # Email (check if any settings need to be configured) email_vars=("email_server" "email_port" "email_encryption" "email_username" "email_password" "email_from" "email_template") for var in "${email_vars[@]}"; do @@ -174,12 +174,12 @@ set_envvars() { break fi done - + # Email (iterate through all possible fields) email_fields=("server:email_server" "port:email_port" "encryption:email_encryption" "username:email_username" "email_password:email_password" "send_from:email_from" "email_template:email_template") - + for field_pair in "${email_fields[@]}"; do IFS=: read -r field var <<< "$field_pair" [[ -n "${!var}" ]] && set_ini Email "$field" "${!var}" @@ -189,7 +189,7 @@ set_envvars() { # Start service and monitor logs start_and_monitor() { printf "\n---------------------- STARTING CORE -----------------------\n" - + # Due to some instances complaining about this, making sure its there every time. mkdir -p /dev/net mknod /dev/net/tun c 10 200 @@ -198,15 +198,15 @@ start_and_monitor() { # Actually starting WGDashboard echo "Activating Python venv and executing the WireGuard Dashboard service." bash ./wgd.sh start - + # Wait a second before continuing, to give the python program some time to get ready. sleep 1 echo -e "\nEnsuring container continuation." - + # Find and monitor log file local logdir="${WGDASH}/src/log" latestErrLog=$(find "$logdir" -name "error_*.log" -type f -print | sort -r | head -n 1) - + # Only tail the logs if they are found if [ -n "$latestErrLog" ]; then tail -f "$latestErrLog" & @@ -221,4 +221,4 @@ start_and_monitor() { # Main execution flow ensure_installation set_envvars -start_and_monitor \ No newline at end of file +start_and_monitor