| 588,7 → 588,7 |
|---|
| echo "DOMAIN=$DOMAIN" >> $CONF_FILE |
| echo "EXTIF=$EXTIF" >> $CONF_FILE |
| echo "INTIF=$INTIF" >> $CONF_FILE |
| ######## Récupération des interfaces du ou des réseaux de consultation supplémentaires ################# |
| # Retrieve NIC name of other consultation LAN |
| INTERFACES=`/usr/sbin/ip link|grep '^[[:digit:]]:'|grep -v "^lo\|$EXTIF\|tun0"|cut -d " " -f2|tr -d ":"` |
| for i in $INTERFACES |
| do |
| 604,7 → 604,6 |
|---|
| elif [ -n "$LANIF" ] |
| then echo "LANIF=$LANIF" >> $CONF_FILE |
| fi |
| ######################################################################################################### |
| IP_SETTING=`grep BOOTPROTO /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2` # test static or dynamic |
| if [ $IP_SETTING == "dhcp" ] |
| then |
| 733,7 → 732,6 |
|---|
| USERCTL=no |
| EOF |
| fi |
| ######################################################################################################### |
| # write hosts.allow & hosts.deny |
| [ -e /etc/hosts.allow.default ] || cp /etc/hosts.allow /etc/hosts.allow.default |
| cat <<EOF > /etc/hosts.allow |
| 787,10 → 785,11 |
|---|
| # Copy & adapt ACC files |
| cp -rf $DIR_INSTALL/web/* $DIR_WEB/ |
| $SED "s?99/99/9999?$DATE_SHORT?g" $DIR_ACC/menu.php |
| $SED "s?\$DB_RADIUS = .*?\$DB_RADIUS = \"$DB_RADIUS\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| $SED "s?\$DB_USER = .*?\$DB_USER = \"$DB_USER\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| $SED "s?\$radiuspwd = .*?\$radiuspwd = \"$radiuspwd\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| chmod 640 $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| # Waiting for new phpsysinfo special page |
| #$SED "s?\$DB_RADIUS = .*?\$DB_RADIUS = \"$DB_RADIUS\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| #$SED "s?\$DB_USER = .*?\$DB_USER = \"$DB_USER\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| #$SED "s?\$radiuspwd = .*?\$radiuspwd = \"$radiuspwd\"\;?g" $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| #chmod 640 $DIR_ACC/phpsysinfo/includes/xml/portail.php |
| chown -R apache:apache $DIR_WEB/* |
| # copy & adapt "freeradius-web" files |
| cp -rf $DIR_CONF/freeradius-web/ /etc/ |
| 1058,6 → 1057,7 |
|---|
| /usr/bin/systemctl daemon-reload |
| # Allow apache to change some conf files (ie : ldap on/off) |
| chgrp apache /etc/raddb /etc/raddb/sites-available /etc/raddb/mods-available |
| chmod 750 /etc/raddb /etc/raddb/sites-available /etc/raddb/mods-available |
| } # End of freeradius() |
| |
| ############################################################################# |
| 1840,10 → 1840,7 |
|---|
| touch $DIR_DG/lists/blacklists/ossi-wl/domains |
| echo "ossi-wl" >> $DIR_DEST_ETC/alcasar-wl-categories-enabled |
| # add additional BL files |
| # download C&C BL, install it and enable it by default |
| $DIR_DEST_BIN/alcasar-bl.sh --install_ossi_candc |
| # copy all other additional BL |
| for x in $(ls $DIR_BLACKLIST | grep -v "^blacklist") |
| for x in $(ls $DIR_BLACKLIST | grep -v "^blacklists") |
| do |
| mkdir $DIR_DG/lists/blacklists/ossi-bl-$x |
| cp $DIR_BLACKLIST/$x $DIR_DG/lists/blacklists/ossi-bl-$x/domains |
| 2191,6 → 2188,7 |
|---|
| echo "BL_PUREIP=on" >> $CONF_FILE |
| echo "BL_SAFESEARCH=off" >> $CONF_FILE |
| echo "WL_SAFESEARCH=off" >> $CONF_FILE |
| echo "IOT_CAPTURE=off" >> $CONF_FILE |
| # Prompt customisation (colors) |
| [ -e /etc/bashrc.default ] || cp /etc/bashrc /etc/bashrc.default |
| cp -f $DIR_CONF/bashrc /etc/. ; chmod 644 /etc/bashrc ; chown root:root /etc/bashrc |