WebSVN – ALCASAR – Diff – /alcasar.sh

 #!/bin/sh
-#  $Id: alcasar.sh 634 2011-06-13 17:23:46Z richard $
+#  $Id: alcasar.sh 636 2011-06-15 22:29:07Z richard $
 # alcasar.sh
 # by Franck BOUIJOUX, Pascal LEVANT and Richard REY
 # This script is distributed under the Gnu General Public License (GPL)
 ## - Renseignement des fichiers hosts.allow et hosts.deny	##
 ##################################################################
 network ()
+{
 	header_install
+	if [ "$mode" != "update" ]
+		then
-	if [ $Lang == "fr" ]
+		if [ $Lang == "fr" ]
-		then echo "Par défaut, l'adresse IP d'ALCASAR sur le réseau de consultation est : $DEFAULT_PRIVATE_IP_MASK"
+			then echo "Par défaut, l'adresse IP d'ALCASAR sur le réseau de consultation est : $DEFAULT_PRIVATE_IP_MASK"
-		else echo "The default ALCASAR IP address on consultation network is : $DEFAULT_PRIVATE_IP_MASK"
+			else echo "The default ALCASAR IP address on consultation network is : $DEFAULT_PRIVATE_IP_MASK"
-	fi
+		fi
-	response=0
+		response=0
-	PTN='^[oOyYnN]$'
+		PTN='^[oOyYnN]$'
-	until [[ $(expr $response : $PTN) -gt 0 ]]
+		until [[ $(expr $response : $PTN) -gt 0 ]]
 		do
 			if [ $Lang == "fr" ]
 				then echo -n "Voulez-vous utiliser cette addresse et ce plan d'adressage (recommandé) (O/n)? : "
 				else echo -n "Do you want to use this IP address and this IP addressing plan (recommanded) (Y/n)? : "
 			fi
 			read response
 		done
-	if [ "$response" = "n" ] || [ "$response" = "N" ]
+		if [ "$response" = "n" ] || [ "$response" = "N" ]
-	then
+		then
-		PRIVATE_IP_MASK="0"
+			PRIVATE_IP_MASK="0"
-		PTN='^\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\).\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\).\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\).\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\)/[012]\?[[:digit:]]$'
+			PTN='^\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\).\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\).\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\).\([01]\?[[:digit:]][[:digit:]]\?\|2[0-4][[:digit:]]\|25[0-5]\)/[012]\?[[:digit:]]$'
-		until [[ $(expr $PRIVATE_IP_MASK : $PTN) -gt 0 ]]
+			until [[ $(expr $PRIVATE_IP_MASK : $PTN) -gt 0 ]]
 			do
 				if [ $Lang == "fr" ]
 					then echo -n "Entrez l'adresse IP d'ALCASAR au format CIDR (a.b.c.d/xx) : "
 					else echo -n "Enter ALCASAR IP address in CIDR format (a.b.c.d/xx) : "
 				fi
 				read PRIVATE_IP_MASK
 			done
+		else
+       			PRIVATE_IP_MASK=$DEFAULT_PRIVATE_IP_MASK
+		fi
 	else
-       		PRIVATE_IP_MASK=$DEFAULT_PRIVATE_IP_MASK
+		PRIVATE_IP_MASK=`grep PRIVATE_IP |cut -d"=" -f2` /tmp/conf/etc/alcasar.conf
 	fi
 # Définition de la config réseau côté "LAN de consultation"
 	hostname $HOSTNAME
 	PRIVATE_NETWORK=`/bin/ipcalc -n $PRIVATE_IP_MASK | cut -d"=" -f2`			# @ réseau de consultation (ex.: 192.168.182.0)
 	PRIVATE_NETMASK=`/bin/ipcalc -m $PRIVATE_IP_MASK | cut -d"=" -f2`			# masque réseau de consultation (ex.: 255.255.255.0)
 if [ "$mode" = "update" ]
 then
 	$DIR_DEST_BIN/alcasar-conf.sh --load
 	$SED "s?^INSTALL_DATE=.*?INSTALL_DATE=$DATE?g" $CONF_FILE
 	$SED "s?^VERSION=.*?VERSION=$VERSION?g" $CONF_FILE
-	$SED "s?^ORGANISM=.*?ORGANISM=$ORGANISM?g" $CONF_FILE
 fi
 rm -f /tmp/alcasar-conf*
 chown -R root:apache $DIR_DEST_ETC/*
 chmod -R 660 $DIR_DEST_ETC/*
 chmod ug+x $DIR_DEST_ETC/digest $DIR_DEST_ETC/alcasar-dnsfilter*
 			else
 				RUNNING_VERSION=`cat $DIR_WEB/VERSION|cut -d" " -f1`
 				MAJ_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f1`
 				MIN_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f2|cut -c1`
 				UPD_RUNNING_VERSION=`echo $RUNNING_VERSION|cut -d"." -f3`
-# Create the conf file of the running version
+# Create a backup of running version importants files
 				chmod u+x $DIR_SCRIPTS/alcasar-conf.sh
 				$DIR_SCRIPTS/alcasar-conf.sh --create
 				mode="update"
 			fi
 		fi
 		if [ -e $DIR_WEB/VERSION ]
 		then
 # Uninstall the running version
 			$DIR_SCRIPTS/sbin/alcasar-uninstall.sh
 		fi
+# Test if manual update
 		if [ -e /tmp/alcasar-conf.tar.gz ] && [ "$mode" != "update" ]
 		then
+			header_install
 			if [ $Lang == "fr" ]
-				then echo -n "Le fichier de configuration d'une ancienne version a été trouvé";
+				then echo "Le fichier de configuration d'une ancienne version a été trouvé";
-				else echo -n "The configuration file of an old version has been found";
+				else echo "The configuration file of an old version has been found";
 			fi
 			response=0
 			PTN='^[oOnNyY]$'
 			until [[ $(expr $response : $PTN) -gt 0 ]]
 			do
 				if [ "$response" = "n" ] || [ "$response" = "N" ]
 				then rm -f /tmp/alcasar-conf*
 				fi
 			done
 		fi
+# Test if update
 		if [ -e /tmp/alcasar-conf.tar.gz ]
 		then
 			if [ $Lang == "fr" ]
 				then echo "#### Installation avec mise à jour ####";
 				else echo "#### Installation with update     ####";
 			fi
-# Read the organism name from the conf file
+# Extract the central configuration file
-			tar -xvf /tmp/alcasar-conf.tar.gz conf/organisme
+			tar -xvf /tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf -C /tmp
-			ORGANISME=`cat $DIR_CONF/organisme`
+			ORGANISME=`cat /tmp/conf/etc/alcasar.conf|grep ORGANISM|cut -d"=" -f2`
 			mode="update"
 		else
 			mode="install"
 		fi
 		for func in init network gestion AC init_db param_radius param_web_radius param_chilli param_squid param_dansguardian antivirus param_ulogd param_awstats param_dnsmasq BL cron post_install

Subversion Repositories ALCASAR

(root)/alcasar.sh @ 2681 – Rev 634 → 636