WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 635 → Rev 636

 /alcasar.sh
 ,13 → 267,15
 network ()
 {
         header_install
-        if [ $Lang == "fr" ]
-                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"
-        fi
-        response=0
-        PTN='^[oOyYnN]$'
-        until [[ $(expr $response : $PTN) -gt 0 ]]
+        if [ "$mode" != "update" ]
+                then
+                if [ $Lang == "fr" ]
+                        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"
+                fi
+                response=0
+                PTN='^[oOyYnN]$'
+                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)? : "
 ,11 → 283,11
                         fi
                         read response
                 done
-        if [ "$response" = "n" ] || [ "$response" = "N" ]
-        then
-                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:]]$'
-                until [[ $(expr $PRIVATE_IP_MASK : $PTN) -gt 0 ]]
+                if [ "$response" = "n" ] || [ "$response" = "N" ]
+                then
+                        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:]]$'
+                        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) : "
 ,10 → 294,12
                                         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
 ,7 → 1387,6
         $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/*
 ,7 → 1463,7
                                 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"
 ,11 → 1480,13
 # 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é";
-                                else echo -n "The configuration file of an old version has been found";
+                                then echo "Le fichier de configuration d'une ancienne version a été trouvé";
+                                else echo "The configuration file of an old version has been found";
                         fi
                         response=0
                         PTN='^[oOnNyY]$'
 ,6 → 1502,7
                                 fi
                         done
                 fi
+# Test if update
                 if [ -e /tmp/alcasar-conf.tar.gz ]
                 then
                         if [ $Lang == "fr" ]
 ,9 → 1509,9
                                 then echo "#### Installation avec mise à jour ####";
                                 else echo "#### Installation with update     ####";
                         fi
-# Read the organism name from the conf file
-                        tar -xvf /tmp/alcasar-conf.tar.gz conf/organisme
-                        ORGANISME=`cat $DIR_CONF/organisme`
+# Extract the central configuration file
+                        tar -xvf /tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf -C /tmp
+                        ORGANISME=`cat /tmp/conf/etc/alcasar.conf|grep ORGANISM|cut -d"=" -f2`
                         mode="update"
                 else
                         mode="install"

 /scripts/alcasar-conf.sh
 ,8 → 76,8
                 mkdir $DIR_UPDATE/etc/
                 cp -rf $DIR_ETC/* $DIR_UPDATE/etc/
 # particularité des versions
-# si version < 2.1
-                if ([ $MAJ_RUNNING_VERSION -lt 2 ] || ([ $MAJ_RUNNING_VERSION -eq 2 ] && [ $MIN_RUNNING_VERSION -lt 1 ]))
+# si version <= 2.0
+                if [ $MAJ_RUNNING_VERSION -lt 2 ] || ([ $MAJ_RUNNING_VERSION -eq 2 ] && [ $MIN_RUNNING_VERSION -eq 0 ])
                 then
                         rm -f $DIR_UPDATE/etc/alcasar-dns-name          # changement de format
                         rm -f $DIR_UPDATE/etc/alcasar-macallowed        # ajout d'un commentaire par @MAC
 ,9 → 100,9
                         cp -f /etc/pki/CA/private/alcasar-ca.key $DIR_UPDATE
                 fi
 # si version < 2.2
-                if ([ $MAJ_RUNNING_VERSION -lt 2 ] || ([ $MAJ_RUNNING_VERSION -eq 2 ] && [ $MIN_RUNNING_VERSION -lt 2 ]))
+                if [ $MAJ_RUNNING_VERSION -lt 2 ] || ([ $MAJ_RUNNING_VERSION -eq 2 ] && [ $MIN_RUNNING_VERSION -lt 2 ])
                 then
-                        ORGANISM=`cat /root/ALCASAR-parameters.txt|grep Organism|cut -d":" -f2|tr -d " "` # Sauvegarde du nom d'organisme
+                        ORGANISM=`cat $DIR_WEB/intercept.php|grep '$organisme =' | cut -d"=" -f2|tr -d ";\" "` # Sauvegarde du nom d'organisme
                         rm -f $DIR_UPDATE/etc/alcasar-ethers            # This file doesn't contain comments
                         # Create the initial conf file (doesn't exist in earlier versions)
                         cat <<EOF > $CONF_FILE
 ,39 → 116,39
 VERSION=$RUNNING_VERSION
 ORGANISM=$ORGANISM
 EOF
-                PUBLIC_IP=`grep IPADDR /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2`       # @ip du portail (côté Internet)
-                PUBLIC_NETMASK=`grep NETMASK /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2`
-                PUBLIC_PREFIX=`/bin/ipcalc -p $PUBLIC_IP $PUBLIC_NETMASK |cut -d"=" -f2`                # prefixe du réseau (ex. 24)
-                PUBLIC_GATEWAY=`grep GATEWAY /etc/sysconfig/network-scripts/default-ifcfg-$EXTIF|cut -d"=" -f2`
-                DNS1=`grep DNS1 /etc/sysconfig/network-scripts/default-ifcfg-$EXTIF|cut -d"=" -f2`      # @ip 1er DNS
-                DNS2=`grep DNS2 /etc/sysconfig/network-scripts/default-ifcfg-$EXTIF|cut -d"=" -f2`      # @ip 2ème DNS
-                DNS1=${DNS1:=208.67.220.220}
-                DNS2=${DNS2:=208.67.222.222}
-                PRIVATE_IP=`grep IPADDR /etc/sysconfig/network-scripts/ifcfg-$INTIF|cut -d"=" -f2`      # @ip du portail (côté LAN)
-                PRIVATE_NETMASK=`grep NETMASK /etc/sysconfig/network-scripts/ifcfg-$INTIF|cut -d"=" -f2`
-                private_network_calc
-                echo "PUBLIC_IP=$PUBLIC_IP/$PUBLIC_PREFIX" >> $CONF_FILE
-                echo "GW=$PUBLIC_GATEWAY" >> $CONF_FILE
-                echo "DNS1=$DNS1" >> $CONF_FILE
-                echo "DNS2=$DNS2" >> $CONF_FILE
-                echo "PRIVATE_IP=$PRIVATE_IP/$PRIVATE_PREFIX" >> $CONF_FILE
-                echo "DHCP=on" >> $CONF_FILE
-                if [ -r /var/run/sshd.pid ]; then
-                        echo "SSH=on" >> $CONF_FILE
-                else
-                        echo "SSH=off" >> $CONF_FILE
+                        PUBLIC_IP=`grep IPADDR /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2`       # @ip du portail (côté Internet)
+                        PUBLIC_NETMASK=`grep NETMASK /etc/sysconfig/network-scripts/ifcfg-$EXTIF|cut -d"=" -f2`
+                        PUBLIC_PREFIX=`/bin/ipcalc -p $PUBLIC_IP $PUBLIC_NETMASK |cut -d"=" -f2`                # prefixe du réseau (ex. 24)
+                        PUBLIC_GATEWAY=`grep GATEWAY /etc/sysconfig/network-scripts/default-ifcfg-$EXTIF|cut -d"=" -f2`
+                        DNS1=`grep DNS1 /etc/sysconfig/network-scripts/default-ifcfg-$EXTIF|cut -d"=" -f2`      # @ip 1er DNS
+                        DNS2=`grep DNS2 /etc/sysconfig/network-scripts/default-ifcfg-$EXTIF|cut -d"=" -f2`      # @ip 2ème DNS
+                        DNS1=${DNS1:=208.67.220.220}
+                        DNS2=${DNS2:=208.67.222.222}
+                        PRIVATE_IP=`grep IPADDR /etc/sysconfig/network-scripts/ifcfg-$INTIF|cut -d"=" -f2`      # @ip du portail (côté LAN)
+                        PRIVATE_NETMASK=`grep NETMASK /etc/sysconfig/network-scripts/ifcfg-$INTIF|cut -d"=" -f2`
+                        private_network_calc
+                        echo "PUBLIC_IP=$PUBLIC_IP/$PUBLIC_PREFIX" >> $CONF_FILE
+                        echo "GW=$PUBLIC_GATEWAY" >> $CONF_FILE
+                        echo "DNS1=$DNS1" >> $CONF_FILE
+                        echo "DNS2=$DNS2" >> $CONF_FILE
+                        echo "PRIVATE_IP=$PRIVATE_IP/$PRIVATE_PREFIX" >> $CONF_FILE
+                        echo "DHCP=on" >> $CONF_FILE
+                        if [ -r /var/run/sshd.pid ]; then
+                                echo "SSH=on" >> $CONF_FILE
+                        else
+                                echo "SSH=off" >> $CONF_FILE
+                        fi
+                        echo "QOS=off" >> $CONF_FILE
+                        if [ `grep ^ldap /etc/raddb/sites-available/alcasar | wc -l` -eq "0" ];  then
+                                echo "LDAP=off" >> $CONF_FILE
+                        else
+                                echo "LDAP=on" >> $CONF_FILE
+                        fi
+                        echo "PROTOCOLS_FILTERING=off" >> $CONF_FILE
+                        echo "DNS_FILTERING=off" >> $CONF_FILE
+                        echo "WEB_ANTIVIRUS=on" >> $CONF_FILE
+                        cp $CONF_FILE $DIR_UPDATE/etc/
                 fi
-                echo "QOS=off" >> $CONF_FILE
-                if [ `grep ^ldap /etc/raddb/sites-available/alcasar | wc -l` -eq "0" ];  then
-                        echo "LDAP=off" >> $CONF_FILE
-                else
-                        echo "LDAP=on" >> $CONF_FILE
-                fi
-                echo "PROTOCOLS_FILTERING=off" >> $CONF_FILE
-                echo "DNS_FILTERING=off" >> $CONF_FILE
-                echo "WEB_ANTIVIRUS=on" >> $CONF_FILE
-                fi
-                cp $CONF_FILE $DIR_UPDATE/etc/
 # création de l'archive
                 cd /tmp
                 tar -cf alcasar-conf.tar conf/

Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 635 → Rev 636