Trying with htpasswd

stackhpc · Aug 15, 2023 · 35f18c5 · 35f18c5
1 parent 69ef147
commit 35f18c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/image/docker-entrypoint.sh b/image/docker-entrypoint.sh
@@ -95,6 +95,7 @@ then
         echo "ssh keys already found"
     else
             ssh-keygen -t rsa -f /home/rocky/.ssh/id_rsa -N ""
+            chown rocky:rocky /home/rocky/.ssh/id_rsa /home/rocky/.ssh/id_rsa.pub
     fi
 
     echo "---> Setting permissions for user home directories"
@@ -132,7 +133,7 @@ then
     /opt/ood/ood-portal-generator/sbin/update_ood_portal
     mkdir --parents /opt/rh/httpd24/root/etc/httpd/
 
-    /usr/bin/htdbm -cb /opt/rh/httpd24/root/etc/httpd/.htpasswd.dbm rocky $ROCKY_OOD_PASS
+    /usr/bin/htpasswd -cb /opt/rh/httpd24/root/etc/httpd/apache-passwords rocky $ROCKY_OOD_PASS
     /usr/sbin/httpd -k start -X -e debug
 
 elif [ "$1" = "check-queue-hook" ]

diff --git a/slurm-cluster-chart/files/ood_portal.yaml b/slurm-cluster-chart/files/ood_portal.yaml
@@ -243,8 +243,8 @@ ssl:
 host_regex: 'head'
 auth:
  - 'AuthType Basic'
- - 'AuthName "private"'
- - 'AuthBasicProvider dbm'
- - 'AuthDBMUserFile "/opt/rh/httpd24/root/etc/httpd/.htpasswd.dbm"'
+ - 'AuthName "Restricted Files"'
+ - 'AuthBasicProvider file'
+ - 'AuthDBMUserFile "/opt/rh/httpd24/root/etc/httpd/apache-passwords"'
  - 'RequestHeader unset Authorization'
  - 'Require valid-user'