| 18,9 → 18,10 |
|---|
| fichier="alcasar-conf-$new.tar.gz" # nom du fichier de sauvegarde |
| DIR_UPDATE="/tmp/conf" # répertoire de stockage des fichier de conf pour une mise à jour |
| DIR_WEB="/var/www/html" # répertoire du centre de gestion |
| DIR_BIN="/usr/local/bin" # répertoire des scripts d'admin |
| DIR_ETC="/usr/local/etc" # répertoire des fichiers de conf |
| DIR_BLACKLIST="/etc/dansguardian/lists/blacklists" # répertoire de la BL de Toulouse |
| DIR_BIN="/usr/local/bin" # scripts directory |
| DIR_ETC="/usr/local/etc" # conf directory |
| DIR_SHARE="/usr/local/share" # data directory |
| DIR_BLACKLIST="/etc/dansguardian/lists/blacklists" # Toulouse BL directory |
| CONF_FILE="$DIR_ETC/alcasar.conf" # main alcasar conf file |
| VERSION="/var/www/html/VERSION" # contient la version en cours |
| EXTIF=`grep ^EXTIF= $CONF_FILE|cut -d"=" -f2` # EXTernal InterFace |
| 38,6 → 39,7 |
|---|
| MIN_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f2|cut -c1` |
| UPD_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f3` |
| DOMAIN=`grep DOMAIN $CONF_FILE|cut -d"=" -f2` 2>/dev/null |
| DNS1=`grep "DNS1" $CONF_FILE | cut -d '=' -f 2` # server DNS1 (for WL domain names) |
| DOMAIN=${DOMAIN:=localdomain} |
| DATE=`date '+%d %B %Y - %Hh%M'` |
| private_network_calc () |
| 306,7 → 308,7 |
|---|
| FIC_MOD_SSL=`find /etc/httpd/conf/ -type f -name ssl.conf` |
| $SED "s?^Listen.*?Listen $PRIVATE_IP:443?g" $FIC_MOD_SSL |
| $SED "/127.0.0.1/!s?Allow from .*?Allow from $PRIVATE_NETWORK_MASK?g" /etc/httpd/conf/webapps.d/alcasar.conf |
| # Dialup_Admin |
| # ACC |
| $SED "s?^nas1_name:.*?nas1_name: alcasar-$ORGANISME?g" /etc/freeradius-web/naslist.conf |
| $SED "s?^nas1_ip:.*?nas1_ip: $PRIVATE_IP?g" /etc/freeradius-web/naslist.conf |
| # coova |
| 324,8 → 326,17 |
|---|
| echo "server=$DNS1" >> $i |
| echo "server=$DNS2" >> $i |
| done |
| $SED "s?^address=.*?address=/#/$PRIVATE_IP?g" /etc/dnsmasq-blackhole.conf |
| for i in `ls $DIR_SHARE/dnsmasq-wl` |
| do |
| cat $DIR_SHARE/dnsmasq-wl/$i|cut -d"/" -f1,2 > /tmp/tmp_file |
| $SED "s/$/\/$DNS1/" /tmp/tmp_file |
| mv -f /tmp/tmp_file $DIR_SHARE/dnsmasq-wl/$i |
| done |
| chown root:apache $DIR_SHARE/dnsmasq-wl/* |
| chmod 660 $DIR_SHARE/dnsmasq-wl/* |
| $SED "s?^dhcp-option=option:router.*?dhcp-option=option:router,$PRIVATE_IP?g" /etc/dnsmasq.conf |
| $SED "s?^dhcp-range=.*?dhcp-range=$PRIVATE_SECOND_IP,$PRIVATE_LAST_IP,$PRIVATE_NETMASK,12h?g" /etc/dnsmasq.conf |
| $SED "s?^dhcp-option=option:router.*?dhcp-option=option:router,$PRIVATE_IP?g" /etc/dnsmasq.conf |
| # tinyproxy |
| $SED "s?^Listen.*?Listen $PRIVATE_IP?g" /etc/tinyproxy/tinyproxy.conf |
| # DG + BL |