WebSVN – ALCASAR – Diff – /scripts/alcasar-conf.sh

 #!/bin/bash
-# $Id: alcasar-conf.sh 2554 2018-05-20 11:02:46Z lucas.echard $
+# $Id: alcasar-conf.sh 2560 2018-06-10 21:04:56Z rexy $
 # alcasar-conf.sh
 # by REXY
 # This script is distributed under the Gnu General Public License (GPL)
 # Ce script permet la mise à jour ALCASAR
-#	- création de l'archive des fichiers de configuration dans "/tmp/alcasar-conf.tar.gz" (alcasar-conf.sh -create)
+#	- création de l'archive des fichiers de configuration "/var/tmp/alcasar-conf.tar.gz" (alcasar-conf.sh -create)
 #	- chargement de l'archive de fichiers de configuration lors de la mise à jour d'un alcasar (alcasar-conf -load). Le cas échéant, c'est ici qu'on met à jour les fichiers entre versions
 #	- application des directives du fichier de conf central "/usr/local/etc/alcasar.conf" lors d'un changement de conf réseau à chaud (alcasar-conf -apply)
 # This script allows ALCASAR update
-#	- create the configuration files backup "/tmp/alcasar-conf.tar.gz" (alcasar-conf.sh -create)
+#	- create the configuration files backup "/var/tmp/alcasar-conf.tar.gz" (alcasar-conf.sh -create)
 #	- load the backup of configuration files during the update process (alcasar-conf -load). If needed, it's here we update files between versions
 #	- apply ALCASAR central configuration file "/usr/local/etc/alcasar.conf" when hot modification is needed (alcasar-conf -apply)
 new="$(date +%G%m%d-%Hh%M)"  				# date et heure des fichiers
 fichier="alcasar-conf-$new.tar.gz"			# nom du fichier de sauvegarde
-DIR_UPDATE="/tmp/conf"					# répertoire de stockage des fichier de conf pour une mise à jour
+DIR_UPDATE="/var/tmp/conf"					# répertoire de stockage des fichier de conf pour une mise à jour
 DIR_WEB="/var/www/html"					# répertoire du centre de gestion
 DIR_BIN="/usr/local/bin"				# scripts directory
 DIR_ETC="/usr/local/etc"				# conf directory
 DIR_SHARE="/usr/local/share"				# data directory
 DIR_BLACKLIST="/etc/e2guardian/lists/blacklists"	# Toulouse BL directory
 			else
 				cp /etc/e2guardian/lists/$i $DIR_UPDATE/custom_bl/
 			fi
 		done
 		cp -rf $DIR_BLACKLIST/ossi-* $DIR_UPDATE/custom_bl/ 2>/dev/null
