Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1913 → Rev 1914

/scripts/alcasar-bl.sh
354,8 → 354,6
# reload when categories are changed
-reload | --reload)
# for DG
chown -R dansguardian:apache $DIR_DG_BL/ossi
chmod -R g+w $DIR_DG_BL/ossi
cat_choice
# for dnsmasq (rehabited domain names)
if [ `wc -w $DIR_DG/exceptionsitelist|cut -d " " -f1` != "0" ]
365,10 → 363,6
$SED "/$i/d" $DIR_DNS_BL/*
done
fi
cp -f $DIR_DG_BL/ossi/domains $DIR_DNS_BL/ossi.conf
$SED "s?.*?address=/&/$PRIVATE_IP?g" $DIR_DNS_BL/ossi.conf
$SED "s?.*?server=/&/$DNS1?g" $DIR_DNS_WL/ossi.conf
/usr/bin/systemctl restart dnsmasq-blacklist
/usr/bin/systemctl restart dnsmasq-whitelist
/usr/local/bin/alcasar-iptables.sh
/scripts/alcasar-conf.sh
78,16 → 78,17
# backup the logo
cp -f $DIR_WEB/images/organisme.png $DIR_UPDATE
# backup BL/WL custom files
cp -f /etc/dansguardian/lists/exceptioniplist $DIR_UPDATE/dansguardian/
cp -f /etc/dansguardian/lists/urlregexplist $DIR_UPDATE/dansguardian/
cp -f /etc/dansguardian/lists/exceptionsitelist $DIR_UPDATE/dansguardian/
cp -f /etc/dansguardian/lists/bannedsitelist $DIR_UPDATE/dansguardian/
cp -f /etc/dansguardian/lists/exceptionurllist $DIR_UPDATE/dansguardian/
cp -f /etc/dansguardian/lists/bannedurllist $DIR_UPDATE/dansguardian/
cp -f $DIR_SHARE/dnsmasq-bl/ossi.conf $DIR_UPDATE/dnsmasq-bl/ossi.conf
cp -f $DIR_SHARE/dnsmasq-wl/ossi.conf $DIR_UPDATE/dnsmasq-wl/ossi.conf
cp -f $DIR_SHARE/iptables-bl/ossi $DIR_UPDATE/iptables-bl/ossi
cp -f $DIR_SHARE/iptables-wl/ossi $DIR_UPDATE/iptables-wl/ossi
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 $DIR_SHARE/dnsmasq-bl/ossi.conf $DIR_UPDATE/custom_bl/ossi-dnsbl.conf
cp -f $DIR_SHARE/dnsmasq-wl/ossi.conf $DIR_UPDATE/custom_bl/ossi-dnswl.conf
cp -f $DIR_SHARE/iptables-bl/ossi $DIR_UPDATE/custom_bl/ossi-ipbl
cp -f $DIR_SHARE/iptables-wl/ossi $DIR_UPDATE/custom_bl/ossi-ipwl
# backup of different conf files (main conf file, filtering, digest, etc)
mkdir $DIR_UPDATE/etc/
cp -rf $DIR_ETC/* $DIR_UPDATE/etc/
125,21 → 126,19
chmod -R 750 /etc/pki
# Import of the users database
gzip -dc < `ls $DIR_UPDATE/alcasar-users-database*` | mysql -u$DB_USER -p$radiuspwd
# Retrieve local parameters &
# !!! for this version (2.9.2) we need to create new digest accounts and Remove blacklist files (now in /usr/local/share)
# !!! remove the first two lines for future versions
[ -d $DIR_UPDATE/etc ] && rm -rf $DIR_UPDATE/etc/alcasar-dnsfilter*
[ -d $DIR_UPDATE/etc ] && rm -f $DIR_UPDATE/etc/digest/*
 
# Retrieve local parameters
[ -d $DIR_UPDATE/etc ] && cp -rf $DIR_UPDATE/etc/* $DIR_ETC/
# Retrieve Dansguardian files
cp -f $DIR_UPDATE/exceptioniplist /etc/dansguardian/lists/
cp -f $DIR_UPDATE/exceptionsitelist /etc/dansguardian/lists/
cp -f $DIR_UPDATE/urlregexplist /etc/dansguardian/lists/
cp -f $DIR_UPDATE/bannedsitelist /etc/dansguardian/lists/
cp -f $DIR_UPDATE/exceptionurllist /etc/dansguardian/lists/
cp -f $DIR_UPDATE/bannedurllist /etc/dansguardian/lists/
cp -rf $DIR_UPDATE/ossi /etc/dansguardian/lists/blacklists/
# 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/ossi-dnsbl.conf $DIR_SHARE/dnsmasq-bl/ossi.conf
cp -f $DIR_UPDATE/custom_bl/ossi-dnswl.conf $DIR_SHARE/dnsmasq-wl/ossi.conf
cp -f $DIR_UPDATE/custom_bl/ossi-ipbl $DIR_SHARE/iptables-bl/ossi
cp -f $DIR_UPDATE/custom_bl/ossi-ipwl $DIR_SHARE/iptables-wl/ossi
chown -R dansguardian:apache /etc/dansguardian/lists
chmod -R g+rw /etc/dansguardian/lists
# Adapt DNS/URL filtering
161,13 → 160,6
else
/usr/bin/systemctl -q disable sshd.service
fi
# modifications added with this version (2.9.2)
# add "HOSTNAME=" in alcasar.conf
hostname_defined=`grep ^HOSTNAME= $CONF_FILE|wc -l`
if [ $hostname_defined = "0" ]
then
$SED "/^DOMAIN=/iHOSTNAME=alcasar" $CONF_FILE
fi
# Remove the update folder
rm -rf $DIR_UPDATE
;;
/scripts/alcasar-uninstall.sh
190,16 → 190,17
[ -e /lib/systemd/system/fail2ban.service.default ] && mv /lib/systemd/system/fail2ban.service.default /lib/systemd/system/fail2ban.service && echo -n "8"
sleep 1
 
echo -en "\n- cron(9) : "
echo -en "\n- cron(10) : "
[ -e /etc/crontab.default ] && mv /etc/crontab.default /etc/crontab && echo -n "1, "
[ -e /etc/anacrontab.default ] && mv /etc/anacrontab.default /etc/anacrontab && echo -n "2, "
[ -e /etc/cron.d/alcasar-mysql ] && rm -f /etc/cron.d/alcasar-mysql && echo -n "3, "
[ -e /etc/cron.d/alcasar-archive ] && rm -f /etc/cron.d/alcasar-archive && echo -n "4, "
[ -e /etc/cron.d/alcasar-clean_import ] && rm -f /etc/cron.d/alcasar-clean_import && echo -n "5, "
[ -e /etc/cron.d/alcasar-ticket-clean ] && rm -f /etc/cron.d/alcasar-ticket-clean && echo -n "5, "
[ -e /etc/cron.d/alcasar-distrib-updates ] && rm -f /etc/cron.d/alcasar-distrib-updates && echo -n "6, "
[ -e /etc/cron.d/freeradius-web ] && rm -f /etc/cron.d/freeradius-web && echo -n "7, "
[ -e /etc/cron.d/alcasar-connections-stats ] && rm -f /etc/cron.d/alcasar-connections-stats && echo -n "7, "
[ -e /etc/cron.d/alcasar-watchdog ] && rm -f /etc/cron.d/alcasar-watchdog && echo -n "8, "
[ -e /etc/cron.d/alcasar-daemon-watchdog ] && rm -f /etc/cron.d/alcasar-daemon-watchdog && echo -n "9"
[ -e /etc/cron.d/alcasar-daemon-watchdog ] && rm -f /etc/cron.d/alcasar-daemon-watchdog && echo -n "9,"
[ -e /etc/cron.d/alcasar-rsync-bl ] && rm -f /etc/cron.d/alcasar-rsync-bl && echo -n "10,"
 
sleep 1