diff options
| author | Michael Adam <obnox@samba.org> | 2010-03-02 23:11:57 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2010-03-02 23:39:21 +0100 |
| commit | cfa5792880a1eb729cb37fd90de1c273dc5c056f (patch) | |
| tree | 59cc42f67d6aeed769169db888b91370cbdb5c0a | |
| parent | f640c6fbb11ed233d93580e23966dd8bdc5ab88f (diff) | |
change the default log file location to "@LOCALSTATEDIR@/log/tinyproxy/tinyproxy.log"
i.e. add a tinyproxy subdirectory.
This is meant to ease running tinyproxy as non-root user
the subdirectory can be used to give the tinyproxy user
write permission.
Michael
| -rw-r--r-- | docs/man8/tinyproxy.txt.in | 2 | ||||
| -rw-r--r-- | etc/tinyproxy.conf.in | 2 | ||||
| -rw-r--r-- | src/main.c | 2 | ||||
| -rwxr-xr-x | tests/scripts/run_tests.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/man8/tinyproxy.txt.in b/docs/man8/tinyproxy.txt.in index 9432bdc..467b1e7 100644 --- a/docs/man8/tinyproxy.txt.in +++ b/docs/man8/tinyproxy.txt.in @@ -130,7 +130,7 @@ configuration variable `StatFile`. FILES ----- -`/etc/tinyproxy/tinyproxy.conf`, `/var/run/tinyproxy.pid`, `/var/log/tinyproxy.log` +`/etc/tinyproxy/tinyproxy.conf`, `/var/run/tinyproxy.pid`, `/var/log/tinyproxy/tinyproxy.log` BUGS ---- diff --git a/etc/tinyproxy.conf.in b/etc/tinyproxy.conf.in index ab7f540..51da5a9 100644 --- a/etc/tinyproxy.conf.in +++ b/etc/tinyproxy.conf.in @@ -92,7 +92,7 @@ StatFile "@pkgdatadir@/stats.html" # and enable the Syslog directive. These directives are mutually # exclusive. # -LogFile "@localstatedir@/log/tinyproxy.log" +LogFile "@localstatedir@/log/tinyproxy/tinyproxy.log" # # Syslog: Tell tinyproxy to use syslog instead of a logfile. This @@ -345,7 +345,7 @@ static void initialize_config_defaults (struct config_s *conf) conf->errorpages = NULL; conf->stathost = safestrdup (TINYPROXY_STATHOST); conf->idletimeout = MAX_IDLE_TIME; - conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy.log"); + conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy/tinyproxy.log"); conf->pidpath = safestrdup (LOCALSTATEDIR "/run/tinyproxy.pid"); } diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh index b2cfc73..0f4134c 100755 --- a/tests/scripts/run_tests.sh +++ b/tests/scripts/run_tests.sh @@ -29,7 +29,7 @@ TINYPROXY_PORT=12321 TINYPROXY_USER=$USER TINYPROXY_PID_DIR=$TESTENV_DIR/var/run/tinyproxy TINYPROXY_PID_FILE=$TINYPROXY_PID_DIR/tinyproxy.pid -TINYPROXY_LOG_DIR=$LOG_DIR +TINYPROXY_LOG_DIR=$LOG_DIR/tinyproxy TINYPROXY_DATA_DIR=$TESTENV_DIR/usr/share/tinyproxy TINYPROXY_CONF_DIR=$TESTENV_DIR/etc/tinyproxy TINYPROXY_CONF_FILE=$TINYPROXY_CONF_DIR/tinyproxy.conf |