From 4c606baa053c5395e83ebfb48a45913625fca7c5 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 28 三月 2017 15:35:58 +0800
Subject: [PATCH] add config
---
ProxyConsole/auto-net-ip.sh | 11 +++++++++++
ProxyConsole/config.mediaalarm8.json | 6 ++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ProxyConsole/auto-net-ip.sh b/ProxyConsole/auto-net-ip.sh
new file mode 100644
index 0000000..62b7570
--- /dev/null
+++ b/ProxyConsole/auto-net-ip.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+#crontab:
+#*/2 * * * * /bin/sh /opt/auto-net-ip.sh > /dev/null 2>&1
+
+HAS_NET=`ifconfig | grep enp1s0 | grep 172.16`
+
+if [ -z "$HAS_NET" ]; then
+ echo "set ip address"
+ ifconfig enp1s0 172.16.23.10/16
+fi
diff --git a/ProxyConsole/config.mediaalarm8.json b/ProxyConsole/config.mediaalarm8.json
index 6f22f38..4ba4707 100644
--- a/ProxyConsole/config.mediaalarm8.json
+++ b/ProxyConsole/config.mediaalarm8.json
@@ -82,7 +82,7 @@
"channel" : 0,
"byWallNo" : 1,
"dwSubWinNo" : 1,
- "dwWinNo" : 18,
+ "dwWinNo" : [15,18],
"lAlarmOutPort" : 1
}
},
@@ -450,6 +450,7 @@
}
},
+
{
"id" : 18,
"type" : 4,
@@ -475,7 +476,6 @@
"lAlarmOutPort" : 1
}
},
-
{
"id" : 19,
"type" : 4,
@@ -501,8 +501,6 @@
"lAlarmOutPort" : 1
}
}
-
-
]
}
\ No newline at end of file
--
Gitblit v1.8.0