Revert "Merge branch 'v4.3.3-dev' into main"

This reverts commit 3586ddce4d, reversing
changes made to 27ec65a970.

docker/entrypoint.sh

@@ -85,6 +85,8 @@ echo "------------------------- START ----------------------------"
 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
@@ -100,51 +102,23 @@ ensure_installation() {
   echo "Removing clear command from wgd.sh for better Docker logging."
   sed -i '/clear/d' ./wgd.sh
 
-  # PERSISTENCE FOR databases directory
   # Create required directories and links
   if [ ! -d "/data/db" ]; then
     echo "Creating database dir"
     mkdir -p /data/db
   fi
 
-  if [[ ! -L "${WGDASH}/src/db" ]] && [[ -d "${WGDASH}/src/db" ]]; then
-    echo "Removing ${WGDASH}/src/db since its not a symbolic link."
-    rm -rfv "${WGDASH}/src/db"
-  fi
-  if [[ -L "${WGDASH}/src/db" ]]; then
-    echo "${WGDASH}/src/db is a symbolic link."
-  else
-    ln -sv /data/db "${WGDASH}/src/db"
+  if [ ! -d "${WGDASH}/src/db" ]; then
+    ln -s /data/db "${WGDASH}/src/db"
   fi
 
-  # PERSISTENCE FOR wg-dashboard-oidc-providers.json
-  if [ ! -f "/data/wg-dashboard-oidc-providers.json" ]; then
-    echo "Creating wg-dashboard-oidc-providers.json file"
-    cp -v /tmp/wg-dashboard-oidc-providers.json.template /data/wg-dashboard-oidc-providers.json
-  fi
-  if [[ ! -L "${WGDASH}/src/wg-dashboard-oidc-providers.json" ]] && [[ -f "${WGDASH}/src/wg-dashboard-oidc-providers.json" ]]; then
-    echo "Removing ${WGDASH}/src/wg-dashboard-oidc-providers.json since its not a symbolic link."
-    rm -fv "${WGDASH}/src/wg-dashboard-oidc-providers.json"
-  fi
-  if [[ -L "${WGDASH}/src/wg-dashboard-oidc-providers.json" ]]; then
-    echo "${WGDASH}/src/wg-dashboard-oidc-providers.json is a symbolic link."
-  else
-    ln -sv /data/wg-dashboard-oidc-providers.json "${WGDASH}/src/wg-dashboard-oidc-providers.json"
-  fi
-
-  # PERSISTENCE FOR wg-dashboard.ini
   if [ ! -f "${config_file}" ]; then
     echo "Creating wg-dashboard.ini file"
     touch "${config_file}"
   fi
-  if [[ ! -L "${WGDASH}/src/wg-dashboard.ini" ]] && [[ -f "${WGDASH}/src/wg-dashboard.ini" ]]; then
-    echo "Removing ${WGDASH}/src/wg-dashboard.ini since its not a symbolic link."
-    rm -fv "${WGDASH}/src/wg-dashboard.ini"
-  fi
-  if [[ -L "${WGDASH}/src/wg-dashboard.ini" ]]; then
-    echo "${WGDASH}/src/wg-dashboard.ini is a symbolic link."
-  else
-    ln -sv "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
+
+  if [ ! -f "${WGDASH}/src/wg-dashboard.ini" ]; then
+    ln -s "${config_file}" "${WGDASH}/src/wg-dashboard.ini"
   fi
 
   # Setup WireGuard if needed
@@ -168,25 +142,14 @@ set_envvars() {
   # Check if config file is empty
   if [ ! -s "${config_file}" ]; then
     echo "Config file is empty. Creating initial structure."
-  elif [[ ${dynamic_config,,} =~ ^(false|no)$ ]]; then
-    echo "Dynamic configuration feature turned off, not changing anything"
-    return
   fi
 
   echo "Checking basic configuration:"
   set_ini Peers peer_global_dns "${global_dns}"
 
   if [ -z "${public_ip}" ]; then
-    public_ip=$(curl -s https://ifconfig.me)
-    if [ -z "${public_ip}" ]; then
-        echo "Using fallback public IP resolution website"
-        public_ip=$(curl -s https://api.ipify.org)
-    fi
-    if [ -z "${public_ip}" ]; then
-        echo "Failed to resolve publicly. Using private address."
-        public_ip=$(hostname -i)
-    fi
-    echo "Automatically detected public IP: ${public_ip}"
+    public_ip=$(curl -s ifconfig.me)
+    echo "Automatically detected public IP: ${public_ip}" 
   fi
 
   set_ini Peers remote_endpoint "${public_ip}"
@@ -220,24 +183,6 @@ set_envvars() {
     set_ini WireGuardConfiguration autostart "${wg_autostart}"
   fi
 
-  # Database (check if any settings need to be configured)
-  database_vars=("database_type" "database_host" "database_port" "database_username" "database_password")
-  for var in "${database_vars[@]}"; do
-    if [ -n "${!var}" ]; then
-      echo "Configuring database settings:"
-      break
-    fi
-  done
-
-  # Database (iterate through all possible fields)
-  database_fields=("type:database_type" "host:database_host" "port:database_port" 
-                "username:database_username" "password:database_password")
-
-  for field_pair in "${database_fields[@]}"; do
-    IFS=: read -r field var <<< "$field_pair"
-    [[ -n "${!var}" ]] && set_ini Database "$field" "${!var}"
-  done
-
   # 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
@@ -262,9 +207,6 @@ set_envvars() {
 start_and_monitor() {
   printf "\n---------------------- STARTING CORE -----------------------\n"
 
-  # Due to resolvconf resetting the DNS we echo back the one we defined (or fallback to default).
-  resolvconf -u
-
   # Due to some instances complaining about this, making sure its there every time.
   mkdir -p /dev/net
   mknod /dev/net/tun c 10 200