39,7 → 39,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` |
DNS1=`grep "DNS1" $CONF_FILE | cut -d '=' -f 2` # server DNS1 (for WL domain names) |
DNS1=`grep ^DNS1= $CONF_FILE | cut -d'=' -f2` # server DNS1 (for WL domain names) |
DOMAIN=${DOMAIN:=localdomain} |
DATE=`date '+%d %B %Y - %Hh%M'` |
|
175,7 → 175,7 |
;; |
--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` |
PRIVATE_IP_MASK=`grep ^PRIVATE_IP= $CONF_FILE|cut -d"=" -f2` |
check=$(echo $PRIVATE_IP_MASK | egrep $PTN) |
if [[ "$?" -ne 0 ]] |
then |
182,7 → 182,7 |
echo "Syntax error for PRIVATE_IP_MASK ($PRIVATE_IP_MASK)" |
exit 0 |
fi |
PUBLIC_IP_MASK=`grep ^PUBLIC_IP $CONF_FILE|cut -d"=" -f2` |
PUBLIC_IP_MASK=`grep ^PUBLIC_IP= $CONF_FILE|cut -d"=" -f2` |
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]?)\b" |
if [[ "$PUBLIC_IP_MASK" == "dhcp" ]] |
then |
197,7 → 197,7 |
fi |
PUBLIC_IP=`echo $PUBLIC_IP_MASK | cut -d"/" -f1` |
PUBLIC_NETMASK=`/bin/ipcalc -m $PUBLIC_IP_MASK | cut -d"=" -f2` |
PUBLIC_GATEWAY=`grep ^GW $CONF_FILE|cut -d"=" -f2` |
PUBLIC_GATEWAY=`grep ^GW= $CONF_FILE|cut -d"=" -f2` |
check=$(echo $PUBLIC_GATEWAY | egrep $PTN) |
if [[ "$?" -ne 0 ]] |
then |
205,7 → 205,7 |
exit 0 |
fi |
fi |
DNS1=`grep ^DNS1 $CONF_FILE|cut -d"=" -f2` |
DNS1=`grep ^DNS1= $CONF_FILE|cut -d"=" -f2` |
check=$(echo $DNS1 | egrep $PTN) |
if [[ "$?" -ne 0 ]] |
then |
212,7 → 212,7 |
echo "Syntax error for the IP address of the first DNS server ($DNS1)" |
exit 0 |
fi |
DNS2=`grep ^DNS2 $CONF_FILE|cut -d"=" -f2` |
DNS2=`grep ^DNS2= $CONF_FILE|cut -d"=" -f2` |
check=$(echo $DNS2 | egrep $PTN) |
if [[ "$?" -ne 0 ]] |
then |
222,9 → 222,9 |
PRIVATE_IP=`echo $PRIVATE_IP_MASK | cut -d"/" -f1` |
PRIVATE_NETMASK=`/bin/ipcalc -m $PRIVATE_IP_MASK | cut -d"=" -f2` |
private_network_calc |
INSTALL_DATE=`grep INSTALL_DATE $CONF_FILE|cut -d"=" -f2` |
ORGANISME=`grep ORGANISM $CONF_FILE|cut -d"=" -f2` |
DHCP_mode=`grep DHCP= $CONF_FILE|cut -d"=" -f2` |
INSTALL_DATE=`grep ^INSTALL_DATE= $CONF_FILE|cut -d"=" -f2` |
ORGANISME=`grep ^ORGANISM= $CONF_FILE|cut -d"=" -f2-` |
DHCP_mode=`grep ^DHCP= $CONF_FILE|cut -d"=" -f2` |
if [ "$PARENT_SCRIPT" != "alcasar.sh" ] # don't launch on install stage |
then |
if [ $DHCP_mode = "off" ] || [ $DHCP_mode = "Off" ] || [ $DHCP_mode = "OFF" ] |
388,7 → 388,7 |
/usr/bin/systemctl reload httpd && echo -n ", httpd" |
fi |
# Start / Stop SSH Daemon |
ssh_active=`grep SSH= $CONF_FILE|cut -d"=" -f2` |
ssh_active=`grep ^SSH= $CONF_FILE|cut -d"=" -f2` |
if [ $ssh_active = "on" ] |
then |
/usr/bin/systemctl enable sshd.service |