Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 1582 → Rev 1583

/scripts/alcasar-archive.sh
62,9 → 62,9
if [ $nb_files -ne 0 ]; then
mv $(echo $(ls -rt $DIR_LOG/firewall/traceability.log*.gz | tail -n 1 -)) $DIR_TMP/traceability-HTTP-$NOW.gz
fi
nb_files=`ls $DIR_BASE/radius-*.sql 2>/dev/null | wc -w`
nb_files=`ls $DIR_BASE/alcasar-users-database-*.sql.gz 2>/dev/null | wc -w`
if [ $nb_files -ne 0 ]; then
mv $(echo $(ls -rt $DIR_BASE/radius-*.sql | tail -n 1 -)) $DIR_TMP/
mv $(echo $(ls -rt $DIR_BASE/alcasar-users-database-*.sql.gz | tail -n 1 -)) $DIR_TMP/
fi
cd /var/log/nfsen/profiles-data/live/alcasar_netflow
nb_files=`find . -mtime -7 -name 'nfcapd.[0-9]*' | wc -l`
120,7 → 120,7
cd /var/log/nfsen/profiles-data/live/alcasar_netflow
find . -mtime -$gap -name 'nfcapd.[0-9]*' | xargs tar -cf /tmp/live/traceability-ALL-$NOW.tar;
/usr/local/sbin/alcasar-mysql.sh --dump
mv $(echo $(ls -rt $DIR_BASE/radius-*.sql | tail -n 1 -)) /tmp/live/
mv $(echo $(ls -rt $DIR_BASE/alcasar-users-database-*.sql.gz | tail -n 1 -)) /tmp/live/
cp /var/log/firewall/traceability.log /tmp/live/traceability-HTTP-$NOW.log
tar -czf $DIR_ARCHIVE/traceability-$NOW.tar.gz /tmp/live/*
rm -rf /tmp/live
/scripts/alcasar-conf.sh
208,9 → 208,7
then
$DIR_SBIN/alcasar-dhcp.sh --off
fi
# Logout everybody
$DIR_SBIN/alcasar-logout.sh all
# Services stop
$DIR_SBIN/alcasar-logout.sh all
echo -n "Stop services : "
for i in ntpd httpd tinyproxy dnsmasq dnsmasq-whitelist dnsmasq-blacklist chilli network
do
220,11 → 218,7
fi
 
# /etc/hosts
cat <<EOF > /etc/hosts
127.0.0.1 localhost
$PRIVATE_IP $HOSTNAME $HOSTNAME.$DOMAIN
EOF
 
$SED "/alcasar/s?.*?$PRIVATE_IP\talcasar alcasar.localdomain?g" /etc/hosts
# EXTIF config
$SED "s?^IPADDR=.*?IPADDR=$PUBLIC_IP?" /etc/sysconfig/network-scripts/ifcfg-$EXTIF
$SED "s?^NETMASK=.*?NETMASK=$PUBLIC_NETMASK?" /etc/sysconfig/network-scripts/ifcfg-$EXTIF
/scripts/sbin/alcasar-mysql.sh
14,7 → 14,7
DB_USER="radius"
radiuspwd="MotdePasse" # Mot de passe adapté à l'install
new="$(date +%G%m%d-%Hh%M)" # date et heure des fichiers
fichier="$DB_RADIUS-$new.$ext" # nom du fichier de sauvegarde
fichier="alcasar-users-database-$new.$ext" # nom du fichier de sauvegarde
 
 
stop_acct ()
28,7 → 28,7
mysqlcheck --databases $DB_RADIUS -u $DB_USER -p$radiuspwd --auto-repair
}
 
expire_user ()
expire_user () # remove users whom expiration date has passed to 7 days
{
del_date=`date +%F`
MYSQL_USER=""
45,7 → 45,7
done
}
 
expire_group ()
expire_group () # remove users of group whom expiration date has passed to 7 days
{
del_date=`date +%F`
MYSQL_GROUP=""
95,6 → 95,7
check
echo "Export the database in file : $fichier"
mysqldump -u $DB_USER -p$radiuspwd --opt -BcQC $DB_RADIUS > $rep_tr/$fichier
gzip $rep_tr/$fichier
echo "End of export $( date "+%Hh %Mmn" )"
;;
-c | --check | -check)
103,7 → 104,7
-i | --import | -import)
if [ $nb_args -ne 2 ]
then
echo "Enter a SQL file name (.sql)"
echo "Enter a SQL file name ('.sql' or '.sql.gz')"
exit 0
else
mysql -u $DB_USER -p$radiuspwd < $2
111,7 → 112,8
fi
;;
-r | --raz | -raz)
mysqldump -u $DB_USER -p$radiuspwd --opt -BcQC $DB_RADIUS > $rep_tr/$fichier && \
mysqldump -u $DB_USER -p$radiuspwd --opt -BcQC $DB_RADIUS > $rep_tr/$fichier
gzip $rep_tr/$fichier
mysql -u$DB_USER -p$radiuspwd $DB_RADIUS < /etc/raddb/radiusd-db-vierge.sql
;;
-a | --acct_stop | -acct_stop)
/web/acc/manager/htdocs/import_user.php
13,20 → 13,21
$Langue = explode(",",$_SERVER['HTTP_ACCEPT_LANGUAGE']);
$Language = strtolower(substr(chop($Langue[0]),0,2)); }
if($Language == 'fr'){
$l_title = "Import d'usagers";
$l_database_state = "&Eacute;tat actuel de la base : nombre de groupes =";
$l_title = "Importer et vider la base des usagers";
$l_database_state = "état actuel de la base : nombre de groupes =";
$l_number_of_users = "Nombre d'usagers";
$l_text_import = "Importer &agrave; partir d'un fichier texte ('.txt')";
$l_text_import_help = "Ce fichier ne doit contenir que des noms d'usagers &eacute;crits les uns sous les autres.";
$l_text_import = "Importer à partir d'un fichier texte";
$l_text_import_help = "Ce fichier ne doit contenir que des noms d'usagers écrits les uns sous les autres.";
$l_file = "Fichier";
$l_users_group = "D&eacute;finissez leur groupe (conseill&eacute;)";
$l_send = "Envoyer";
$l_users_group = "Définissez leur groupe (conseillé)";
$l_send = "Importer";
$l_empty = "Vider";
$l_imported_files = "Fichiers des identifiants/mot_de_passe import&eacute;s durant les derni&egrave;res 24h :";
$l_db_import = "Importer &agrave; partir d'une sauvegarde de la base d'usagers (format SQL)";
$l_db_import_help = "Afin de pouvoir imputer les derni&egrave;res traces de connexion, une sauvegarde de la base actuelle sera automatiquement r&eacute;alis&eacute;e.";
$l_db_reset = "Remise &agrave; z&eacute;ro de la base usagers";
$l_error_ext_txt = "Erreur! Veuillez s&eacute;lectionner un fichier avec l'extension '.csv' ou '.txt'";
$l_error_ext_sql = "Erreur! Veuillez s&eacute;lectionner un fichier avec l'extension '.sql'";
$l_db_import = "Importer à partir d'une sauvegarde de la base d'usagers";
$l_db_import_help = "Afin de pouvoir imputer les dernières traces de connexion, une sauvegarde de la base actuelle sera automatiquement réalisée.";
$l_db_reset = "Vider la base des usagers";
$l_error_ext_txt = "Erreur! Veuillez sélectionner un fichier avec l'extension '.csv' ou '.txt'";
$l_error_ext_sql = "Erreur! Veuillez sélectionner un fichier avec l'extension '.sql' ou '.sql.gz'";
$l_group_empty = "La liste des groupes est vide";
$l_out_title = " --- Accès à Internet via ALCASAR --- ";
$l_out_login = "Nom de connexion :";
34,20 → 35,21
$l_out_mind = "Pensez à changer votre mot de passe (lien sur la page d'authentification)";
}
else {
$l_title = "Users import";
$l_title = "Import and empty the users database";
$l_database_state ="State of the database : number of groups =";
$l_number_of_users = "Number of users";
$l_text_import = "Import from a text file ('.txt')";
$l_text_import = "Import from a text file";
$l_text_import_help = "In this file, you must write only the user login one below the other.";
$l_file = "File";
$l_users_group = "Define their group (advisable)";
$l_send = "Send";
$l_send = "Import";
$l_empty = "Empty";
$l_imported_files = "Logins/passwords file imported during the last 24h :";
$l_db_import = "Import from a saved users database file (SQL format)";
$l_db_import = "Import from a saved users database file";
$l_db_import_help = "In order to impute the last connections, the actual users database will be automaticly saved.";
$l_db_reset = "Reset the users database";
$l_db_reset = "Empty the users database";
$l_error_ext_txt = "Error! Please select a file with '.txt' or '.csv' extension";
$l_error_ext_sql = "Error! Please select a file with '.sql' extension";
$l_error_ext_sql = "Error! Please select a file with '.sql' or '.sql.gz' extension";
$l_group_empty = "The group list is empty";
$l_out_title = " --- Internet access via ALCASAR --- ";
$l_out_login = "Login :";
126,13 → 128,13
{
unset($result);
if (isset ($_POST['groupe'])) $group = $_POST ['groupe'];
$destination = '/tmp/import_file.txt';
list($file_name , $extension) = explode("." , $_FILES['import-users']['name']);
list($file_name , $extension) = explode("." , $_FILES['import-users']['name'] , 2);
if ($choix == "csv") // import of a txt file
{
if (($extension != 'csv') && ($extension != 'txt')) $result = $l_error_ext_txt;
else
{
$destination = '/tmp/import_file.txt';
exec ("sudo /usr/local/sbin/alcasar-mysql.sh --dump");
move_uploaded_file($_FILES['import-users']['tmp_name'], $destination);
$RS_in = file ($destination);
219,18 → 221,21
fclose($RS_out);
} // end if (is file)
} // end if (link)
}
unlink ($destination);
} // end if (extension = (txt or cvs))
}
else if ($choix == "bdd") // database import
{
if ($extension != 'sql') $result = $l_error_ext_sql;
else
if (($extension == 'sql') || ($extension == 'sql.gz'))
{
$destination = '/tmp/import_file.'.$extension;
exec ("sudo /usr/local/sbin/alcasar-mysql.sh --dump");
move_uploaded_file($_FILES['import-users']['tmp_name'], $destination);
exec ("sudo /usr/local/sbin/alcasar-mysql.sh --import $destination");
echo "OK : $destination";
//echo "OK : $destination";
unlink ($destination);
}
else $result = $l_error_ext_sql;
}
}
if ($link)
260,7 → 265,7
echo "$l_text_import_help<br>";
echo "<tr><td valign=\"middle\" align=\"left\">";
echo "<br><FORM action='$_SERVER[PHP_SELF]' method=POST ENCTYPE=\"multipart/form-data\">";
echo "$l_file (.txt) : <input type=\"file\" name=\"import-users\"><br>";
echo "$l_file (.txt or .csv) : <input type=\"file\" name=\"import-users\"><br>";
echo "$l_users_group : ";
require("../lib/defaults.php");
include_once("../lib/$config[general_lib_type]/group_info.php");
295,7 → 300,7
echo "<H3><CENTER>$l_db_import</CENTER></H3>";
echo "$l_db_import_help <br><br>";
echo "<FORM action='$_SERVER[PHP_SELF]' method=POST ENCTYPE=\"multipart/form-data\">";
echo "$l_file (.sql) : <input type=\"file\" name=\"import-users\"><br>";
echo "$l_file (.sql or .sql.gz) : <input type=\"file\" name=\"import-users\"><br>";
echo "<input type='hidden' name='choix' value='bdd'>";
if (($choix == "bdd") && isset($result)) echo "<b>".$result."</b><BR>";
echo "<input type=\"submit\" value=\"$l_send\">";
306,7 → 311,7
echo "$l_db_import_help<br><br>";
echo "<FORM action='$_SERVER[PHP_SELF]' method=POST>";
echo "<input type='hidden' name='choix' value='raz'>";
echo "<input type=\"submit\" value=\"$l_send\">";
echo "<input type=\"submit\" value=\"$l_empty\">";
echo "</FORM>";
echo "</TD></TR></TABLE>";
?>