don't create test htpasswd on 4.x
authorMark Wells <mark@freeside.biz>
Tue, 4 Aug 2015 19:43:50 +0000 (12:43 -0700)
committerMark Wells <mark@freeside.biz>
Tue, 4 Aug 2015 19:43:50 +0000 (12:43 -0700)
FS-Test/bin/freeside-test-start
FS-Test/bin/freeside-test-stop

index 596879e..eca2e03 100755 (executable)
@@ -37,15 +37,6 @@ if [ $createdb = YES ]; then
   sudo -u freeside psql freeside -q -f $sharedir/test.sql > /dev/null
 fi
 
   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' \
 )
 newtime=$(sudo -u freeside \
   psql -tc 'SELECT to_timestamp(max(_date) + 86400) FROM cust_bill' \
 )
index 5066890..2c62c10 100755 (executable)
@@ -14,20 +14,6 @@ if psql -l |grep -q '^ *freeside '; then
   psql postgres -c "ALTER DATABASE freeside RENAME TO $newname"
 fi
 
   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 ' ' | \
 oldname=$( psql -tl | \
            cut -d '|' -f 1 | \
            tr -d ' ' | \