-# backup of different conf files (main conf file, filtering, digest, etc)
+# backup of different conf files (main conf file, filtering, digest, /etc/hosts, etc.)
 		mkdir $DIR_UPDATE/etc/
 		[ -e $DIR_ETC/alcasar-ethers-info ] || cp $DIR_ETC/alcasar-ethers $DIR_ETC/alcasar-ethers-info # V3.1.2 new info file for dhcp static
 		cp -rf $DIR_ETC/* $DIR_UPDATE/etc/
+		cp /etc/hosts $DIR_UPDATE/etc/
 # backup of the security certificates (server & CA)
 		cp -f /etc/pki/tls/certs/alcasar.crt* $DIR_UPDATE # autosigned and official if exist
 		cp -f /etc/pki/tls/private/alcasar.key* $DIR_UPDATE # autosigned & official if exist
 		cp -f /etc/pki/CA/alcasar-ca.crt $DIR_UPDATE
 		cp -f /etc/pki/CA/private/alcasar-ca.key $DIR_UPDATE
 			cp -f /etc/pki/tls/certs/server-chain.crt* $DIR_UPDATE # autosigned and official if exist
 		else
 			cp -f /etc/pki/tls/certs/alcasar.crt $DIR_UPDATE/server-chain.crt
 		fi
 # archive file creation
-		cd /tmp
+		cd /var/tmp
 		tar -cf alcasar-conf.tar conf/
 		gzip -f alcasar-conf.tar
 		rm -rf $DIR_UPDATE
 		;;
 	--load|-load)
-		cd /tmp
+		cd /var/tmp
-		tar -xf /tmp/alcasar-conf*.tar.gz
+		tar -xf alcasar-conf*.tar.gz
 # Retrieve the logo
 		[ -e $DIR_UPDATE/organisme.png ] && cp -f $DIR_UPDATE/organisme.png $DIR_WEB/images/
 		chown apache:apache $DIR_WEB/images/organisme.png $DIR_WEB/intercept.php
 # Retrieve the security certificates (CA and server)
 		cp -f $DIR_UPDATE/alcasar-ca.crt* /etc/pki/CA/ # autosigned & official
 		cp -f $DIR_UPDATE/alcasar-ca.key* /etc/pki/CA/private/ # autosigned & official
 		cp -f $DIR_UPDATE/alcasar.crt /etc/pki/tls/certs/
 		cp -f $DIR_UPDATE/alcasar.key /etc/pki/tls/private/
 		(cat /etc/pki/tls/private/alcasar.key; echo; cat /etc/pki/tls/certs/alcasar.crt) > /etc/pki/tls/private/alcasar.pem
 		[ -e $DIR_UPDATE/server-chain.crt ] && cp -f $DIR_UPDATE/server-chain.crt* /etc/pki/tls/certs/ # autosigned and official if exist
 		chown -R root:apache /etc/pki
 		chmod -R 750 /etc/pki
 # Import of the users database
 		gzip -dc < `ls $DIR_UPDATE/alcasar-users-database*` | mysql -u$DB_USER -p$DB_PASS
 # Retrieve local parameters
 		[ -d $DIR_UPDATE/etc ] && cp -rf $DIR_UPDATE/etc/* $DIR_ETC/
+		mv -f $DIR_ETC/hosts /etc/hosts
 # Retrieve BL/WL custom files
 		cp -f $DIR_UPDATE/custom_bl/exceptioniplist /etc/e2guardian/lists/
 		cp -f $DIR_UPDATE/custom_bl/exceptionsitelist /etc/e2guardian/lists/
 		cp -f $DIR_UPDATE/custom_bl/urlregexplist /etc/e2guardian/lists/
 		cp -f $DIR_UPDATE/custom_bl/bannedsitelist /etc/e2guardian/lists/
 		else
 			/usr/bin/systemctl -q disable sshd.service
 		fi
 # Remove the update folder
 		rm -rf $DIR_UPDATE
-# If needed : write modifications between version
+#########################   modifications between versions  #######################
-# V3.1.3
+# Extract the curent version
+		CURRENT_VERSION=`grep ^VERSION= $CONF_FILE|cut -d"=" -f2`
-	# add "HTTPS_LOGIN=on" in conf file
+		MAJ_CURRENT_VERSION=`echo $CURRENT_VERSION|cut -d"." -f1`
-		HTTPS_LOGIN=`grep -c "^HTTPS_LOGIN=" $CONF_FILE`
+		MIN_CURRENT_VERSION=`echo $CURRENT_VERSION|cut -d"." -f2`
+		UPD_CURRENT_VERSION=`echo $CURRENT_VERSION|cut -d"." -f3|cut -c1`
-		if [ $HTTPS_LOGIN == "0" ]
+##  From 3.2.0 & 3.2.1  ##
+		if [ [ $MAJ_CURRENT_VERSION == "3" ] && [ $MIN_CURRENT_VERSION == "2" ] ]
 		then
+			## rewrite the file managing domain name resolution (local & remote). Hostnames resolutions are now in /etc/hosts
-			echo "HTTPS_LOGIN=on" >> $CONF_FILE
+			cat << EOF > $DIR_ETC/alcasar-dns-name
+# Vous pouvez définir ici votre nom de domain local ('localdomain' par défaut)
+# Here you can define your local domain name ('localdomain' by default)
+local=/$DOMAIN/
+domain=$DOMAIN
+## Ajouter une ligne pour chaque nom de domaine géré par un autre seveur DNS
+## Add one line for each domain name managed by an other DNS server
+## server=/<your_domain>/<@IP_domain_server>
+## Exemple for an A.D. domain :  server=/Your.Domain.AD/110.120.100.100
+## Exemple for an other domain : server=/an_other_domain/10.20.30.40
-		fi
+## INFO : local hostnames are resolved in /etc/hosts file
-# V3.2.0
+EOF
-	# add "HTTPS_CHILLI=off" in conf file
+			## rewrite /etc/hosts file managing hostname resolution
+			PRIVATE_IP=`grep ^PRIVATE_IP= $CONF_FILE|cut -d"=" -f2|cut -d"/" -f1`
-		if [ $(grep -c "^HTTPS_CHILLI=" $CONF_FILE) == "0" ]; then
+			HOSTNAME=`grep ^HOSTNAME= $CONF_FILE|cut -d"=" -f2`
+			cat << EOF > /etc/hosts
+.0.0.1	localhost
+$PRIVATE_IP	$HOSTNAME
+EOF
-			echo "HTTPS_CHILLI=off" >> $CONF_FILE
+			# apache is removed (lighttpd instead)
+			rm -rf /etc/httpd/
+			rm -rf /var/log/httpd/
+			# dansguardian is removed (E²guardian instead)
+			rm -rf /var/dansguardian/
+			rm -rf /etc/dansguardian/
 		fi
 		;;
 	--apply|-apply)
 		PTN="\b(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\/([012]?[0-9]|3[0-2])\b"
 		PRIVATE_IP_MASK=`grep ^PRIVATE_IP= $CONF_FILE|cut -d"=" -f2`
 		check=$(echo $PRIVATE_IP_MASK | egrep $PTN)
 		if [[ "$?" -ne 0 ]]
 ntpd: $PRIVATE_NETWORK_SHORT
 EOF
 # Set hostname
 		hostnamectl set-hostname $HOSTNAME.$DOMAIN
 # /etc/hosts
-		domainNames="alcasar.localdomain $HOSTNAME $HOSTNAME.$DOMAIN"
-		if [ "$HOSTNAME" != "alcasar" ]; then domainNames="alcasar $domainNames"; fi
 		cat <<EOF > /etc/hosts
 .0.0.1	localhost
-$PRIVATE_IP	$domainNames
+$PRIVATE_IP	$HOSTNAME
 EOF
 # Set hostname in CoovaChilli
 		$SED "s/^uamallowed.*/uamallowed\t${domainNames// /,}/g" /etc/chilli.conf
 		$SED "s/^locationname.*/locationname\t$HOSTNAME.$DOMAIN/g" /etc/chilli.conf
 		[ `grep ^HTTPS_LOGIN= $CONF_FILE | cut -d'=' -f2` == "on" ] && chilli_login_protocol="https" || chilli_login_protocol="http"

Subversion Repositories ALCASAR

(root)/scripts/alcasar-conf.sh – Rev 2554 → 2560