Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1540 → Rev 1541

/alcasar.sh
41,6 → 41,7
# ulogd : log system in userland (match NFLOG target of iptables)
# nfsen : : Configuration du grapheur nfsen pour apache
# dnsmasq : Name server configuration
# vnstat : little network stat daemon
# BL : BlackList of Toulouse configuration : split into 3 BL (for Dnsmasq, for dansguardian and for Netfilter)
# cron : Logs export + watchdog + connexion statistics
# fail2ban : Fail2ban IDS installation and configuration
832,13 → 833,6
EOF
# Launch after coova
$SED "s?^After=.*?After=network.target remote-fs.target nss-lookup.target chilli.service?g" /lib/systemd/system/httpd.service
# Initialization of Vnstat and vnstat phpFE
[ -e /etc/vnstat.conf.default ] || cp /etc/vnstat.conf /etc/vnstat.conf.default
$SED "s?Interface.*?Interface \"$EXTIF\"?g" /etc/vnstat.conf
[ -e /var/www/html/acc/manager/stats/config.php.default ] || cp /var/www/html/acc/manager/stats/config.php /var/www/html/acc/manager/stats/config.php.default
$SED "s?\$iface_list =.*?\$iface_list = array('$EXTIF');?g" /var/www/html/acc/manager/stats/config.php
$SED "s?\$iface_title.*?\$iface_title['$EXTIF'] = 'Internet outbound';?g" /var/www/html/acc/manager/stats/config.php
/usr/bin/vnstat -u -i $EXTIF
} # End of ACC ()
 
##########################################################################################
1461,6 → 1455,19
} # End of nfsen ()
 
##################################################
## Function "vnstat" ##
## Initialization of Vnstat and vnstat phpFE ##
##################################################
vnstat ()
{
[ -e /etc/vnstat.conf.default ] || cp /etc/vnstat.conf /etc/vnstat.conf.default
$SED "s?Interface.*?Interface \"$EXTIF\"?g" /etc/vnstat.conf
[ -e $DIR_ACC/manager/stats/config.php.default ] || cp $DIR_ACC/manager/stats/config.php $DIR_ACC/manager/stats/config.php.default
$SED "s?\$iface_list =.*?\$iface_list = array('$EXTIF');?g" $DIR_ACC/manager/stats/config.php
$SED "s?\$iface_title.*?\$iface_title['$EXTIF'] = 'Internet outbound';?g" $DIR_ACC/manager/stats/config.php
/usr/bin/vnstat -u -i $EXTIF
} # End of vnstat
##################################################
## Function "dnsmasq" ##
##################################################
dnsmasq ()
2081,7 → 2088,7
UPD_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f3`
mode="update"
fi
for func in init network ACC CA init_db radius radius_web chilli dansguardian antivirus tinyproxy ulogd nfsen dnsmasq BL cron fail2ban gammu_smsd post_install
for func in init network ACC CA init_db radius radius_web chilli dansguardian antivirus tinyproxy ulogd nfsen vnstat dnsmasq BL cron fail2ban gammu_smsd post_install
do
$func
# echo "*** 'debug' : end of function $func ***"; read a
/scripts/sbin/alcasar-uninstall.sh
31,7 → 31,7
sleep 1
 
# gestion
echo -en "\n- gestion(12) : "
echo -en "\n- gestion(10) : "
[ -d /var/www/html ] && rm -rf /var/www/html && echo -n "1, "
[ -e /etc/httpd/conf/httpd.conf.default ] && mv /etc/httpd/conf/httpd.conf.default /etc/httpd/conf/httpd.conf && echo -n "2, "
[ -e /etc/httpd/conf/modules.d/00_base.conf.default ] && mv /etc/httpd/conf/modules.d/00_base.conf.default /etc/httpd/conf/modules.d/00_base.conf && echo -n "3, "
44,10 → 44,7
[ -e /etc/httpd/conf/webapps.d/alcasar.conf ] && rm -f /etc/httpd/conf/webapps.d/alcasar.conf && echo -n "7, "
[ -e /etc/httpd/conf/conf.d/ssl.conf.default ] && mv /etc/httpd/conf/conf.d/ssl.conf.default /etc/httpd/conf/conf.d/ssl.conf && echo -n "8, "
[ -e /usr/share/httpd/error/include/top.html.default ] && mv /usr/share/httpd/error/include/top.html.default /usr/share/httpd/error/include/top.html && echo -n "9, "
[ -e /usr/share/httpd/error/include/bottom.html.default ] && mv /usr/share/httpd/error/include/bottom.html.default /usr/share/httpd/error/include/top.html && echo -n "10, "
[ -e /etc/vnstat.conf.default ] && mv /etc/vnstat.conf.default /etc/vnstat.conf && echo -n "11, "
[ -e /var/www/html/acc/manager/stats/config.php.default ] && mv /var/www/html/acc/manager/stats/config.php.default /var/www/html/acc/manager/stats/config.php && echo -n "12"
 
[ -e /usr/share/httpd/error/include/bottom.html.default ] && mv /usr/share/httpd/error/include/bottom.html.default /usr/share/httpd/error/include/top.html && echo -n "10"
sleep 1
 
# CA
144,10 → 141,15
 
#nfsen
echo -en "\n- nfsen(2) : "
[ -e /lib/systemd/system/nfsen.service ] && rm -f /lib/systemd/system/nfsen.service && echo -n "1, "
[ -e /var/www/nfsen/plugins/SURFmap.php ] && rm -rf /var/www/nfsen/plugins/SURFmap* && echo -n "2"
[ -e /lib/systemd/system/nfsen.service ] && rm -f /lib/systemd/system/nfsen.service && echo -n "1, "
[ -e /var/www/nfsen/plugins/SURFmap.php ] && rm -rf /var/www/nfsen/plugins/SURFmap* && echo -n "2"
sleep 1
 
#vnstat
echo -en "\n- vnstat(1) : "
[ -e /etc/vnstat.conf.default ] && mv /etc/vnstat.conf.default /etc/vnstat.conf && echo -n "1"
sleep 1
 
#DnsMasq
echo -en "\n- dnsmasq(9) : "
if [ -e /lib/systemd/system/dnsmasq.service ]