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

Retain logging for tor so that we can monitor its health

This commit is contained in:
Bob Mottram 2018-05-04 12:47:51 +01:00
parent cecd4d876c
commit 9f4a2ac224
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-image-customise
View File

@ -1762,8 +1762,8 @@ image_setup_utils() {
chroot "$rootdir" apt-get -yq -t stretch-backports install tor chroot "$rootdir" apt-get -yq -t stretch-backports install tor
chroot "$rootdir" apt-get -yq install connect-proxy chroot "$rootdir" apt-get -yq install connect-proxy
chroot "$rootdir" connect-proxy chroot "$rootdir" connect-proxy
sed -i 's|#Log notice file.*|Log notice file /dev/null|g' "$rootdir/etc/tor/torrc" sed -i 's|#Log notice file.*|Log notice file /var/log/tor/notices.log|g' "$rootdir/etc/tor/torrc"
sed -i 's|Log notice file.*|Log notice file /dev/null|g' "$rootdir/etc/tor/torrc" sed -i 's|Log notice file.*|Log notice file /var/log/tor/notices.log|g' "$rootdir/etc/tor/torrc"
sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" "$rootdir/etc/tor/torrc" sed -i "s|#AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" "$rootdir/etc/tor/torrc"
sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" "$rootdir/etc/tor/torrc" sed -i "s|AccountingMax.*|AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes|g" "$rootdir/etc/tor/torrc"
if ! grep -q 'Host *.onion' "$rootdir/root/.ssh/config"; then if ! grep -q 'Host *.onion' "$rootdir/root/.ssh/config"; then

2
src/freedombone-utils-onion
View File

@ -336,7 +336,7 @@ 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 'Log notice file /var/log/tor/notices.log' > /etc/torrc.d/logging
echo "AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes" > /etc/torrc.d/maxtraffic echo "AccountingMax $TOR_MAX_TRAFFIC_PER_MONTH_GB GBytes" > /etc/torrc.d/maxtraffic
mark_completed "${FUNCNAME[0]}" mark_completed "${FUNCNAME[0]}"