WebSVN – ALCASAR – Diff – /alcasar.sh

 #!/bin/bash
-#  $Id: alcasar.sh 2422 2017-10-09 22:10:48Z richard $
+#  $Id: alcasar.sh 2423 2017-10-10 22:11:26Z 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
 	$SED "/^ExecStop=/a ExecStartPost=$DIR_DEST_BIN/alcasar-mysql.sh -acct_stop" /lib/systemd/system/mysqld.service
 	/usr/bin/systemctl unset-environment MYSQLD_OPTS
 	/usr/bin/systemctl daemon-reload
 } # End of init_db ()
-##########################################################################
+###################################################################
-##			Fonction "freeradius"				##
+##                       Function "freeradius"                   ##
-## - Paramètrage des fichiers de configuration FreeRadius		##
+## - Set the configuration files                                 ##
-## - Affectation du secret partagé entre coova-chilli et freeradius	##
+## - Set the shared secret between coova-chilli and freeradius   ##
-## - Modification de fichier de conf pour l'accès à Mysql		##
+## - Adapt the Mysql conf file and counters                      ##
-##########################################################################
+###################################################################
 freeradius ()
+{
 	cp -f $DIR_CONF/empty-radiusd-db.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
 # Set "client.conf" to describe radius clients (coova on 127.0.0.1)
 	[ -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
+	shortname = coova
+}
 EOF
 # Set Virtual server (remvove all except "alcasar virtual site")
 	rm -f /etc/raddb/sites-enabled/*
     cp $DIR_CONF/radius/alcasar-radius /etc/raddb/sites-available/alcasar
 	chown radius:apache /etc/raddb/sites-available/alcasar
 	chmod 660 /etc/raddb/sites-available/alcasar
     rm -rf  /etc/raddb/mods-enabled/*
     for mods in sql sqlcounter attr_filter expiration logintime pap
         do
         ln -s /etc/raddb/mods-available/$mods /etc/raddb/mods-enabled/$mods
         done
-# Configure SQL mod (TODO :and SQL counter)
+# Configure SQL mod
 	[ -e /etc/raddb/mods-available/sql.default ] || cp /etc/raddb/mods-available/sql /etc/raddb/mods-available/sql.default
-    cp $DIR_CONF/radius/sql /etc/raddb/mods-available/sql
-    chown radius:radius /etc/raddb/mods-available/sql
-	$SED "s?^[\t ]*login =.*?login = \"$DB_USER\"?g" /etc/raddb/mods-available/sql
+	$SED "s?^[\t ]*driver =.*?driver = \"rlm_sql_mysql\"?g" /etc/raddb/mods-available/sql
-	$SED "s?^[\t ]*password =.*?password = \"$radiuspwd\"?g" /etc/raddb/mods-available/sql
+	$SED "s?^[\t ]*dialect =.*?dialect = \"mysql\"?g" /etc/raddb/mods-available/sql
 	$SED "s?^[\t ]*radius_db =.*?radius_db = \"$DB_RADIUS\"?g" /etc/raddb/mods-available/sql
-#	$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
-#	$SED "s?^[\t ]*\$INCLUDE \${confdir}/modules/.*?\t#\$INCLUDE \${confdir}/modules/\n\t# we only include modules for ALCASAR needs\n\t\$INCLUDE \${confdir}/modules/attr_filter\n\t\$INCLUDE \${confdir}/modules/expiration\n\t\$INCLUDE \${confdir}/modules/logintime\n\t\$INCLUDE \${confdir}/modules/ldap\n\t\$INCLUDE \${confdir}/modules/pap?g" /etc/raddb/radiusd.conf
+	$SED "s?^#[\t ]*server =.*?server = \"localhost\"?g" /etc/raddb/mods-available/sql
-#	$SED "s/^[\t ]exec$/\#\texec/g" /etc/raddb/radiusd.conf
+	$SED "s?^#[\t ]*port =.*?port = \"3306\"?g" /etc/raddb/mods-available/sql
-#	$SED "s?^[\t ]*expr.*?\#\texpr?g" /etc/raddb/radiusd.conf
+	$SED "s?^#[\t ]*login =.*?login = \"$DB_USER\"?g" /etc/raddb/mods-available/sql
-#	$SED "s?^[\t ]*\#	daily.*?\#\tdaily\n\tsql?g" /etc/raddb/radiusd.conf
+	$SED "s?^#[\t ]*password =.*?password = \"$radiuspwd\"?g" /etc/raddb/mods-available/sql
-#	$SED "s?^[\t ]*logintime.*?\tlogintime\n\tnoresetcounter\n\tdailycounter\n\tmonthlycounter\n\tattr_filter.access_reject\n\tattr_filter.accounting_response\n\tpap?g" /etc/raddb/radiusd.conf
-#	$SED "s?^[\t ]*\$INCLUDE sites-enabled/.*?\#\$INCLUDE sites-enabled/\n\#\tenable only alcasar virtual server\n\$INCLUDE sites-enabled/alcasar?g" /etc/raddb/radiusd.conf
 # queries.conf modifications : case sensitive for username, check simultaneous use, patch on 'postauth' table, etc.
 	[ -e /etc/raddb/mods-config/sql/main/mysql/queries.conf.default ] || cp /etc/raddb/mods-config/sql/main/mysql/queries.conf /etc/raddb/mods-config/sql/main/mysql/queries.conf.default
 	cp -f $DIR_CONF/radius/queries.conf /etc/raddb/mods-config/sql/main/mysql/queries.conf
 	chown -R radius:radius /etc/raddb/mods-config/sql/main/mysql/queries.conf
 # sqlcounter modifications
  # Allow apache to change some conf files (ie : ldap on/off)
  chgrp apache /etc/raddb /etc/raddb/sites-available /etc/raddb/mods-available
 } # End freeradius ()
-##################################################################################
+#############################################################################
-##			Fonction "chilli"					##
+##                              Fonction "chilli"                          ##
-## - Création du fichier d'initialisation et de configuration de coova-chilli	##
+## - Creation of the conf file and init file (systemd) for coova-chilli    ##
-## - Paramètrage de la page d'authentification (intercept.php)			##
+## - Adapt the authentication web page (intercept.php)                     ##
-##################################################################################
+#############################################################################
 chilli ()
+{
 # chilli unit for systemd
 	cat << EOF > /lib/systemd/system/chilli.service
 #  This file is part of systemd.

Subversion Repositories ALCASAR

(root)/alcasar.sh – Rev 2422 → 2423