Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1369 → Rev 1370

/alcasar.sh
880,9 → 880,25
##################################################################################
param_chilli ()
{
# chilli unit for systemd
cat << EOF > /lib/systemd/system/chilli.service
[Unit]
Description=chilli is a captive portal daemon
After=network.target
 
[Service]
Type=forking
ExecStart=/usr/libexec/chilli start
ExecStop=/usr/libexec/chilli stop
ExecReload=/usr/libexec/chilli reload
PIDFile=/var/run/chilli.pid
 
[Install]
WantedBy=multi-user.target
EOF
# init file creation
[ -e /etc/init.d/chilli.default ] || cp /etc/init.d/chilli /etc/init.d/chilli.default
cat <<EOF > /etc/init.d/chilli
[ -e /etc/init.d/chilli.default ] || mv /etc/init.d/chilli /etc/init.d/chilli.default
cat <<EOF > /usr/libexec/chilli
#!/bin/sh
#
# chilli CoovaChilli init
1331,9 → 1347,10
$SED "s?safe=vss?safe=strict?g" $DIR_DG/lists/urlregexplist
chown -R dansguardian:apache $DIR_DG
chmod -R g+rw $DIR_DG
# On adapte la BL de Toulouse à notre structure
# adapt the BL to ALCASAR architecture. Enable the default categories
if [ "$mode" != "update" ]; then
$DIR_DEST_SBIN/alcasar-bl.sh --adapt
$DIR_DEST_SBIN/alcasar-bl.sh --cat_choice
fi
}
 
/scripts/alcasar-iptables.sh
412,7 → 412,7
$IPTABLES -A POSTROUTING -t nat -o $EXTIF -j MASQUERADE
 
# Save all rules
/etc/init.d/iptables save
/usr/libexec/iptables.init save
 
# End of script
 
/scripts/sbin/alcasar-bl.sh
39,7 → 39,6
function cat_choice (){
# saving ip files and ossi category
mkdir $DIR_tmp
cp $DIR_IP_BL_ENABLED/ossi-* $DIR_tmp
cp $DIR_IP_BL/ossi $DIR_tmp
rm -rf $DIR_DNS_BL_ENABLED $DIR_DNS_WL_ENABLED $DIR_IP_BL_ENABLED # cleaning for dnsmasq and iptables
$SED "/\.Include/d" $DIR_DG/bannedsitelist $DIR_DG/bannedurllist # cleaning for DG
69,8 → 68,7
mv $FILE_tmp $WL_CATEGORIES
# restoring ip files and ossi category
mv $DIR_tmp/ossi $DIR_IP_BL
chown apache $DIR_IP_BL/ossi
mv $DIR_tmp/ossi-* $DIR_IP_BL_ENABLED
chown apache $DIR_IP_BL/*
rm -rf $DIR_tmp
}
function bl_enable (){