summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-09-15 02:24:00 +0200
committerMichael Adam <obnox@samba.org>2009-09-15 02:25:10 +0200
commitf648d82edce8570228f180fb9839d2d6b93bb8ac (patch)
tree14074d4ff5cb3acf0a076fe9ce3f7e603d003206
parent574a65c28e6d016b8871deee12792c33be67c9bb (diff)
downloadtinyproxy-f648d82edce8570228f180fb9839d2d6b93bb8ac.tar.gz
tinyproxy-f648d82edce8570228f180fb9839d2d6b93bb8ac.zip
tests: prepare tinyproxy for filter file usage in tests.
Michael
-rwxr-xr-xtests/scripts/run_tests.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
index d93b5ec..85bbd60 100755
--- a/tests/scripts/run_tests.sh
+++ b/tests/scripts/run_tests.sh
@@ -31,8 +31,9 @@ TINYPROXY_PID_DIR=$TESTENV_DIR/var/run/tinyproxy
TINYPROXY_PID_FILE=$TINYPROXY_PID_DIR/tinyproxy.pid
TINYPROXY_LOG_DIR=$LOG_DIR
TINYPROXY_DATA_DIR=$TESTENV_DIR/usr/share/tinyproxy
-TINYPROXY_CONF_DIR=$TESTENV_DIR/etc
+TINYPROXY_CONF_DIR=$TESTENV_DIR/etc/tinyproxy
TINYPROXY_CONF_FILE=$TINYPROXY_CONF_DIR/tinyproxy.conf
+TINYPROXY_FILTER_FILE=$TINYPROXY_CONF_DIR/filter
TINYPROXY_STDERR_LOG=$TINYPROXY_LOG_DIR/tinyproxy.stderr.log
TINYPROXY_BIN=$BASEDIR/src/tinyproxy
TINYPROXY_STATHOST_IP="127.0.0.127"
@@ -91,7 +92,11 @@ Allow 127.0.0.0/8
ViaProxyName "tinyproxy"
ConnectPort 443
ConnectPort 563
+FilterURLs On
+Filter "$TINYPROXY_FILTER_FILE"
EOF
+
+ touch $TINYPROXY_FILTER_FILE
}
start_tinyproxy() {