1306,8 → 1306,8 |
fi |
groupadd -f tinyproxy |
useradd -r -g tinyproxy -s /bin/false -c "system user for tinyproxy" tinyproxy |
mkdir -p /var/run/tinyproxy /var/log/tinyproxy |
chown -R tinyproxy:tinyproxy /var/run/tinyproxy /var/log/tinyproxy |
mkdir -p /run/tinyproxy /var/log/tinyproxy |
chown -R tinyproxy.tinyproxy /run/tinyproxy /var/log/tinyproxy |
[ -e /etc/tinyproxy/tinyproxy.conf.default ] || cp /etc/tinyproxy/tinyproxy.conf /etc/tinyproxy/tinyproxy.conf.default |
$SED "s?^User.*?User tinyproxy?g" /etc/tinyproxy/tinyproxy.conf |
$SED "s?^Group.*?Group tinyproxy?g" /etc/tinyproxy/tinyproxy.conf |
1334,6 → 1334,7 |
[Service] |
Type=forking |
User=tinyproxy |
ExecStartPre=/bin/chown -R tinyproxy.tinyproxy /run/tinyproxy |
PIDFile=/run/tinyproxy/tinyproxy.pid |
ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf |
|
1554,6 → 1555,9 |
filterwin2k |
EOF |
|
# the main instance should start after network and chilli (which create tun0) |
[ -e /lib/systemd/system/dnsmasq.service.old ] || cp -f /lib/systemd/system/dnsmasq.service /lib/systemd/system/dnsmasq.service.old |
$SED "s?^After=.*?After=syslog.target network-online.target chilli.service?g" /lib/systemd/system/dnsmasq.service |
# Create dnsmasq-blacklist, dnsmasq-whitelist and dnsmasq-blackhole unit |
for list in blacklist whitelist blackhole |
do |
1561,9 → 1565,6 |
$SED "s?^ExecStart=.*?ExecStart=/usr/sbin/dnsmasq -C /etc/dnsmasq-$list.conf?g" /lib/systemd/system/dnsmasq-$list.service |
$SED "s?^PIDFile=.*?PIDFile=/var/run/dnsmasq-$list.pid?g" /lib/systemd/system/dnsmasq-$list.service |
done |
# the main instance should start after network and chilli (which create tun0) |
[ -e /lib/systemd/system/dnsmasq.service.old ] || cp -f /lib/systemd/system/dnsmasq.service /lib/systemd/system/dnsmasq.service.old |
$SED "s?^After=.*?After=syslog.target network-online.target chilli.service?g" /lib/systemd/system/dnsmasq.service |
} # End dnsmasq |
|
########################################################## |