Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1370 → Rev 1371

/scripts/sbin/alcasar-bl.sh
126,15 → 126,12
# Adapt Toulouse BL to ALCASAR architecture (dnsmasq + DG + iptables)
-adapt | --adapt)
echo -n "Toulouse BlackList migration process. Please wait : "
# Saving OSSI files (IP_WL, IP_BL, domain)
if [ -e $DIR_SHARE/ossi-ip-wl ]
if [ ! -e $DIR_SHARE/ossi-ip-wl ]
then
cp $DIR_SHARE/ossi-ip-wl $DIR_tmp/ossi-ip-wl
else
touch $DIR_SHARE/ossi-ip-wl
chown apache $DIR_SHARE/ossi-ip-wl
fi
if [ -f $DIR_tmp/blacklists.tar.gz ]
if [ -f $DIR_tmp/blacklists.tar.gz ] # when downloading the last version of the BL
then
[ -d $DIR_DG_BL/ossi ] && mv $DIR_DG_BL/ossi $DIR_tmp
[ -e $DIR_IP_BL/ossi ] && mv $DIR_IP_BL/ossi $DIR_tmp/ossi-ip-bl
210,7 → 207,6
rm -f $FILE_tmp $FILE_ip_tmp
# Restoring ossi files
[ -e $DIR_tmp/ossi-ip-bl ] && mv $DIR_tmp/ossi-ip-bl $DIR_IP_BL/ossi
[ -e $DIR_tmp/ossi-ip-wl ] && mv $DIR_tmp/ossi-ip-wl $DIR_SHARE/ossi-ip-wl
rm -rf $DIR_tmp
echo
;;
/scripts/sbin/alcasar-uninstall.sh
15,11 → 15,11
echo "-----------------------------------------------------------------------------"
echo
#services_stop
for i in chilli havp gammu-smsd
for i in havp gammu-smsd
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
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
do
[ -e /lib/systemd/system/$i ] && systemctl disable $i && systemctl stop $i 1>/dev/null
done
89,9 → 89,11
[ -e /etc/chilli/alcasar-macallowed ] && rm /etc/chilli/alcasar-macallowed # if 2.7 and later, macallowed is replaced with macauth
if [ -e /etc/chilli.conf.default ] # >= V2.0
then
echo -en "\n- param_chilli(2) : "
echo -en "\n- param_chilli(4) : "
[ -e /etc/init.d/chilli.default ] && mv /etc/init.d/chilli.default /etc/init.d/chilli && echo -n "1, "
[ -e /etc/chilli.conf.default ] && mv /etc/chilli.conf.default /etc/chilli.conf && echo -n "2"
[ -e /usr/libexec/chilli ] && rm /usr/libexec/chilli && echo -n "2, "
[ -e /etc/chilli.conf.default ] && mv /etc/chilli.conf.default /etc/chilli.conf && echo -n "3, "
[ -e /lib/systemd/chilli.service ] && rm /lib/systemd/chilli.service && echo -n "4"
else # < V2.0
echo -en "\n- param_chilli(5) : "
[ -e /etc/chilli/functions.default ] && mv /etc/chilli/functions.default /etc/chilli/functions && echo -n "1, "