Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 841 → Rev 842

/alcasar.sh
1258,8 → 1258,6
# on copie par défaut la BL de toulouse embarqués dans l'archive d'ALCASAR
rm -rf $DIR_DG/lists/blacklists
tar zxf $DIR_CONF/blacklists.tar.gz --directory=$DIR_DG/lists/ > /dev/null 2>&1
cp -f $DIR_CONF/VERSION-BL $DIR_ACC/
chown apache:apache $DIR_ACC/VERSION-BL
# on crée le répertoire de la BL secondaire et le répertoire "pureip" (catégorie virtuelle)
mkdir $DIR_DG/lists/blacklists/ossi $DIR_DG/lists/blacklists/ip
touch $DIR_DG/lists/blacklists/ossi/domains $DIR_DG/lists/blacklists/ip/domains
/conf/VERSION-BL
File deleted
/CHANGELOG
9,7 → 9,8
- all "alcasar.info" becomes "alcasar.net" in code
- change the order of http chain (DG --> squid --> HAVP --> Internet) more réactivity and less charge of CPU
News
- The IP addresses in the consultation network are dynamicly allocated. Static ip can be reserved in the Alcasar Control Center
- Exceptions of authentication are now managed by Radius (like other users)
---------------------- 2.5 --------------------
Bugs
- watchdog of Daemons for service's test
/scripts/sbin/alcasar-bl.sh
152,8 → 152,6
chmod -R g+w $DIR_DG
rm -rf /tmp/con_ok.html
fi
DATE=`date '+%d %B %Y - %Hh%M'`
echo "Univ-tlse du $DATE " > /var/www/html/VERSION-BL
;;
# Adaptation de la BL à notre structure 'dnsmasq + DG)
-adapt | --adapt)
/web/acc/admin/dns_filter2.php
27,7 → 27,7
<input type='hidden' name='choix' value='MAJ_bl'>
<?php
echo "<center>$l_bl_version";
echo_file ("/var/www/html/VERSION-BL");
echo date ("F d Y", filemtime ('/etc/dansguardian/lists/blacklists/README'));
echo "</center><BR>";
echo "<input type='submit' value='$l_download'>";
echo " ($l_warning)";
/web/acc/phpsysinfo/includes/xml/portail.php
29,7 → 29,7
$host = "localhost";
$DB_USER = "radius";
$DB_RADIUS = "radius";
$radiuspwd = "";
$radiuspwd = "rLTtoXGJ";
// Connexion au serveur
mysql_connect($host, $DB_USER,$radiuspwd) or die("erreur de connexion au serveur");
mysql_select_db($DB_RADIUS) or die("erreur de connexion a la base de donnees");
104,10 → 104,7
$handle = fopen ($file_version, "r");
$INSTALLEDVERSION = fread ($handle, filesize ($file_version));
fclose ($handle);
$file_bl = "/var/www/html/VERSION-BL";
$handle = fopen ($file_bl, "r");
$VERSIONBL = fread ($handle, filesize ($file_bl));
fclose ($handle);
$VERSIONBL = date ("F d Y", filemtime ('/etc/dansguardian/lists/blacklists/README'));
$nbr_user = request ('user');
$nbr_grp = request ('group');
$nbr_user_online = exec ("sudo /usr/sbin/chilli_query list | cut -d\" \" -f5 | grep \"1\" | wc -l");