Changeset 03dc5e370ef4fbf66e34cbe5bc5b878ed764149c

Show
Ignore:
Timestamp:
06/08/09 11:19:03 (3 years ago)
Author:
Neutron Soutmun <neo.neutron@…>
Children:
2f0141c49bb55157f24738404aa77367a6a45fed
Parents:
96808c5450804cf9cc6a590500ccce6131c2b937
git-committer:
Neutron Soutmun <neo.neutron@…> (06/08/09 11:19:03)
Message:

Fix bashisms and enable http login

  • Fix bashisms of firewall.sh script.
  • Enable http login which only https enabled before.
  • Do not redirect the local web traffic to the proxy.
Location:
tools
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • tools/firewall.sh.in

    r9679928 r03dc5e3  
    536536  # SQUID Cache-Proxy 
    537537  ## 
    538   if [ "$PROXY" = "yes" -o "$PROXY" = "transparent" ]; then 
    539     if [ "$PROXY_HOST" = "localhost" -o "$PROXY_HOST" = "127.0.0.1" ]; then 
     538  if [ "$PROXY" = "yes" ] || [ "$PROXY" = "transparent" ]; then 
     539    if [ "$PROXY_HOST" = "localhost" ] || [ "$PROXY_HOST" = "127.0.0.1" ]; then 
    540540      $IPTABLES -A $CHAIN_INPUT_AUTH -p tcp --dport $PROXY_PORT -j ACCEPT 
    541541    fi 
    542542 
    543543    if [ "$PROXY" = "transparent" ]; then 
    544       if [ "$PROXY_HOST" = "localhost" -o "$PROXY_HOST" = "127.0.0.1" ]; then 
     544      if [ "$PROXY_HOST" = "localhost" ] || [ "$PROXY_HOST" = "127.0.0.1" ]; then 
    545545        $IPTABLES -t nat -A $CHAIN_NAT_PREROUTING -p tcp --dport http \ 
     546          -d ! $VSERVER_IP \ 
    546547          -m connmark --mark 2/2 -j REDIRECT --to-ports $PROXY_PORT 
    547548      else 
    548549        $IPTABLES -t nat -A $CHAIN_NAT_PRETROUTING -p tcp --dport http \ 
     550          -d ! $VSERVER_IP \ 
    549551          -m connmark --mark 2/2 \ 
    550552          -j DNAT --to-destination $PROXY_HOST:$PROXY_PORT 

  • tools/weblogin-config-update.sh.in

    r71de5a9 r03dc5e3  
    4242  NAS_IP_ADDRESS=`get_config_value $SETNAME vserver_ip $file` 
    4343  NAS_LOGIN_HOST=`get_config_value $SETNAME vserver_fqdn $file` 
    44   NAS_LOGIN_PROTO="https" 
    45   NAS_LOGIN_PORT="443" 
     44  NAS_LOGIN_PROTO=`get_config_value $SETNAME nas_login_proto $file` 
     45  test -z "$NAS_LOGIN_PROTO" && NAS_LOGIN_PROTO="https" 
     46 
     47  NAS_LOGIN_PORT=`get_config_value $SETNAME nas_login_port $file` 
     48  if [ -z "$NAS_LOGIN_PORT" ]; then 
     49    if [ "$NAS_LOGIN_PROTO" = "https" ]; then 
     50      NAS_LOGIN_PORT="443" 
     51    else 
     52      NAS_LOGIN_PORT="80" 
     53    fi 
     54  fi 
    4655  NAS_PORT=`get_config_value $SETNAME nas_port $file` 
    4756  NAS_LOGIN_TITLE=`get_config_value $SETNAME nas_login_title $file`