Changeset 619 for branches

Show
Ignore:
Timestamp:
10/12/11 22:40:40 (7 months ago)
Author:
JulioCP
Message:

nightwing-wa: Updated the marking in nw_ts and the web server in nw_conf.

Location:
branches/nightwing-wa/nightwing/usr/bin
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/nightwing-wa/nightwing/usr/bin/nw_conf

    r586 r619  
    11#!/bin/sh 
    22### 
    3 # Copyright (C) 2008 - 2010: Martin A. Campff, Sebastián D. Criado, Gustavo Lindberg, 
     3# Copyright (C) 2008 - 2011: Martin A. Campff, Sebastián D. Criado, Gustavo Lindberg, 
    44# Julio C. Puigpinos 
    55# Contact list: lugro-mesh-dev@lugro-mesh.org.ar  
    6 # Version 0.7WA 
     6# Version 0.7.8WA 
    77# 
    88# This program is free software: you can redistribute it and/or modify 
    … …  
    163163                if [[ "${#HTTPPASS}" -gt 7 && "${#HTTPPASS}" -lt 64 ]]; 
    164164                then 
    165                         echo "/:$HTTPUSER:$(httpd -m $HTTPPASS)" > /etc/httpd.conf 
     165                        echo "/:$HTTPUSER:$(uhttpd -m $HTTPPASS)" > /etc/httpd.conf 
    166166                        HTTPD_CHANGE=1 
    167167                else 
    … …  
    410410                        echo "Do you want to change the Web access admin? [y/n]: " 
    411411                        case_httpd_access 
    412                         if  [ $HTTPD_CHANGE == "1" ]; then kill -9 $(pidof httpd);/etc/init.d/httpd start;fi 
     412                        if  [ $HTTPD_CHANGE == "1" ]; then /etc/init.d/uhttpd restart;fi 
    413413                        menu_2 
    414414                        ;; 

  • branches/nightwing-wa/nightwing/usr/bin/nw_ts

    r517 r619  
    11#!/bin/sh /etc/rc.common 
    22### 
    3 # Copyright (C) 2008 - 2010: Sebastian Criado, Julio C. Puigpinos, 
     3# Copyright (C) 2008 - 2011: Sebastian Criado, Julio C. Puigpinos, 
    44# Bernardo Lamas, Emiliano Nuñez 
    55# Contact list: lugro-mesh-dev@lugro-mesh.org.ar 
    6 # Version 0.4 
     6# Version 0.5 
    77# 
    88# Originally based on Robert W. Brewer script (rwb123 at gmail dot com) 
    … …  
    9292    $IPTABLES -t mangle -N $CHAIN 
    9393       $IPTABLES -t mangle -I $CHAIN -p udp -j MARK --set-mark 20 
    94        $IPTABLES -t mangle -I $CHAIN -p icmp -j MARK --set-mark 20 
     94       $IPTABLES -t mangle -I $CHAIN -p icmp -j MARK --set-mark 30 
    9595       $IPTABLES -t mangle -I $CHAIN -p tcp -m multiport --sport 22 -j MARK --set-mark 20 
    9696       $IPTABLES -t mangle -I $CHAIN -p tcp -m multiport --sport 80,443,20,21,25,110 -j MARK --set-mark 10