21,7 → 21,7 |
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 |
DIR_BLACKLIST="/etc/e2guardian/lists/blacklists" # Toulouse BL directory |
CONF_FILE="$DIR_ETC/alcasar.conf" # main alcasar conf file |
EXTIF=`grep ^EXTIF= $CONF_FILE|cut -d"=" -f2` # EXTernal InterFace |
INTIF=`grep ^INTIF= $CONF_FILE|cut -d"=" -f2` # INTernal InterFace |
87,12 → 87,12 |
cp -f $DIR_WEB/images/organisme.png $DIR_UPDATE |
# backup BL/WL custom files |
mkdir $DIR_UPDATE/custom_bl |
cp -f /etc/dansguardian/lists/exceptioniplist $DIR_UPDATE/custom_bl/ |
cp -f /etc/dansguardian/lists/urlregexplist $DIR_UPDATE/custom_bl/ |
cp -f /etc/dansguardian/lists/exceptionsitelist $DIR_UPDATE/custom_bl/ |
cp -f /etc/dansguardian/lists/bannedsitelist $DIR_UPDATE/custom_bl/ |
cp -f /etc/dansguardian/lists/exceptionurllist $DIR_UPDATE/custom_bl/ |
cp -f /etc/dansguardian/lists/bannedurllist $DIR_UPDATE/custom_bl/ |
cp -f /etc/e2guardian/lists/exceptioniplist $DIR_UPDATE/custom_bl/ |
cp -f /etc/e2guardian/lists/urlregexplist $DIR_UPDATE/custom_bl/ |
cp -f /etc/e2guardian/lists/exceptionsitelist $DIR_UPDATE/custom_bl/ |
cp -f /etc/e2guardian/lists/bannedsitelist $DIR_UPDATE/custom_bl/ |
cp -f /etc/e2guardian/lists/exceptionurllist $DIR_UPDATE/custom_bl/ |
cp -f /etc/e2guardian/lists/bannedurllist $DIR_UPDATE/custom_bl/ |
cp -rf $DIR_BLACKLIST/ossi-* $DIR_UPDATE/custom_bl/ 2>/dev/null |
# backup of different conf files (main conf file, filtering, digest, etc) |
mkdir $DIR_UPDATE/etc/ |
134,15 → 134,15 |
# Retrieve local parameters |
[ -d $DIR_UPDATE/etc ] && cp -rf $DIR_UPDATE/etc/* $DIR_ETC/ |
# Retrieve BL/WL custom files |
cp -f $DIR_UPDATE/custom_bl/exceptioniplist /etc/dansguardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/exceptionsitelist /etc/dansguardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/urlregexplist /etc/dansguardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/bannedsitelist /etc/dansguardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/exceptionurllist /etc/dansguardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/bannedurllist /etc/dansguardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/exceptioniplist /etc/e2guardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/exceptionsitelist /etc/e2guardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/urlregexplist /etc/e2guardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/bannedsitelist /etc/e2guardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/exceptionurllist /etc/e2guardian/lists/ |
cp -f $DIR_UPDATE/custom_bl/bannedurllist /etc/e2guardian/lists/ |
cp -rf $DIR_UPDATE/custom_bl/ossi-* $DIR_BLACKLIST/ 2>/dev/null |
chown -R dansguardian:apache /etc/dansguardian/lists |
chmod -R g+rw /etc/dansguardian/lists |
chown -R e2guardian:apache /etc/e2guardian/lists |
chmod -R g+rw /etc/e2guardian/lists |
# Adapt DNS/URL filtering |
PARENT_SCRIPT=`basename $0` |
export PARENT_SCRIPT |
360,7 → 360,7 |
# tinyproxy |
$SED "s?^Listen.*?Listen $PRIVATE_IP?g" /etc/tinyproxy/tinyproxy.conf |
# DG + BL |
$SED "s?^filterip.*?filterip = $PRIVATE_IP?g" /etc/dansguardian/dansguardian.conf |
$SED "s?^filterip.*?filterip = $PRIVATE_IP?g" /etc/e2guardian/e2guardian.conf |
# Watchdog |
$SED "s?^PRIVATE_IP=.*?PRIVATE_IP=\"$PRIVATE_IP\"?g" $DIR_BIN/alcasar-watchdog.sh |
# Prompts |