WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 1373 → Rev 1374

 /alcasar.sh
 ,6 → 1052,8
 {
         mkdir /var/dansguardian
         chown dansguardian /var/dansguardian
+        $SED "s/^ExecStart=.*?ExecStart=/usr/sbin/dansguardian -c /etc/dansguardian/dansguardian.conf?g" /lib/systemd/system/dansguardian.service
+        $SED "s/^After=.*?After=network.target chilli.target?g" /lib/systemd/system/dansguardian.service
         [ -e $DIR_DG/dansguardian.conf.default ] || cp $DIR_DG/dansguardian.conf $DIR_DG/dansguardian.conf.default
 # By default the filter is off
         $SED "s/^reportinglevel =.*/reportinglevel = -1/g" $DIR_DG/dansguardian.conf
 ,7 → 1165,7
 file="/var/log/firewall/$log_type.log"
 sync=1
 EOF
-                $SED "s?^ExecStart=.*?ExecStart=/usr/sbin/ulogd -C /etc/ulogd-$log_type.conf?g" /lib/systemd/system/ulogd-$log_type.service
+                $SED "s?^ExecStart=.*?ExecStart=/usr/sbin/ulogd -c /etc/ulogd-$log_type.conf?g" /lib/systemd/system/ulogd-$log_type.service
                 nl=`expr $nl + 1`
         done
         chown -R root:apache /var/log/firewall

 /scripts/sbin/alcasar-uninstall.sh
 ,7 → 19,7
 do
         [ -e /etc/init.d/$i ] && /sbin/chkconfig --del $i && /etc/init.d/$i stop && killall $i 2>/dev/null
 done
-for i in alcasar-load_balancing.service nfsen.service mysqld.service squid.service ntpd.service iptables.service ulogd.service dansguardian.service httpd.service radiusd.service freshclam.service dnsmasq.service named.service dhcpd.service chilli.service
+for i in alcasar-load_balancing.service nfsen.service mysqld.service ntpd.service iptables.service ulogd.service dansguardian.service httpd.service radiusd.service freshclam.service dnsmasq.service dhcpd.service chilli.service
 do
         [ -e /lib/systemd/system/$i ] && systemctl disable $i && systemctl stop $i 1>/dev/null
 done