Subversion Repositories ALCASAR

Rev

Rev 2175 | Go to most recent revision | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 2175 Rev 2454
1 
#!/bin/bash
 1 
#!/bin/bash
2 
 
 2 
 
3 
# alcasar-file-clean.sh
 3 
# alcasar-file-clean.sh
4 
# by Rexy
 4 
# by Rexy
5 
# This script is distributed under the Gnu General Public License (GPL)
 5 
# This script is distributed under the Gnu General Public License (GPL)
6 
 
 6 
 
7 
# clean alcasar conf files (remove empty lines, sort and control)
 7 
# clean alcasar conf files (remove empty lines, sort and control)
8 
# nettoie les fichiers de conf d'alcasar (suppression des lignes vides, tri et contrôle)
 8 
# nettoie les fichiers de conf d'alcasar (suppression des lignes vides, tri et contrôle)
9 
 
 9 
 
10 
SED="/bin/sed -i"
 10 
SED="/bin/sed -i"
11 
DIR_CONF="/usr/local/etc"
 11 
DIR_CONF="/usr/local/etc"
12 
ALCASAR_SERVICES="$DIR_CONF/alcasar-services"
 12 
ALCASAR_SERVICES="$DIR_CONF/alcasar-services"
13 
ALCASAR_IP_BLOCKED="$DIR_CONF/alcasar-ip-blocked"
 13 
ALCASAR_IP_BLOCKED="$DIR_CONF/alcasar-ip-blocked"
14 
ALCASAR_UAMDOMAIN="$DIR_CONF/alcasar-uamdomain"
 14 
ALCASAR_UAMDOMAIN="$DIR_CONF/alcasar-uamdomain"
15 
ALCASAR_UAMALLOWED="$DIR_CONF/alcasar-uamallowed"
 15 
ALCASAR_UAMALLOWED="$DIR_CONF/alcasar-uamallowed"
16 
ALCASAR_CONF="$DIR_CONF/alcasar.conf"
 16 
ALCASAR_CONF="$DIR_CONF/alcasar.conf"
17 
 
 17 
 
18 
# sort file content
 18 
# sort file content
19 
for file in $ALCASAR_SERVICES $ALCASAR_IP_BLOCKED $ALCASAR_UAMDOMAIN $ALCASAR_UAMALLOWED
 19 
for file in $ALCASAR_SERVICES $ALCASAR_IP_BLOCKED $ALCASAR_UAMDOMAIN $ALCASAR_UAMALLOWED
20 
do
 20 
do
21 
	sort -k2n $file > /tmp/alcasar-tmp-sort
 21 
	sort -k2n $file > /tmp/alcasar-tmp-sort
22 
	mv -f /tmp/alcasar-tmp-sort $file
 22 
	mv -f /tmp/alcasar-tmp-sort $file
23 
done
 23 
done
24 
 
 24 
 
25 
# remove empty lines and put rights
 25 
# remove empty lines and put rights
26 
for file in $ALCASAR_SERVICES $ALCASAR_IP_BLOCKED $ALCASAR_CONF $ALCASAR_UAMDOMAIN $ALCASAR_UAMALLOWED
 26 
for file in $ALCASAR_SERVICES $ALCASAR_IP_BLOCKED $ALCASAR_CONF $ALCASAR_UAMDOMAIN $ALCASAR_UAMALLOWED
27 
do
 27 
do
28 
	$SED "/^$/d" $file
28 
	$SED "/^$/d" $file
29 
	chown root:apache $file
 29 
	chown root:apache $file
30 
	chmod 660 $file
 30 
	chmod 660 $file
31 
done
 31 
done
32 
 
 32 
 
33 
#update dnsmasq-blackhole with uamallowed domains ($ALCASAR_UAMDOMAIN)
 33 
#update dnsmasq-blackhole with uamallowed domains ($ALCASAR_UAMDOMAIN)
34 
#remove old configuration
 34 
#remove old configuration
35 
sed -i '/^server=/d' /etc/dnsmasq-blackhole.conf
 35 
sed -i '/^server=/d' /etc/dnsmasq-blackhole.conf
36 
 
 36 
 
37 
for domain in $(cat $ALCASAR_UAMDOMAIN | cut -d' ' -f1)
 37 
for domain in $(cat $ALCASAR_UAMDOMAIN | cut -d' ' -f1)
38 
do
 38 
do
39 
        domain_exception="server=/$(echo $domain | cut -d'"' -f2)/#"
 39 
	domain_exception="server=/$(echo $domain | cut -d'"' -f2)/#"
40 
        sed -i "/conf-file/a$domain_exception" /etc/dnsmasq-blackhole.conf
 40 
	sed -i "/conf-file/a$domain_exception" /etc/dnsmasq-blackhole.conf
41 
done
 41 
done
42 
if [ "$PARENT_SCRIPT" != "alcasar.sh" ] # don't restart on install stage
 42 
if [ "$PARENT_SCRIPT" != "alcasar.sh" ] # don't restart on install stage
43 
then
 43 
then
44 
	systemctl restart dnsmasq-blackhole
 44 
	systemctl restart dnsmasq-blackhole
45 
fi
 - 
 
46 
 
 45 
fi
- 
 
 46 
 
47 
Generated by GNU Enscript 1.6.6.
 - 
 
48 
 
 - 
 
49 
 
 - 
 
50 
 
 -