| 76,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 |
| 100,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 |
| 116,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/ |