WebSVN – ALCASAR – Diff – /alcasar.sh

 #!/bin/bash
-#  $Id: alcasar.sh 1269 2013-12-16 23:13:20Z richard $
+#  $Id: alcasar.sh 1278 2014-01-04 15:13:01Z richard $
 # alcasar.sh
 # ALCASAR Install script -  CopyLeft ALCASAR Team [Rexy + 3abtux + Steweb + Crox + ...]
 # Ce programme est un logiciel libre ; This software is free and open source
 param_radius ()
+{
 	cp -f $DIR_CONF/radiusd-db-vierge.sql /etc/raddb/
 	chown -R radius:radius /etc/raddb
 	[ -e /etc/raddb/radiusd.conf.default ] || cp /etc/raddb/radiusd.conf /etc/raddb/radiusd.conf.default
-# paramètrage radius.conf
+# Set radius.conf parameters
 	$SED "s?^[\t ]*#[\t ]*user =.*?user = radius?g" /etc/raddb/radiusd.conf
 	$SED "s?^[\t ]*#[\t ]*group =.*?group = radius?g" /etc/raddb/radiusd.conf
 	$SED "s?^[\t ]*status_server =.*?status_server = no?g" /etc/raddb/radiusd.conf
-# suppression de la fonction proxy
+# remove the proxy function
 	$SED "s?^[\t ]*proxy_requests.*?proxy_requests = no?g" /etc/raddb/radiusd.conf
 	$SED "s?^[\t ]*\$INCLUDE proxy.conf.*?#\$INCLUDE proxy.conf?g" /etc/raddb/radiusd.conf
-# suppression du module EAP
+# remove EAP module
 	$SED "s?^[\t ]*\$INCLUDE eap.conf.*?#\$INCLUDE eap.conf?g" /etc/raddb/radiusd.conf
-# écoute sur loopback uniquement (à modifier plus tard pour l'EAP)
+# listen on loopback (should be modified later if EAP enabled)
 	$SED "s?^[\t ]*ipaddr =.*?ipaddr = 127.0.0.1?g" /etc/raddb/radiusd.conf
-# prise en compte du module SQL et des compteurs SQL
+# enable the  SQL module (and SQL counter)
 	$SED "s?^[\t ]*#[\t ]*\$INCLUDE sql.conf.*?\$INCLUDE sql.conf?g" /etc/raddb/radiusd.conf
 	$SED "s?^[\t ]*#[\t ]*\$INCLUDE sql/mysql/counter.conf?\$INCLUDE sql/mysql/counter.conf?g" /etc/raddb/radiusd.conf
 	$SED "s?^[\t ]*\$INCLUDE policy.conf?#\$INCLUDE policy.conf?g" /etc/raddb/radiusd.conf
-# purge du répertoire des serveurs virtuels et copie du fichier de configuration d'Alcasar
+# remvove virtual server and copy our conf file
 	rm -f /etc/raddb/sites-enabled/*
-       	cp $DIR_CONF/alcasar-radius /etc/raddb/sites-available/alcasar
+       	cp $DIR_CONF/radius/alcasar-radius /etc/raddb/sites-available/alcasar
 	chown radius:apache /etc/raddb/sites-available/alcasar /etc/raddb/modules/ldap # droits rw pour apache (module ldap)
 	chmod 660 /etc/raddb/sites-available/alcasar /etc/raddb/modules/ldap
 	chgrp apache /etc/raddb /etc/raddb/sites-available /etc/raddb/modules
 	ln -s /etc/raddb/sites-available/alcasar /etc/raddb/sites-enabled/alcasar
 # Inutile dans notre fonctionnement mais les liens sont recréés par un update de radius ... donc forcé en tant que fichier à 'vide'
 	touch /etc/raddb/sites-enabled/{inner-tunnel,control-socket,default}
-# configuration du fichier client.conf (127.0.0.1 suffit mais on laisse le deuxième client pour la future gestion de l'EAP)
+# client.conf configuration (127.0.0.1 suffit mais on laisse le deuxième client pour la future gestion de l'EAP)
 	[ -e /etc/raddb/clients.conf.default ] || cp -f /etc/raddb/clients.conf /etc/raddb/clients.conf.default
 	cat << EOF > /etc/raddb/clients.conf
 client 127.0.0.1 {
 	secret = $secretradius
 	shortname = localhost
+}
 EOF
-# modif sql.conf
+# sql.conf modification
 	[ -e /etc/raddb/sql.conf.default ] || cp /etc/raddb/sql.conf /etc/raddb/sql.conf.default
 	$SED "s?^[\t ]*login =.*?login = \"$DB_USER\"?g" /etc/raddb/sql.conf
 	$SED "s?^[\t ]*password =.*?password = \"$radiuspwd\"?g" /etc/raddb/sql.conf
 	$SED "s?^[\t ]*radius_db =.*?radius_db = \"$DB_RADIUS\"?g" /etc/raddb/sql.conf
 	$SED "s?^[\t ]*sqltrace =.*?sqltrace = no?g" /etc/raddb/sql.conf
-# modif dialup.conf
+# dialup.conf modification (case sensitive for username, check simultaneous use, patch on 'postauth' table, etc.)
 	[ -e /etc/raddb/sql/mysql/dialup.conf.default ] || cp /etc/raddb/sql/mysql/dialup.conf /etc/raddb/sql/mysql/dialup.conf.default
-	cp -f $DIR_CONF/dialup.conf /etc/raddb/sql/mysql/dialup.conf
+	cp -f $DIR_CONF/radius/dialup.conf /etc/raddb/sql/mysql/dialup.conf
+# counter.conf modification (change the Max-All-Session-Time counter)
+	[ -e /etc/raddb/sql/mysql/counter.conf.default ] || cp /etc/raddb/sql/mysql/counter.conf /etc/raddb/sql/mysql/counter.conf.default
+	cp -f $DIR_CONF/radius/counter.conf /etc/raddb/sql/mysql/counter.conf
+	chown -R radius:radius /etc/raddb/sql/mysql/*
 # insures that mysql is up before radius start
 	$SED "s?^After=.*?After=syslog.target network.target mysqld.service?g" /lib/systemd/system/radiusd.service
 } # End param_radius ()
 	$SED "s?^sql_password_attribute:.*?sql_password_attribute: Crypt-Password?g" /etc/freeradius-web/admin.conf
 	$SED "s?^general_finger_type.*?# general_finger_type: snmp?g" /etc/freeradius-web/admin.conf
 	$SED "s?^general_stats_use_totacct.*?general_stats_use_totacct: yes?g" /etc/freeradius-web/admin.conf
 	$SED "s?^general_charset.*?general_charset: utf-8?g" /etc/freeradius-web/admin.conf
 	[ -e /etc/freeradius-web/config.php.default ] || cp /etc/freeradius-web/config.php /etc/freeradius-web/config.php.default
-	cp -f $DIR_CONF/freeradiusweb-config.php /etc/freeradius-web/config.php
+	cp -f $DIR_CONF/radius/freeradiusweb-config.php /etc/freeradius-web/config.php
 	cat <<EOF > /etc/freeradius-web/naslist.conf
 nas1_name: alcasar-$ORGANISME
 nas1_model: Portail captif
 nas1_ip: $PRIVATE_IP
 nas1_port_num: 0
 nas1_community: public
 EOF
 # Modification des attributs visibles lors de la création d'un usager ou d'un groupe
 	[ -e /etc/freeradius-web/user_edit.attrs.default ] || mv /etc/freeradius-web/user_edit.attrs /etc/freeradius-web/user_edit.attrs.default
-	cp -f $DIR_CONF/user_edit.attrs /etc/freeradius-web/user_edit.attrs
+	cp -f $DIR_CONF/radius/user_edit.attrs /etc/freeradius-web/user_edit.attrs
 # Ajout du mappage des attributs chillispot
 	[ -e /etc/freeradius-web/sql.attrmap.default ] || mv /etc/freeradius-web/sql.attrmap /etc/freeradius-web/sql.attrmap.default
-	cp -f $DIR_CONF/sql.attrmap /etc/freeradius-web/sql.attrmap
+	cp -f $DIR_CONF/radius/sql.attrmap /etc/freeradius-web/sql.attrmap
 # Modification des attributs visibles sur les pages des statistiques (suppression NAS_IP et NAS_port)
-	[ -e /etc/freeradius-web/sql.attrs.default ] || cp /etc/freeradius-web/sql.attrs /etc/freeradius-web/user_edit.attrs.default
+	[ -e /etc/freeradius-web/sql.attrs.default ] || cp /etc/freeradius-web/sql.attrs /etc/freeradius-web/sql.attrs.default
 	$SED "s?^NASIPAddress.*?NASIPAddress\tNas IP Address\tno?g" /etc/freeradius-web/sql.attrs
 	$SED "s?^NASPortId.*?NASPortId\tNas Port\tno?g" /etc/freeradius-web/sql.attrs
 	chown -R apache:apache /etc/freeradius-web
 # Ajout de l'alias vers la page de "changement de mot de passe usager"
 	cat <<EOF >> /etc/httpd/conf/webapps.d/alcasar.conf

Subversion Repositories ALCASAR

(root)/alcasar.sh @ 2681 – Rev 1269 → 1278