diff --git a/Dockerfile b/Dockerfile index d594ce6d..122e67e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,8 @@ RUN apt-get update \ && apt-get clean autoclean \ && apt-get autoremove \ && rm -rf /var/lib/apt/lists/* \ - && ln -s /home/pi/pialert/install/index.html /var/www/html/index.html \ + && rm -rf /var/www/html \ + && ln -s /home/pi/pialert/front /var/www/html \ && ln -s /home/pi/pialert/front /var/www/html/pialert \ && lighttpd-enable-mod fastcgi-php diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 03ea31a5..aec5aa3c 100644 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/devices.php b/front/devices.php index 071f0c02..79d5effe 100644 --- a/front/devices.php +++ b/front/devices.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/events.php b/front/events.php index 597cca30..e7acb376 100644 --- a/front/events.php +++ b/front/events.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/index.php b/front/index.php index 2dd44c3a..22d437f6 100644 --- a/front/index.php +++ b/front/index.php @@ -3,7 +3,7 @@ session_start(); if ($_REQUEST['action'] == 'logout') { session_destroy(); - header('Location: /pialert/index.php'); + header('Location: /index.php'); } // ################################### // ## Login settings locale start @@ -40,7 +40,7 @@ $Pia_WebProtection = strtolower(trim($protection_line[1])); if ($Pia_WebProtection == 'false') { - header('Location: /pialert/devices.php'); + header('Location: /devices.php'); $_SESSION["login"] = 1; exit; } @@ -55,13 +55,13 @@ $Pia_Password = $password_line[1]; if ($Pia_Password == hash('sha256',$_POST["loginpassword"])) { - header('Location: /pialert/devices.php'); + header('Location: /devices.php'); $_SESSION["login"] = 1; } if ($_SESSION["login"] == 1) { - header('Location: /pialert/devices.php'); + header('Location: /devices.php'); } if ($_SESSION["login"] != 1) @@ -118,12 +118,12 @@ if ($ENABLED_DARKMODE === True) {
-
+
diff --git a/front/maintenance.php b/front/maintenance.php index 49389505..33199909 100644 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -3,7 +3,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/network.php b/front/network.php index 1b782a3b..ba33684d 100644 --- a/front/network.php +++ b/front/network.php @@ -2,7 +2,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/front/php/templates/header.php b/front/php/templates/header.php index d0b2b8b0..2a339335 100644 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -177,7 +177,7 @@ function show_pia_servertime() {
  • - Sign out + Sign out
    • diff --git a/front/presence.php b/front/presence.php index e5af11d9..94a9d728 100644 --- a/front/presence.php +++ b/front/presence.php @@ -12,7 +12,7 @@ session_start(); if ($_SESSION["login"] != 1) { - header('Location: /pialert/index.php'); + header('Location: /index.php'); exit; } diff --git a/install/pialert_front.conf b/install/pialert_front.conf index 5319de95..5a52ab9b 100644 --- a/install/pialert_front.conf +++ b/install/pialert_front.conf @@ -8,5 +8,5 @@ # ------------------------------------------------------------------------------ $HTTP["host"] == "pi.alert" { - server.document-root = "/var/www/html/pialert/" + server.document-root = "/var/www/html/" }