Merge pull request #1424 from garberg/correct_nipap.conf.dist_path

Docker fixes to WWW for new nipap packaging
SpriteLink · Jan 21, 2025 · 9bb7b72 · 9bb7b72
2 parents b8fcb9f + 67d4fa9
commit 9bb7b72
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/nipap-www/entrypoint.sh b/nipap-www/entrypoint.sh
@@ -7,15 +7,15 @@ fi
 
 # Create NIPAP configuration file
 if [ ! -e /etc/nipap/nipap.conf ]; then
-    envtpl --keep-template --allow-missing -o /etc/nipap/nipap.conf /nipap/nipap.conf.dist
+    envtpl --keep-template --allow-missing -o /etc/nipap/nipap.conf /usr/local/share/nipap/nipap.conf.dist
 fi
 
 # Set up local auth database
 if [ ! -e /etc/nipap/local_auth.db ]; then
-    /usr/sbin/nipap-passwd create-database
+    /usr/local/bin/nipap-passwd create-database
 fi
 if [ `nipap-passwd list | egrep -c ^$WWW_USERNAME\\\s` -eq 0 ]; then
-    /usr/sbin/nipap-passwd add -u $WWW_USERNAME -p $WWW_PASSWORD -n "NIPAP WWW user" -t
+    /usr/local/bin/nipap-passwd add -u $WWW_USERNAME -p $WWW_PASSWORD -n "NIPAP WWW user" -t
 fi
 
 # Configure apache