ncp-web: disable activation page once activated

nachoparker · nachoparker · commit 20370640c7af · 2021-10-04T14:06:39.000-06:00
Signed-off-by: nachoparker &lt;nacho@ownyourbits.com&gt;
diff --git a/build/docker/nextcloudpi/Dockerfile b/build/docker/nextcloudpi/Dockerfile
@@ -19,7 +19,7 @@ COPY ncp.sh update.sh post-inst.sh    /tmp/ncp-build/
 COPY ncp-web              /tmp/ncp-build/ncp-web/
 COPY ncp-app              /tmp/ncp-build/ncp-app/
 COPY ncp-previewgenerator /tmp/ncp-build/ncp-previewgenerator/
-COPY build/docker         /tmp/ncp-build/docker/
+COPY build/docker         /tmp/ncp-build/build/docker/
 COPY etc/ncp-config.d/nc-init.cfg /usr/local/etc/ncp-config.d/nc-init-copy.cfg
 
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,7 @@
 
-[v1.39.20](https://github.com/nextcloud/nextcloudpi/commit/7188050) (2021-10-04) ncp-config: fix first time error with no known latest version
+[v1.39.21](https://github.com/nextcloud/nextcloudpi/commit/a4fdff6) (2021-10-04) ncp-web: disable activation page once activated
+
+[v1.39.20](https://github.com/nextcloud/nextcloudpi/commit/714c3e5) (2021-10-04) ncp-config: fix first time error with no known latest version
 
 [v1.39.19](https://github.com/nextcloud/nextcloudpi/commit/05f0d35) (2021-09-30) ncp-web: fix upload from local file path
 
diff --git a/ncp-web/activate/index.php b/ncp-web/activate/index.php
@@ -1,4 +1,12 @@
-<?php session_start(); ?>
+<?php
+// disallow once activated
+exec("a2query -s ncp-activation", $output, $ret);
+if ($ret != 0) {
+  http_response_code(404);
+  exit();
+}
+session_start();
+?>
 <!DOCTYPE html>
 <html class="ng-csp" data-placeholder-focus="false" lang="en">
 <head>
@@ -10,7 +18,7 @@
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
   <meta http-equiv="cache-control" content="no-cache">
   <meta http-equiv="pragma" content="no-cache">
-  <link rel="icon" type="image/png" href="img/favicon.png"/>
+  <link rel="icon" type="image/png" href="../img/favicon.png"/>
   <link rel="stylesheet" href="CSS.css">
 </head>
 <body id="body-login">
