From: Mark Wells Date: Tue, 4 Aug 2015 19:43:50 +0000 (-0700) Subject: don't create test htpasswd on 4.x X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4df16e7570344219513ba7c6611d43ae396ead13 don't create test htpasswd on 4.x --- diff --git a/FS-Test/bin/freeside-test-start b/FS-Test/bin/freeside-test-start index 859aca4c7..430a4115d 100755 --- a/FS-Test/bin/freeside-test-start +++ b/FS-Test/bin/freeside-test-start @@ -37,15 +37,6 @@ if [ $createdb = YES ]; then sudo -u freeside psql freeside -q -f $sharedir/test.sql > /dev/null fi -if [ -f /usr/local/etc/freeside/htpasswd ]; then - newhtpasswd=htpasswd_`date +%Y%m%d` - echo "Renaming htpasswd to $newhtpasswd." - sudo mv /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/$newhtpasswd -fi - -echo "Installing new htpasswd." -sudo cp $sharedir/htpasswd /usr/local/etc/freeside/htpasswd - newtime=$(sudo -u freeside \ psql -tc 'SELECT to_timestamp(max(_date) + 86400) FROM cust_bill' \ ) diff --git a/FS-Test/bin/freeside-test-stop b/FS-Test/bin/freeside-test-stop index 50668907c..2c62c10cd 100755 --- a/FS-Test/bin/freeside-test-stop +++ b/FS-Test/bin/freeside-test-stop @@ -14,20 +14,6 @@ if psql -l |grep -q '^ *freeside '; then psql postgres -c "ALTER DATABASE freeside RENAME TO $newname" fi -if (sudo grep -q '^test:' /usr/local/etc/freeside/htpasswd); then - newhtpasswd=htpasswd_test_`date +%Y%m%d` - echo "Renaming htpasswd to $newhtpasswd." - sudo mv /usr/local/etc/freeside/htpasswd /usr/local/etc/freeside/$newhtpasswd - oldhtpasswd=$( cd /usr/local/etc/freeside; \ - ls |grep -P 'htpasswd_\d{8}' | \ - sort -nr |head -1 ) - if [ -f $oldhtpasswd ]; then - echo "Renaming $oldhtpasswd to htpasswd." - sudo mv /usr/local/etc/freeside/$oldhtpasswd \ - /usr/local/etc/freeside/htpasswd - fi -fi - oldname=$( psql -tl | \ cut -d '|' -f 1 | \ tr -d ' ' | \