Merge pull request #4 from Ysurac/develop

同步

luci-app-snmpd/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI SNMPD Interface
-LUCI_DEPENDS:=+snmpd
+LUCI_DEPENDS:=+snmpd +snmptrapd +snmp-utils +snmp-mibs
 
 PKG_LICENSE:=GPLv3
 

luci-app-snmpd/root/etc/init.d/snmpd

@@ -344,5 +344,6 @@ service_triggers(){
 }
 
 service_started() {
+	[ "$snmp_enabled" -eq 0 ] && return
 	procd_set_config_changed firewall
 }

luci-mod-dashboard/htdocs/luci-static/resources/view/dashboard/css/custom.css

@@ -8,6 +8,7 @@
 
 .Dashboard h3 {
     color:#000;
+    background: transparent;
 }
 
 .Dashboard hr {
@@ -32,6 +33,13 @@
     background-color: #e0e0e0;
 }
 
+.Dashboard div > table > tbody > tr:nth-of-type(2n), div > .table > .tr:nth-of-type(2n) {
+    background-color: transparent;
+}
+.Dashboard .tr {
+    background-color: transparent;
+}
+
 .Dashboard .title {
     text-align: center;
 }

luci-theme-argon/htdocs/luci-static/argon/css/cascade.css

@@ -547,7 +547,7 @@ small {
   top: 0;
   float: left;
   width: 15%;
-  width: calc(0% + 10rem);
+  width: calc(0% + 20rem);
   height: 100%;
   background-color: #fff;
   background-color: var(--menu-bg-color);

luci-theme-argon/root/etc/uci-defaults/30_luci-theme-argon

@@ -1,7 +1,6 @@
 #!/bin/sh
 uci batch <<-EOF
 	set luci.themes.Argon=/luci-static/argon
-	set luci.main.mediaurlbase=/luci-static/argon
 	commit luci
 EOF
 [ -f /usr/lib/lua/luci/view/themes/argon/out_header_login.htm ] && mv -f /usr/lib/lua/luci/view/themes/argon/out_header_login.htm /usr/lib/lua/luci/view/header_login.htm

mptcp/files/usr/share/omr/post-tracking.d/post-tracking

@@ -27,7 +27,7 @@ set_route() {
 			interface_gw=$(ubus call network.interface.${INTERFACE}_4 status 2>/dev/null | jsonfilter -q -l 1 -e '@.inactive.route[@.target="0.0.0.0"].nexthop' | tr -d "\n")
 		fi
 		if [ "$interface_gw" != "" ] && [ "$interface_if" != "" ]; then
-			_log "$PREVINTERFACE down. Replace default route by $interface_gw dev $interface_if"
+			[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "$PREVINTERFACE down. Replace default route by $interface_gw dev $interface_if"
 			[ "$SETDEFAULT" = "yes" ] && ip route replace default scope global nexthop via $interface_gw dev $interface_if
 			ip route replace default via $interface_gw dev $interface_if table 991337 && SETROUTE=true
 		fi
@@ -45,7 +45,7 @@ set_server_default_route() {
 	[ -z "$multipath_config_route" ] && multipath_config_route=$(uci -q get network.$OMR_TRACKER_INTERFACE.multipath || echo "off")
 	[ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.multipathvpn)" = "1" ] && multipath_config_route="$(uci -q get openmptcprouter.ovpn${OMR_TRACKER_INTERFACE}.multipath || echo "off")"
 	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric 1 | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ]; then
-		_log "Set server $server ($serverip) default route via $OMR_TRACKER_DEVICE_GATEWAY"
+		[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Set server $server ($serverip) default route via $OMR_TRACKER_DEVICE_GATEWAY"
 		if [ "$(ip r show $serverip | grep nexthop)" != "" ]; then
 			ip r delete $serverip >/dev/null 2>&1
 		fi
@@ -61,7 +61,7 @@ delete_server_default_route() {
 	config_get disabled $server disabled
 	[ "$disabled" = "1" ] && return
 	if [ "$serverip" != "" ] && [ "$(ip route show $serverip metric 1)" != "" ]; then
-		_log "Delete server ($serverip) default route"
+		[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Delete server ($serverip) default route"
 		ip route del $serverip metric 1 >/dev/null 2>&1
 	fi
 }
@@ -185,12 +185,12 @@ set_server_all_routes() {
 			while [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "$serverip" ] && [ "$(ip r show $serverip | grep -v nexthop | sed 's/ //g' | tr -d '\n')" != "" ]; do
 				ip r del $serverip
 			done
-			_log "Set server $server ($serverip) default route $serverip $routesintf"
+			[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Set server $server ($serverip) default route $serverip $routesintf"
 			ip route replace $serverip scope global $routesintf
-			_log "New server route is $(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')"
+			[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "New server route is $(ip r show $serverip metric 0 | tr -d '\t' | tr -d '\n')"
 		}
 		[ -n "$routesintfbackup" ] && ([ "$nbintfb" -gt "1" ] && [ "$(ip r show $serverip metric 999 | tr -d '\t' | tr -d '\n')" != "$serverip $routesintfbackup " ]) || ([ "$nbintfb" = "1" ] && [ "$(ip r show $serverip metric 999 | grep $uintfb)" = "" ]) && {
-			_log "Set server $server ($serverip) backup default route $serverip $routesintfbackup nbintfb $nbintfb $OMR_TRACKER_DEVICE"
+			[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Set server $server ($serverip) backup default route $serverip $routesintfbackup nbintfb $nbintfb $OMR_TRACKER_DEVICE"
 			ip route replace $serverip scope global metric 999 $routesintfbackup
 		}
 	fi
@@ -218,7 +218,7 @@ set_server_route() {
 	interface_current_config=$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.state || echo "up")
 	#if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ] && [ "$multipath_current_config" = "" ]; then
 	if [ "$serverip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $serverip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ] && [ "$interface_current_config" = "up" ] && [ "$interface_up" = "true" ]; then
-		_log "Set server $server ($serverip) route via $OMR_TRACKER_DEVICE_GATEWAY metric $metric"
+		[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Set server $server ($serverip) route via $OMR_TRACKER_DEVICE_GATEWAY metric $metric"
 		ip route replace $serverip via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE metric $metric
 	fi
 	if [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep default | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ] && [ "$multipath_config_route" != "off" ] && [ "$interface_current_config" = "up" ] && [ "$interface_up" = "true" ]; then
@@ -344,7 +344,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
 	fi
 	mail_alert="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.mail_alert)"
 	[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
-	[ "$mail_alert" = "1" ] && {
+	[ "$mail_alert" = "1" ] && [ -n "$(uci -q get mail.default.to)" ] && {
 		OMR_SYSNAME="$(uci -q get system.@system[0].hostname)"
 		if [ "$(uci -q get omr-tracker.defaults.mail_down_subject)" != "" ] && [ "$(uci -q get omr-tracker.defaults.mail_down_message)" != "" ]; then
 			mail_subject="$(uci -q get omr-tracker.defaults.mail_down_subject)"
@@ -474,7 +474,7 @@ if [ "$OMR_TRACKER_PREV_STATUS" != "" ] && [ "$OMR_TRACKER_PREV_STATUS" != "$OMR
 	_log "$OMR_TRACKER_INTERFACE ($OMR_TRACKER_DEVICE) switched up"
 	mail_alert="$(uci -q get omr-tracker.$OMR_TRACKER_INTERFACE.mail_alert)"
 	[ -z "$mail_alert" ] && mail_alert="$(uci -q get omr-tracker.defaults.mail_alert)"
-	[ "$mail_alert" = "1" ] && {
+	[ "$mail_alert" = "1" ] && [ -n "$(uci -q get mail.default.to)" ] && {
 		OMR_SYSNAME="$(uci -q get system.@system[0].hostname)"
 		if [ "$(uci -q get omr-tracker.defaults.mail_up_subject)" != "" ] && [ "$(uci -q get omr-tracker.defaults.mail_up_message)" != "" ]; then
 			mail_subject="$(uci -q get omr-tracker.defaults.mail_up_subject)"

omr-tracker/files/etc/uci-defaults/omr-tracker

@@ -28,6 +28,14 @@ if [ "$(uci -q get omr-tracker.shadowsocks)" != "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		rename omr-tracker.shadowsocks=proxy
 		uci set omr-tracker.proxy=proxy
+		uci commit omr-tracker
+	EOF
+fi
+
+if [ "$(uci -q get omr-tracker.proxy)" = "shadowsocks" ]; then
+	uci -q batch <<-EOF >/dev/null
+		uci set omr-tracker.proxy=proxy
+		uci commit omr-tracker
 	EOF
 fi