| 49,7 → 49,7 |
|---|
| PRIVATE_FIRST_IP=`echo $PRIVATE_NETWORK | cut -d"." -f1-3`"."`expr $private_network_ending + 1` # First network address (ex.: 192.168.182.1) |
| PRIVATE_SECOND_IP=`echo $PRIVATE_NETWORK | cut -d"." -f1-3`"."`expr $private_network_ending + 2` # second network address (ex.: 192.168.182.2) |
| PRIVATE_LAST_IP=`echo $PRIVATE_BROADCAST | cut -d"." -f1-3`"."`expr $private_broadcast_ending - 1` # last network address (ex.: 192.168.182.254) |
| PRIVATE_MAC=`/sbin/ip link show $INTIF | grep ether | cut -d" " -f6` # MAC address of INTIF |
| PRIVATE_MAC=`/sbin/ip link show $INTIF | grep ether | cut -d" " -f6| sed 's/:/-/g'| awk '{print toupper($0)}'` # MAC address of INTIF |
| } |
| |
| usage="Usage: alcasar-conf.sh {--create or -create} | {--load or -load} | {--apply or -apply}" |
| 202,8 → 202,6 |
|---|
| ORGANISME=`grep ORGANISM $CONF_FILE|cut -d"=" -f2` |
| DOMAIN=`grep DOMAIN $CONF_FILE|cut -d"=" -f2` |
| DHCP_mode=`grep DHCP= $CONF_FILE|cut -d"=" -f2` |
| # create file for DHCP static ip. Reserve the second IP address for INTIF (the first one is for tun0) |
| echo "$PRIVATE_MAC $PRIVATE_SECOND_IP" > $DIR_ETC/alcasar-ethers |
| if [ "$PARENT_SCRIPT" != "alcasar.sh" ] # don't launch on install stage |
| then |
| if [ $DHCP_mode = "off" ] |
| 255,6 → 253,8 |
|---|
| $SED "s?^dns1.*?dns1\t\t$PRIVATE_IP?g" /etc/chilli.conf |
| $SED "s?^dns2.*?dns2\t\t$PRIVATE_IP?g" /etc/chilli.conf |
| $SED "s?^uamlisten.*?uamlisten\t$PRIVATE_IP?g" /etc/chilli.conf |
| # modify the DHCP static ip file. Reserve the second IP address for INTIF (the first one is for tun0). Keep previous entries |
| $SED "s?^$PRIVATE_MAC.*?$PRIVATE_MAC $PRIVATE_SECOND_IP?" $DIR_ETC/alcasar-ethers |
| # dnsmasq |
| $SED "/127.0.0.1/!s?^listen-address=.*?listen-address=$PRIVATE_IP?g" /etc/dnsmasq.conf /etc/dnsmasq-blacklist.conf /etc/dnsmasq-whitelist.conf |
| for i in /etc/dnsmasq.conf /etc/dnsmasq-blacklist.conf |