Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 293 → Rev 294

/alcasar.sh
89,6 → 89,7
for i in $EXTIF $INTIF
do
/sbin/ifconfig $i up
/sbin/ip link set $i up
sleep 2
if [ "`/usr/sbin/ethtool $i|grep Link|cut -d' ' -f3`" != "yes" ]
then
975,7 → 976,7
echo "# Entry for havp tmp files scan partition" >> /etc/fstab
echo "/tmp/havp-disk /var/tmp/havp ext4 loop,mand,noatime,async" >> /etc/fstab
mount /var/tmp/havp
chown -R havp /var/tmp/havp /var/log/havp
chown -R havp /var/tmp/havp /var/log/havp /var/run/havp
# configuration d'HAVP
[ -e /etc/havp/havp.config.default ] || cp /etc/havp/havp.config /etc/havp/havp.config.default
$SED "/^REMOVETHISLINE/d" /etc/havp/havp.config
/scripts/sbin/alcasar-uninstall.sh
11,9 → 11,9
echo "-----------------------------------------------------------------------------"
echo
#services_stop
for i in squid ntpd iptables ulogd dansguardian chilli httpd radiusd freshclam havp dnsmasq named dhcpd
for i in squid ntpd iptables ulogd dansguardian chilli httpd radiusd freshclam havp dnsmasq mysqld named dhcpd
do
[ -e /etc/init.d/$i ] && /sbin/chkconfig --del $i && /etc/init.d/$i stop
[ -e /etc/init.d/$i ] && /sbin/chkconfig --del $i && /etc/init.d/$i stop && killall $i 2>/dev/null
done
echo "Réinitialisation des fonctions : "
 
43,9 → 43,9
#init_db
echo -en "\n- init_db(2) : 1, "
[ -e /etc/my.cnf.default ] && mv -f /etc/my.cnf.default /etc/my.cnf && echo -n "2 "
/sbin/chkconfig --del mysqld
/etc/init.d/mysqld stop
/usr/bin/killall mysqld 2>/dev/null
#/sbin/chkconfig --del mysqld
#/etc/init.d/mysqld stop
#/usr/bin/killall mysqld 2>/dev/null
rm -rf /var/lib/mysql*
sleep 1
 
100,10 → 100,14
 
#antivirus
echo -en "\n- antivirus(5) : "
if [ `mount|grep 'havp-disk'|wc -l` -eq "1" ]
then
umount /var/tmp/havp && echo -n "1, "
sleep 1
if [ -e /etc/init.d/havp ]
then
# /usr/bin/killall havp 2>/dev/null
if [ `mount|grep 'havp-disk'|wc -l` -eq "1" ]
then
umount /var/tmp/havp && echo -n "1, "
sleep 1
fi
rm -rf /var/tmp/havp && echo -n "2, "
rm -f /tmp/havp-disk && echo -n "3, "
$SED "/^# Entry for havp/d" /etc/fstab
115,7 → 119,6
else echo -n "non installé"
fi
sleep 1
 
#firewall
echo -en "\n- firewall(1) : "
[ -e /etc/sysconfig/iptables ] && rm -f /etc/sysconfig/iptables && echo -n "1"
132,7 → 135,7
then
[ -e /etc/dnsmasq.conf.default ] && mv /etc/dnsmasq.conf.default /etc/dnsmasq.conf && echo -n "1, "
[ -d /etc/dnsmasq.d ] && rm -rf /etc/dnsmasq.d && echo -n "2, "
[ -d /usr/local/etc/alcasar-dnsfilter-available ] && rm -rf /usr/local/etc/alcasar-dnsfilter* && echo "3"
[ -d /usr/local/etc/alcasar-dnsfilter-available ] && rm -rf /usr/local/etc/alcasar-dnsfilter* && echo -n "3"
else echo -n "non installé"
fi
sleep 1
165,11 → 168,11
# network
echo -en "\n- network(9) : "
hostname localhost
/etc/init.d/network stop
[ -e /etc/sysconfig/network-scripts/default-ifcfg-eth0 ] && mv /etc/sysconfig/network-scripts/default-ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0 && echo -n "1, "
[ -e /etc/sysconfig/network.default ] && mv /etc/sysconfig/network.default /etc/sysconfig/network && echo -n "2, "
[ -e /etc/hosts.default ] && mv /etc/hosts.default /etc/hosts && echo -n "3, "
[ -e /etc/sysconfig/network-scripts/ifcfg-eth1 ] && rm -f /etc/sysconfig/network-scripts/ifcfg-eth1 && echo -n "4, "
/etc/init.d/network restart
[ -e /etc/ntp.conf.default ] && mv /etc/ntp.conf.default /etc/ntp.conf && echo -n "5, "
[ -e /etc/dhcpd.conf.default ] && mv /etc/dhcpd.conf.default /etc/dhcpd.conf && echo -n "6, "
[ -e /etc/sysconfig/dhcpd.default ] && mv /etc/sysconfig/dhcpd.default /etc/sysconfig/dhcpd && echo -n "7, "
199,3 → 202,5
/usr/sbin/urpme --auto $rm_rpm --auto-orphans 2>/dev/null
done
echo
/etc/init.d/network start
 
/gestion/admin/network.php
104,7 → 104,7
// Les actions sur un service
//-------------------------------
//sécurité sur les actions à réaliser
$autorizeService = array("radiusd","chilli","dansguardian","mysqld","squid","dnsmasq","dhcpd","httpd","havp","sshd");
$autorizeService = array("radiusd","chilli","dansguardian","mysqld","squid","dnsmasq","httpd","havp","sshd");
$autorizeAction = array("start","stop","restart");
 
if (isset($_GET['service'])&&(in_array($_GET['service'], $autorizeService))) {
122,8 → 122,7
$serviceStatus['dansguardian'] = checkServiceStatus("dansguardian","pid");
$serviceStatus['mysqld'] = checkServiceStatus("mysqld","OK");
$serviceStatus['squid'] = checkServiceStatus("squid","pid");
$serviceStatus['dnsmasq'] = checkServiceStatus("dnsmasq","up");
$serviceStatus['dhcpd'] = checkServiceStatus("dhcpd","pid");
$serviceStatus['dnsmasq'] = checkServiceStatus("dnsmasq","pid");
$serviceStatus['httpd'] = checkServiceStatus("httpd","pid");
$serviceStatus['havp'] = checkServiceStatus("havp","pid");
$serviceStatus['sshd'] = checkServiceStatus("sshd","pid");