| /alcasar.sh |
|---|
| 187,14 → 187,14 |
| if [ $Lang == "fr" ] |
| then |
| echo "La mise à jour automatique d'ALCASAR ne peut pas être réalisée." |
| echo "1 - Récupérez le fichier de configuration actuel (/tmp/alcasar-conf.tar.gz)." |
| echo "2 - Installez Linux-Mageia 5 (cf. doc d'installation)" |
| echo "3 - recopiez le fichier 'alcasar-conf.tar.gz' dans le répertoire '/tmp' avant de lancer l'installation d'ALCASAR" |
| echo "1 - Effectuez une sauvegarde des fichiers de traçabilité et de la base des usagers via l'ACC" |
| echo "2 - Installez Linux-Mageia 5 et ALCASAR (cf. doc d'installation)" |
| echo "3 - Importez votre base des usagers" |
| else |
| echo "The automatic update of ALCASAR can't be performed." |
| echo "1 - Retrieve the configuration file (/tmp/alcasar-conf.tar.gz)" |
| echo "2 - Install Linux-Mageia 5 (cf. installation doc)" |
| echo "3 - Copy again the file 'alcasar-conf.tar.gz' in the folder '/tmp' before launching the installation of ALCASAR" |
| echo "1 - Save your traceability files and the user database" |
| echo "2 - Install Linux-Mageia 5 & ALCASAR (cf. installation doc)" |
| echo "3 - Import your users database" |
| fi |
| else |
| if [ $Lang == "fr" ] |
| 1492,6 → 1492,7 |
| [ -d /var/log/dnsmasq ] || mkdir /var/log/dnsmasq |
| [ -e /etc/sysconfig/dnsmasq.default ] || cp /etc/sysconfig/dnsmasq /etc/sysconfig/dnsmasq.default |
| $SED "s?^OPTION=.*?OPTION=-C /etc/dnsmasq.conf?g" /etc/sysconfig/dnsmasq # default conf file for the first dnsmasq instance |
| $SED "s?^local=.*?local=/$DOMAIN/?g" $DIR_DEST_ETC/alcasar-dns-name # default domain name for all dnsmasq daemons |
| [ -e /etc/dnsmasq.conf.default ] || cp /etc/dnsmasq.conf /etc/dnsmasq.conf.default |
| # 1st dnsmasq listen on udp 53 ("dnsmasq - forward"). It's used as dhcp server only if "alcasar-bypass" is on. |
| cat << EOF > /etc/dnsmasq.conf |
| 1505,7 → 1506,6 |
| no-dhcp-interface=lo |
| bind-interfaces |
| cache-size=2048 |
| domain=$DOMAIN |
| domain-needed |
| expand-hosts |
| bogus-priv |
| 1516,6 → 1516,7 |
| #dhcp-range=$PRIVATE_FIRST_IP,$PRIVATE_LAST_IP,$PRIVATE_NETMASK,12h |
| #dhcp-option=option:router,$PRIVATE_IP |
| #dhcp-option=option:ntp-server,$PRIVATE_IP |
| #domain=$DOMAIN |
| # Exemple of static dhcp assignation : <@MAC>,<name>,<@IP>,<MASK>,<ttl bail> |
| #dhcp-host=11:22:33:44:55:66,ssic-test,192.168.182.20,255.255.255.0,45m |
| 1534,7 → 1535,6 |
| no-dhcp-interface=lo |
| bind-interfaces |
| cache-size=2048 |
| domain=$DOMAIN |
| domain-needed |
| expand-hosts |
| bogus-priv |
| 1556,7 → 1556,6 |
| no-dhcp-interface=lo |
| bind-interfaces |
| cache-size=1024 |
| domain=$DOMAIN |
| domain-needed |
| expand-hosts |
| bogus-priv |
| 1577,7 → 1576,6 |
| no-dhcp-interface=lo |
| bind-interfaces |
| cache-size=256 |
| domain=$DOMAIN |
| domain-needed |
| expand-hosts |
| bogus-priv |
| /scripts/alcasar-certificates.sh |
|---|
| File deleted |
| Property changes: |
| Deleted: svn:eol-style |
| -LF |
| \ No newline at end of property |
| Deleted: svn:executable |
| -* |
| \ No newline at end of property |
| /scripts/alcasar-conf.sh |
|---|
| 89,7 → 89,7 |
| 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 -rf $DIR_BLACKLIST/ossi-* $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/ |
| cp -rf $DIR_ETC/* $DIR_UPDATE/etc/ |
| 136,7 → 136,7 |
| 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 -rf $DIR_UPDATE/custom_bl/ossi-* $DIR_BLACKLIST/ |
| 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 |
| # Adapt DNS/URL filtering |
| /scripts/alcasar-importcert.sh |
|---|
| 33,7 → 33,7 |
| $SED "s/alcasar\.([a-zA-Z0-9-]+(\.[a-z]{2,4})?)/alcasar.localdomain/g" /etc/chilli.conf |
| $SED "s/^domain.*/domain\t\tlocaldomain/g" /etc/chilli.conf |
| $SED "s/^ServerName.*/ServerName alcasar.localdomain/g" /etc/httpd/conf/httpd.conf |
| $SED "s/^domain=.*/domain=localdomain/g" /etc/dnsmasq.conf /etc/dnsmasq-blackhole.conf /etc/dnsmasq-blacklist.conf /etc/dnsmasq-whitelist.conf |
| $SED "s/^domain=.*/domain=localdomain/g" /etc/dnsmasq.conf |
| hostnamectl set-hostname alcasar.localdomain |
| $SED "s/^\tErrorDocument.*/\tErrorDocument 404 https:\/\/alcasar.localdomain\//g" /etc/httpd/conf/webapps.d/alcasar.conf |
| $SED "s/^\tAuthDigestDomain.*/\tAuthDigestDomain alcasar.localdomain/g" /etc/httpd/conf/webapps.d/alcasar.conf |
| 76,13 → 76,11 |
| 127.0.0.1 localhost |
| $PRIVATE_IP $fqdn $hostname |
| EOF |
| $SED "s/^domain.*/domain\t\t$domain/g" /etc/chilli.conf |
| $SED "s/^locationname.*/locationname\t$fqdn/g" /etc/chilli.conf |
| $SED "s/^uamserver.*/uamserver\thttps:\/\/$fqdn\/intercept.php/g" /etc/chilli.conf |
| $SED "s/^radiusnasid.*/radiusnasid\t$fqdn/g" /etc/chilli.conf |
| $SED "s/^uamallowed.*/uamallowed\t$hostname,$fqdn/g" /etc/chilli.conf |
| $SED "s/^ServerName.*/ServerName $fqdn/g" /etc/httpd/conf/httpd.conf |
| $SED "s/^domain=.*/domain=$domain/g" /etc/dnsmasq.conf /etc/dnsmasq-blackhole.conf /etc/dnsmasq-blacklist.conf /etc/dnsmasq-whitelist.conf |
| hostnamectl set-hostname $fqdn |
| $SED "s/^\tErrorDocument.*/\tErrorDocument 404 https:\/\/$fqdn\//g" /etc/httpd/conf/webapps.d/alcasar.conf |
| $SED "s/^\tAuthDigestDomain.*/\tAuthDigestDomain $fqdn/g" /etc/httpd/conf/webapps.d/alcasar.conf |