Skip to content

Commit 67d4fa9

Browse files
committed
www: Docker fixes for new nipap packaging
Changes to the nipap-www Docker setup to handle changes introduced by new packaging of nipap. * Correct path to nipap-passwd * Correct path to sample config file
1 parent b8fcb9f commit 67d4fa9

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

nipap-www/entrypoint.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ fi
77

88
# Create NIPAP configuration file
99
if [ ! -e /etc/nipap/nipap.conf ]; then
10-
envtpl --keep-template --allow-missing -o /etc/nipap/nipap.conf /nipap/nipap.conf.dist
10+
envtpl --keep-template --allow-missing -o /etc/nipap/nipap.conf /usr/local/share/nipap/nipap.conf.dist
1111
fi
1212

1313
# Set up local auth database
1414
if [ ! -e /etc/nipap/local_auth.db ]; then
15-
/usr/sbin/nipap-passwd create-database
15+
/usr/local/bin/nipap-passwd create-database
1616
fi
1717
if [ `nipap-passwd list | egrep -c ^$WWW_USERNAME\\\s` -eq 0 ]; then
18-
/usr/sbin/nipap-passwd add -u $WWW_USERNAME -p $WWW_PASSWORD -n "NIPAP WWW user" -t
18+
/usr/local/bin/nipap-passwd add -u $WWW_USERNAME -p $WWW_PASSWORD -n "NIPAP WWW user" -t
1919
fi
2020

2121
# Configure apache

0 commit comments

Comments
 (0)