| 31,10 → 31,9 |
|---|
| INT_DNS_mode=`grep ^INT_DNS_ACTIVE= $CONF_FILE|cut -d"=" -f2` |
| HOSTNAME=`grep ^HOSTNAME= $CONF_FILE|cut -d"=" -f2` |
| DOMAIN=`grep ^DOMAIN= $CONF_FILE|cut -d"=" -f2` |
| SED="/bin/sed -i" |
| DNS1=`grep ^DNS1= $CONF_FILE | cut -d'=' -f2` # server DNS1 (for WL domain names) |
| DOMAIN=${DOMAIN:=localdomain} |
| DNS1=`grep ^DNS1= $CONF_FILE | cut -d'=' -f2` # To configure WL domain names |
| HTTPS_LOGIN=`grep ^HTTPS_LOGIN= $CONF_FILE | cut -d'=' -f2` |
| SED="/bin/sed -i" |
| |
| private_network_calc () |
| { |
| 479,25 → 478,6 |
|---|
| # gammu-smsd |
| $SED "s?^user =.*?user = $DB_USER?g" /etc/gammu_smsd_conf |
| $SED "s?^password =.*?password = $DB_PASS?g" /etc/gammu_smsd_conf |
| # HTTPS login (Y/n) |
| if [ "$HTTPS_LOGIN" = "on" ] || [ "$HTTPS_LOGIN" = "On" ] || [ "$HTTPS_LOGIN" = "ON" ] |
| then |
| $SED "s?^HTTPS_LOGIN=.*?HTTPS_LOGIN=on?" $CONF_FILE |
| $SED "s?^HTTPS_CHILLI=.*?HTTPS_CHILLI=on?" $CONF_FILE |
| $SED "s?^uamserver.*?uamserver\thttps://$HOSTNAME.$DOMAIN/intercept.php?" /etc/chilli.conf |
| $SED "s?^#redirssl.*?redirssl?" /etc/chilli.conf |
| $SED "s?^#uamuissl.*?uamuissl?" /etc/chilli.conf |
| rm -f /etc/lighttpd/vhosts.d/alcasar.conf |
| ln -s /etc/lighttpd/vhosts.d/alcasar-with-ssl.conf /etc/lighttpd/vhosts.d/alcasar.conf |
| else |
| $SED "s?^HTTPS_LOGIN=.*?HTTPS_LOGIN=off?" $CONF_FILE |
| $SED "s?^HTTPS_CHILLI=.*?HTTPS_CHILLI=off?" $CONF_FILE |
| $SED "s?^uamserver.*?uamserver\thttp://$HOSTNAME.$DOMAIN/intercept.php?" /etc/chilli.conf |
| $SED "s?^redirssl.*?#&?" /etc/chilli.conf |
| $SED "s?^uamuissl.*?#&?" /etc/chilli.conf |
| rm -f /etc/lighttpd/vhosts.d/alcasar.conf |
| ln -s /etc/lighttpd/vhosts.d/alcasar-without-ssl.conf /etc/lighttpd/vhosts.d/alcasar.conf |
| fi |
| # Services start |
| if [ "$PARENT_SCRIPT" != "alcasar.sh" ] # don't launch on install stage |
| then |