we can't nest mohunt points inside a container, make them siblings in…

…stead (#169)
idaholab · Apr 12, 2023 · 9c006aa · 9c006aa
1 parent bd78af7
commit 9c006aa
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 13 deletions.
diff --git a/Dockerfiles/htadmin.Dockerfile b/Dockerfiles/htadmin.Dockerfile
@@ -67,7 +67,8 @@ RUN apt-get -q update && \
     cd /var/www/htadmin && \
     ( grep -rhoPi "(src|href)=['\"]https?://.+?['\"]" ./includes/* | sed "s/^[a-zA-Z]*=['\"]*//" | sed "s/['\"]$//" | xargs -r -l curl -s -S -L -J -O ) && \
     sed -i "s@http[^'\"]*/@@gI" ./includes/* && \
-    mkdir fonts && cd fonts && \
+    mkdir fonts config auth default && \
+    cd fonts && \
     curl -s -S -L -J -O "https://maxcdn.bootstrapcdn.com/bootstrap/$BOOTSTRAP_VERSION/fonts/glyphicons-halflings-regular.ttf" && \
     curl -s -S -L -J -O "https://maxcdn.bootstrapcdn.com/bootstrap/$BOOTSTRAP_VERSION/fonts/glyphicons-halflings-regular.woff" && \
     curl -s -S -L -J -O "https://maxcdn.bootstrapcdn.com/bootstrap/$BOOTSTRAP_VERSION/fonts/glyphicons-halflings-regular.woff2" && \

diff --git a/docker-compose-standalone.yml b/docker-compose-standalone.yml
@@ -445,7 +445,7 @@ services:
       - ./nginx/ca-trust:/var/local/ca-trust:ro
       - ./htadmin/config.ini:/var/www/htadmin/config/config.ini:rw
       - ./htadmin/metadata:/var/www/htadmin/config/metadata:rw
-      - ./nginx/htpasswd:/var/www/htadmin/config/auth/htpasswd:rw
+      - ./nginx/htpasswd:/var/www/htadmin/auth/htpasswd:rw
     healthcheck:
       test: ["CMD", "curl", "--silent", "--fail", "http://localhost"]
       interval: 60s

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -499,7 +499,7 @@ services:
       - ./nginx/ca-trust:/var/local/ca-trust:ro
       - ./htadmin/config.ini:/var/www/htadmin/config/config.ini:rw
       - ./htadmin/metadata:/var/www/htadmin/config/metadata:rw
-      - ./nginx/htpasswd:/var/www/htadmin/config/auth/htpasswd:rw
+      - ./nginx/htpasswd:/var/www/htadmin/auth/htpasswd:rw
     healthcheck:
       test: ["CMD", "curl", "--silent", "--fail", "http://localhost"]
       interval: 60s

diff --git a/docs/contributing-local-modifications.md b/docs/contributing-local-modifications.md
@@ -83,7 +83,7 @@ $ grep -P "^(      - ./|  [\w-]+:)" docker-compose-standalone.yml
       - ./nginx/ca-trust:/var/local/ca-trust:ro
       - ./htadmin/config.ini:/var/www/htadmin/config/config.ini:rw
       - ./htadmin/metadata:/var/www/htadmin/config/metadata:rw
-      - ./nginx/htpasswd:/var/www/htadmin/config/htpasswd:rw
+      - ./nginx/htpasswd:/var/www/htadmin/auth/htpasswd:rw
   freq:
       - ./nginx/ca-trust:/var/local/ca-trust:ro
   api:

diff --git a/htadmin/htadmin.sh b/htadmin/htadmin.sh
@@ -2,12 +2,14 @@
 
 HTADMIN_ENABLED=${NGINX_BASIC_AUTH:-"true"}
 
-if [[ ! -f /var/www/htadmin/config/config.ini ]]; then
-  cp /var/www/htadmin/config/default/config.ini /var/www/htadmin/config/config.ini
+if [[ ! -f /var/www/htadmin/config/config.ini ]] && [[ -f /var/www/htadmin/default/config.ini ]]; then
+  mkdir -p /var/www/htadmin/config/
+  cp /var/www/htadmin/default/config.ini /var/www/htadmin/config/config.ini
 fi
 
-if [[ ! -f /var/www/htadmin/config/metadata ]]; then
-  cp /var/www/htadmin/config/default/metadata /var/www/htadmin/config/metadata
+if [[ ! -f /var/www/htadmin/config/metadata ]] && [[ -f /var/www/htadmin/default/metadata ]]; then
+  mkdir -p /var/www/htadmin/config/
+  cp /var/www/htadmin/default/metadata /var/www/htadmin/config/metadata
 fi
 
 if [[ "$HTADMIN_ENABLED" == "true" ]]; then

diff --git a/htadmin/nginx/sites-available/default b/htadmin/nginx/sites-available/default
@@ -19,8 +19,16 @@ server {
         fastcgi_pass unix:/run/php/php7.4-fpm.sock;
     }
 
+    location /auth {
+        deny all;
+        return 404;
+    }
     location /config {
         deny all;
         return 404;
     }
+    location /default {
+        deny all;
+        return 404;
+    }
 }
diff --git a/kubernetes/19-htadmin.yml b/kubernetes/19-htadmin.yml
@@ -48,12 +48,12 @@ spec:
         volumeMounts:
           - mountPath: /var/local/ca-trust/configmap
             name: htadmin-var-local-catrust-volume
-          - mountPath: /var/www/htadmin/config/auth
+          - mountPath: /var/www/htadmin/auth
             name: htadmin-config-volume
             subPath: "auth"
-          - mountPath: /var/www/htadmin/config/default/configmap
-            name: htadmin-config-default-volume 
-          - mountPath: /var/www/htadmin/config/
+          - mountPath: /var/www/htadmin/default/configmap
+            name: htadmin-config-default-volume
+          - mountPath: /var/www/htadmin/config
             name: htadmin-config-volume
             subPath: "htadmin"
       volumes:

diff --git a/scripts/control.py b/scripts/control.py
@@ -1123,7 +1123,7 @@ def authSetup(wipe=False):
                     f.write('; Change this to customize your title:\n')
                     f.write('app_title = Malcolm User Management\n\n')
                     f.write('; htpasswd file\n')
-                    f.write('secure_path  = ./config/auth/htpasswd\n')
+                    f.write('secure_path  = ./auth/htpasswd\n')
                     f.write('; metadata file\n')
                     f.write('metadata_path  = ./config/metadata\n\n')
                     f.write('; administrator user/password (htpasswd -b -c -B ...)\n')