free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move tor logging control to its own file

This commit is contained in:
Bob Mottram 2018-04-20 13:02:44 +01:00
parent f3033b4d5c
commit dce5921d5d
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedombone-logging
View File

@ -158,8 +158,7 @@ if [[ "$1" == "on" || "$1" == "On" || "$1" == "ON" ]]; then
touch /var/log/tor/notices.log touch /var/log/tor/notices.log
chown debian-tor:adm /var/log/tor/notices.log chown debian-tor:adm /var/log/tor/notices.log
fi fi
sed -i 's|#Log notice file.*|Log notice file /var/log/tor/notices.log|g' /etc/tor/torrc echo 'Log notice file /var/log/tor/notices.log' > /etc/torrc.d/logging
sed -i 's|Log notice file.*|Log notice file /var/log/tor/notices.log|g' /etc/tor/torrc
fi fi
if [ -f /etc/php/7.0/fpm/php-fpm.conf ]; then if [ -f /etc/php/7.0/fpm/php-fpm.conf ]; then
sed -i 's|error_log =.*|error_log = /var/log/php-fpm.log|g' /etc/php/7.0/fpm/php-fpm.conf sed -i 's|error_log =.*|error_log = /var/log/php-fpm.log|g' /etc/php/7.0/fpm/php-fpm.conf
@ -206,8 +205,7 @@ else
turn_logging_off turn_logging_off
if [ -d /etc/tor ]; then if [ -d /etc/tor ]; then
sed -i 's|#Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc echo 'Log notice file /dev/null' > /etc/torrc.d/logging
sed -i 's|Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc
rm /var/log/tor/* rm /var/log/tor/*
fi fi
if [ -d /var/log/radicale ]; then if [ -d /var/log/radicale ]; then

11
src/freedombone-utils-onion
View File

@ -323,14 +323,6 @@ function install_tor {
# For torify # For torify
apt-get -yq install torsocks apt-get -yq install torsocks
# turn off logging
sed -i 's|#Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc
sed -i 's|Log notice file.*|Log notice file /dev/null|g' /etc/tor/torrc
# Restrict traffic
sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" /etc/tor/torrc
sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" /etc/tor/torrc
if [ ! -d /etc/torrc.d ]; then if [ ! -d /etc/torrc.d ]; then
mkdir /etc/torrc.d mkdir /etc/torrc.d
fi fi
@ -339,6 +331,9 @@ function install_tor {
echo '%include /etc/torrc.d' >> /etc/tor/torrc echo '%include /etc/torrc.d' >> /etc/tor/torrc
fi fi
echo 'Log notice file /dev/null' > /etc/torrc.d/logging
echo "AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes" > /etc/torrc.d/maxtraffic
mark_completed "${FUNCNAME[0]}" mark_completed "${FUNCNAME[0]}"
} }