diff options
| author | Mark Wells <mark@freeside.biz> | 2015-08-04 12:43:50 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-08-04 12:43:50 -0700 |
| commit | f673db50d866ac1b64bb80b09bd81071d089bf41 (patch) | |
| tree | e9cc3bbe5c3e00919a70c78b14e935dafa109f8c /FS-Test | |
| parent | b25efe03cc7945773363ba74e2012646c258a1b5 (diff) | |
don't create test htpasswd on 4.x
Diffstat (limited to 'FS-Test')
| -rwxr-xr-x | FS-Test/bin/freeside-test-start | 9 | ||||
| -rwxr-xr-x | FS-Test/bin/freeside-test-stop | 14 |
2 files changed, 0 insertions, 23 deletions
diff --git a/FS-Test/bin/freeside-test-start b/FS-Test/bin/freeside-test-start index 596879e1c..eca2e03b6 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 ' ' | \ |