diff --git a/RMxxx_rgmii_toolkit.sh b/RMxxx_rgmii_toolkit.sh index 9140e5e..dc0084d 100644 --- a/RMxxx_rgmii_toolkit.sh +++ b/RMxxx_rgmii_toolkit.sh @@ -379,7 +379,7 @@ install_lighttpd() { rm /lib/systemd/system/multi-user.target.wants/simpleadmin_httpd.service fi - /opt/bin/opkg install lighttpd lighttpd-mod-auth lighttpd-mod-authn_file lighttpd-mod-cgi lighttpd-mod-openssl lighttpd-mod-proxy + /opt/bin/opkg install sudo lighttpd lighttpd-mod-auth lighttpd-mod-authn_file lighttpd-mod-cgi lighttpd-mod-openssl lighttpd-mod-proxy # Ensure rc.unslung doesn't try to start it # Dynamically find and remove any Lighttpd-related init script for script in /opt/etc/init.d/*lighttpd*; do @@ -394,6 +394,7 @@ install_lighttpd() { wget -O "$SIMPLE_ADMIN_DIR/lighttpd.conf" https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/lighttpd.conf wget -O "/lib/systemd/system/lighttpd.service" https://raw.githubusercontent.com/$GITUSER/quectel-rgmii-toolkit/$GITTREE/simpleadmin/systemd/lighttpd.service ln -sf "/lib/systemd/system/lighttpd.service" "/lib/systemd/system/multi-user.target.wants/" + echo "www-data ALL = (root) NOPASSWD: /usr/sbin/iptables, /usr/sbin/ip6tables, /usrdata/simplefirewall/ttl-override" > /opt/etc/sudoers.d/www-data openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \ -subj "/C=US/ST=MI/L=Romulus/O=RMIITools/CN=localhost" \ diff --git a/simpleadmin/lighttpd.conf b/simpleadmin/lighttpd.conf index 145d673..7f38c2d 100644 --- a/simpleadmin/lighttpd.conf +++ b/simpleadmin/lighttpd.conf @@ -6,7 +6,7 @@ server.modules = ( "mod_authn_file", ) -server.username = "nobody" +server.username = "www-data" server.groupname = "dialout" server.port = 80 diff --git a/simpleadmin/www/cgi-bin/get_ttl_status b/simpleadmin/www/cgi-bin/get_ttl_status index 764f6f1..dc2d54b 100644 --- a/simpleadmin/www/cgi-bin/get_ttl_status +++ b/simpleadmin/www/cgi-bin/get_ttl_status @@ -1,7 +1,7 @@ #!/bin/bash # Check iptables for ttlvalue -ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}') +ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}' | head -n1) ttlenabled=true; # Set Variables @@ -16,4 +16,5 @@ cat </dev/null || true - ip6tables -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true + /opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j TTL --ttl-set ${ttlcheck} &>/dev/null || true + /opt/bin/sudo /usr/sbin/ip6tables -w 5 -t mangle -D POSTROUTING -o rmnet+ -j HL --hl-set ${ttlcheck} &>/dev/null || true fi # Echo TTL to file echo $setTTL > /usrdata/simplefirewall/ttlvalue # Set Start Service - /usrdata/simplefirewall/ttl-override start + /opt/bin/sudo /usrdata/simplefirewall/ttl-override start fi # Check iptables for ttlvalue -ttlvalue=$(iptables -t mangle -vnL | grep TTL | awk '{print $13}') +ttlvalue=$(/opt/bin/sudo /usr/sbin/iptables -w 5 -t mangle -vnL | grep TTL | awk '{print $13}') ttlenabled=true; # Set Variables @@ -58,4 +58,5 @@ cat <