| Message ID | 20160608082409.5161-3-tk+ff@meskal.net |
|---|---|
| State | Accepted, archived |
| Commit | 006d92b4ef4e1011ace64dc71446d7b77dc30397 |
| Headers | show |
diff --git a/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher deleted file mode 100644 index 9f308be..0000000 --- a/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher +++ /dev/null @@ -1,10 +0,0 @@ -config 'script' - option 'error_level' '0' - option 'logfile' '/var/log/nodewatcher.log' - option 'data_file' '/tmp/crawldata/node.data' - option 'status_text_file' '/tmp/status.txt' - -config 'network' - option 'mesh_interface' 'br-mesh' - option 'iface_blacklist' 'lo ifb0' # This devices won't be sent to netmon at all - option 'ip_whitelist' 'br-mesh' # For this devices the IPs will be sent to netmon diff --git a/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher new file mode 100644 index 0000000..4e56435 --- /dev/null +++ b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher @@ -0,0 +1,18 @@ +#!/bin/sh + +touch /etc/config/nodewatcher + +uci batch <<EOF + add nodewatcher script + set nodewatcher.@script[0].error_level='0' + set nodewatcher.@script[0].logfile='/var/log/nodewatcher.log' + set nodewatcher.@script[0].data_file='/tmp/crawldata/node.data' + set nodewatcher.@script[0].status_text_file='/tmp/status.txt' + add nodewatcher network + set nodewatcher.@network[0].mesh_interface='br-mesh' + set nodewatcher.@network[0].iface_blacklist='lo ifb0' + set nodewatcher.@network[0].ip_whitelist='br-mesh' +EOF +uci commit + +exit 0
Sieht auch gut aus: Reviewed-by: Jan Kraus <mayosemmel@gmail.com> Am Mittwoch, den 08.06.2016, 10:24 +0200 schrieb Tobias Klaus: > Signed-off-by: Tobias Klaus <tk+ff@meskal.net> > --- > .../fff/fff-nodewatcher/files/etc/config/nodewatcher | 10 ---------- > .../files/etc/uci-defaults/93-fff-nodewatcher | 18 ++++++++++++++++++ > 2 files changed, 18 insertions(+), 10 deletions(-) > delete mode 100644 src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher > create mode 100644 src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher > > diff --git a/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher > deleted file mode 100644 > index 9f308be..0000000 > --- a/src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher > +++ /dev/null > @@ -1,10 +0,0 @@ > -config 'script' > - option 'error_level' '0' > - option 'logfile' '/var/log/nodewatcher.log' > - option 'data_file' '/tmp/crawldata/node.data' > - option 'status_text_file' '/tmp/status.txt' > - > -config 'network' > - option 'mesh_interface' 'br-mesh' > - option 'iface_blacklist' 'lo ifb0' # This devices won't be sent to netmon at all > - option 'ip_whitelist' 'br-mesh' # For this devices the IPs will be sent to netmon > diff --git a/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher > new file mode 100644 > index 0000000..4e56435 > --- /dev/null > +++ b/src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher > @@ -0,0 +1,18 @@ > +#!/bin/sh > + > +touch /etc/config/nodewatcher > + > +uci batch <<EOF > + add nodewatcher script > + set nodewatcher.@script[0].error_level='0' > + set nodewatcher.@script[0].logfile='/var/log/nodewatcher.log' > + set nodewatcher.@script[0].data_file='/tmp/crawldata/node.data' > + set nodewatcher.@script[0].status_text_file='/tmp/status.txt' > + add nodewatcher network > + set nodewatcher.@network[0].mesh_interface='br-mesh' > + set nodewatcher.@network[0].iface_blacklist='lo ifb0' > + set nodewatcher.@network[0].ip_whitelist='br-mesh' > +EOF > +uci commit > + > +exit 0 > -- > 2.8.3 >
Signed-off-by: Tobias Klaus <tk+ff@meskal.net> --- .../fff/fff-nodewatcher/files/etc/config/nodewatcher | 10 ---------- .../files/etc/uci-defaults/93-fff-nodewatcher | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) delete mode 100644 src/packages/fff/fff-nodewatcher/files/etc/config/nodewatcher create mode 100644 src/packages/fff/fff-nodewatcher/files/etc/uci-defaults/93-fff-nodewatcher