[v2,2/2] fff-alfred-monitoring-proxy: add package

Submitted by Tim Niemeyer on Aug. 11, 2018, 5:19 p.m.

Details

Message ID 20180811171953.14822-2-tim@tn-x.org
State Superseded
Headers show

Commit Message

Tim Niemeyer Aug. 11, 2018, 5:19 p.m. 
From: Steffen Pankratz <kratz00@gmx.de>

CC: kratz00@gmx.de
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
- Changed subject
- Changed curl parameters
- Added firewall rule
- Configure alfred to be master
- Add fff-nodewatcher as dep, because we use the alfred config
Signed-off-by: Fabian Bläse <fabian@blaese.de>
- Fix alfred master mode introduced by packaging alfred
- Adjust monitoring-proxy waittime to suggestion

---

Changes in v2:
- change data handling during curl to pipe
- add newline on cron rule

 .../fff/fff-alfred-monitoring-proxy/Makefile       | 32 ++++++++++++++++++++++
 .../files/etc/uci-defaults/52-alfred-master        |  6 ++++
 .../files/usr/lib/filewall.d/06-enable-mc-out      |  1 +
 .../usr/lib/micron.d/fff-alfred-monitoring-proxy   |  1 +
 .../files/usr/sbin/alfred-monitoring-proxy         |  7 +++++
 5 files changed, 47 insertions(+)
 create mode 100644 src/packages/fff/fff-alfred-monitoring-proxy/Makefile
 create mode 100755 src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
 create mode 100644 src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
 create mode 100644 src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
 create mode 100755 src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy

Patch hide | download patch | download mbox 

diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
new file mode 100644
index 0000000..424dd58
--- /dev/null
+++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
@@ -0,0 +1,32 @@ 
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fff-alfred-monitoring-proxy
+PKG_VERSION:=0.0.1
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fff-alfred-monitoring-proxy
+    SECTION:=base
+    CATEGORY:=Freifunk
+    TITLE:= Freifunk-Franken Alfred-Monitoring-Proxy
+    URL:=https://www.freifunk-franken.de/
+    DEPENDS:=+micrond +fff-random +curl +alfred-json +fff-nodewatcher
+endef
+
+define Package/fff-alfred-monitoring-proxy/description
+ The Alfred-Monitoring-Proxy is used
+ to send node status information to https://monitoring.freifunk-franken.de/
+endef
+
+define Build/Prepare
+    echo "all: " > $(PKG_BUILD_DIR)/Makefile
+endef
+
+define Package/fff-alfred-monitoring-proxy/install
+    $(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,fff-alfred-monitoring-proxy))
diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
new file mode 100755
index 0000000..bf76a16
--- /dev/null
+++ b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
@@ -0,0 +1,6 @@ 
+#!/bin/sh
+
+uci -q set "alfred.alfred.mode=master"
+
+uci -q commit alfred
+
diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
new file mode 100644
index 0000000..15905de
--- /dev/null
+++ b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
@@ -0,0 +1 @@ 
+ebtables -P MULTICAST_OUT RETURN
diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
new file mode 100644
index 0000000..4571efc
--- /dev/null
+++ b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
@@ -0,0 +1 @@ 
+*/5 * * * * sleep $(/usr/bin/random 70 85); /usr/sbin/alfred-monitoring-proxy
diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy
new file mode 100755
index 0000000..c35e7f9
--- /dev/null
+++ b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy
@@ -0,0 +1,7 @@ 
+#!/bin/ash
+
+api_url="https://monitoring.freifunk-franken.de/api/alfred"
+fetch_id="64"
+
+(echo -n "{\"$fetch_id\": "; alfred-json -r "$fetch_id"; echo -n "}") | \
+    curl -k -v -H "Content-type: application/json; charset=UTF-8" -X POST --data "@-" $api_url

Comments

Adrian Schmutzler Aug. 11, 2018, 5:35 p.m. 
Hallo,

auch hier unten.

On August 11, 2018 7:19:53 PM GMT+02:00, Tim Niemeyer <tim@tn-x.org> wrote:
>From: Steffen Pankratz <kratz00@gmx.de>
>
>CC: kratz00@gmx.de

Brauchen wir das?

>Signed-off-by: Tim Niemeyer <tim@tn-x.org>
>- Changed subject
>- Changed curl parameters
>- Added firewall rule
>- Configure alfred to be master
>- Add fff-nodewatcher as dep, because we use the alfred config
>Signed-off-by: Fabian Bläse <fabian@blaese.de>
>- Fix alfred master mode introduced by packaging alfred
>- Adjust monitoring-proxy waittime to suggestion

Brauchen wir die ganzen persönlichen Änderungen? Ich würde die rausschmeißen und lieber erklären, was der patch tut. Ähnlich v1/2.

>
>---
>
>Changes in v2:
>- change data handling during curl to pipe
>- add newline on cron rule
>
>.../fff/fff-alfred-monitoring-proxy/Makefile       | 32
>++++++++++++++++++++++
> .../files/etc/uci-defaults/52-alfred-master        |  6 ++++
> .../files/usr/lib/filewall.d/06-enable-mc-out      |  1 +
> .../usr/lib/micron.d/fff-alfred-monitoring-proxy   |  1 +
> .../files/usr/sbin/alfred-monitoring-proxy         |  7 +++++
> 5 files changed, 47 insertions(+)
>create mode 100644
>src/packages/fff/fff-alfred-monitoring-proxy/Makefile
>create mode 100755
>src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
>create mode 100644
>src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
>create mode 100644
>src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
>create mode 100755
>src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy
>
>diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
>b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
>new file mode 100644
>index 0000000..424dd58
>--- /dev/null
>+++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
>@@ -0,0 +1,32 @@
>+include $(TOPDIR)/rules.mk
>+
>+PKG_NAME:=fff-alfred-monitoring-proxy
>+PKG_VERSION:=0.0.1
>+PKG_RELEASE:=1
>+
>+PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy
>+
>+include $(INCLUDE_DIR)/package.mk
>+
>+define Package/fff-alfred-monitoring-proxy
>+    SECTION:=base
>+    CATEGORY:=Freifunk
>+    TITLE:= Freifunk-Franken Alfred-Monitoring-Proxy
>+    URL:=https://www.freifunk-franken.de/
>+    DEPENDS:=+micrond +fff-random +curl +alfred-json +fff-nodewatcher
>+endef
>+
>+define Package/fff-alfred-monitoring-proxy/description
>+ The Alfred-Monitoring-Proxy is used
>+ to send node status information to
>https://monitoring.freifunk-franken.de/
>+endef
>+
>+define Build/Prepare
>+    echo "all: " > $(PKG_BUILD_DIR)/Makefile
>+endef
>+
>+define Package/fff-alfred-monitoring-proxy/install
>+    $(CP) ./files/* $(1)/
>+endef
>+
>+$(eval $(call BuildPackage,fff-alfred-monitoring-proxy))
>diff --git
>a/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
>new file mode 100755
>index 0000000..bf76a16
>--- /dev/null
>+++
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-defaults/52-alfred-master
>@@ -0,0 +1,6 @@
>+#!/bin/sh
>+
>+uci -q set "alfred.alfred.mode=master"
>+
>+uci -q commit alfred
>+
>diff --git
>a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
>new file mode 100644
>index 0000000..15905de
>--- /dev/null
>+++
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/filewall.d/06-enable-mc-out
>@@ -0,0 +1 @@
>+ebtables -P MULTICAST_OUT RETURN
>diff --git
>a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
>new file mode 100644
>index 0000000..4571efc
>--- /dev/null
>+++
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
>@@ -0,0 +1 @@
>+*/5 * * * * sleep $(/usr/bin/random 70 85);

Hier wäre 1-59/5 und random 10 25 besser, dann läuft das Skript nicht so lang ...

>/usr/sbin/alfred-monitoring-proxy
>diff --git
>a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy
>new file mode 100755
>index 0000000..c35e7f9
>--- /dev/null
>+++
>b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-monitoring-proxy
>@@ -0,0 +1,7 @@
>+#!/bin/ash
>+
>+api_url="https://monitoring.freifunk-franken.de/api/alfred"

Https ist okay ...

>+fetch_id="64"
>+
>+(echo -n "{\"$fetch_id\": "; alfred-json -r "$fetch_id"; echo -n "}")
>| \
>+    curl -k -v -H "Content-type: application/json; charset=UTF-8" -X
>POST --data "@-" $api_url

Das @- nimmt die Daten aus der pipe?

Schau mir beide patches dann daheim nochmal in Ruhe an und werde heute oder morgen ggf. reviewen...

Grüße

Adrian
Tim Niemeyer Aug. 11, 2018, 5:46 p.m. 
Hi Adrian

Am Samstag, den 11.08.2018, 19:35 +0200 schrieb Adrian Schmutzler:
> Hallo,
> 
> auch hier unten.
> 
> On August 11, 2018 7:19:53 PM GMT+02:00, Tim Niemeyer <tim@tn-x.org>
> wrote:
> > From: Steffen Pankratz <kratz00@gmx.de>
> > 
> > CC: kratz00@gmx.de
> 
> Brauchen wir das?
Kratz hat den Patch geschrieben und der Patch geht in seinem Namen ins
Repo.

> 
> > Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> > - Changed subject
> > - Changed curl parameters
> > - Added firewall rule
> > - Configure alfred to be master
> > - Add fff-nodewatcher as dep, because we use the alfred config
> > Signed-off-by: Fabian Bläse <fabian@blaese.de>
> > - Fix alfred master mode introduced by packaging alfred
> > - Adjust monitoring-proxy waittime to suggestion
> 
> Brauchen wir die ganzen persönlichen Änderungen? Ich würde die
> rausschmeißen und lieber erklären, was der patch tut. Ähnlich v1/2.
s.o.

> 
> > 
> > ---
> > 
> > Changes in v2:
> > - change data handling during curl to pipe
> > - add newline on cron rule
> > 
> > .../fff/fff-alfred-monitoring-proxy/Makefile       | 32
> > ++++++++++++++++++++++
> > .../files/etc/uci-defaults/52-alfred-master        |  6 ++++
> > .../files/usr/lib/filewall.d/06-enable-mc-out      |  1 +
> > .../usr/lib/micron.d/fff-alfred-monitoring-proxy   |  1 +
> > .../files/usr/sbin/alfred-monitoring-proxy         |  7 +++++
> > 5 files changed, 47 insertions(+)
> > create mode 100644
> > src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > create mode 100755
> > src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > defaults/52-alfred-master
> > create mode 100644
> > src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > create mode 100644
> > src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > create mode 100755
> > src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-
> > monitoring-proxy
> > 
> > diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > new file mode 100644
> > index 0000000..424dd58
> > --- /dev/null
> > +++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > @@ -0,0 +1,32 @@
> > +include $(TOPDIR)/rules.mk
> > +
> > +PKG_NAME:=fff-alfred-monitoring-proxy
> > +PKG_VERSION:=0.0.1
> > +PKG_RELEASE:=1
> > +
> > +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy
> > +
> > +include $(INCLUDE_DIR)/package.mk
> > +
> > +define Package/fff-alfred-monitoring-proxy
> > +    SECTION:=base
> > +    CATEGORY:=Freifunk
> > +    TITLE:= Freifunk-Franken Alfred-Monitoring-Proxy
> > +    URL:=https://www.freifunk-franken.de/
> > +    DEPENDS:=+micrond +fff-random +curl +alfred-json +fff-
> > nodewatcher
> > +endef
> > +
> > +define Package/fff-alfred-monitoring-proxy/description
> > + The Alfred-Monitoring-Proxy is used
> > + to send node status information to
> > https://monitoring.freifunk-franken.de/
> > +endef
> > +
> > +define Build/Prepare
> > +    echo "all: " > $(PKG_BUILD_DIR)/Makefile
> > +endef
> > +
> > +define Package/fff-alfred-monitoring-proxy/install
> > +    $(CP) ./files/* $(1)/
> > +endef
> > +
> > +$(eval $(call BuildPackage,fff-alfred-monitoring-proxy))
> > diff --git
> > a/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > defaults/52-alfred-master
> > b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > defaults/52-alfred-master
> > new file mode 100755
> > index 0000000..bf76a16
> > --- /dev/null
> > +++
> > b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > defaults/52-alfred-master
> > @@ -0,0 +1,6 @@
> > +#!/bin/sh
> > +
> > +uci -q set "alfred.alfred.mode=master"
> > +
> > +uci -q commit alfred
> > +
> > diff --git
> > a/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > b/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > new file mode 100644
> > index 0000000..15905de
> > --- /dev/null
> > +++
> > b/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > @@ -0,0 +1 @@
> > +ebtables -P MULTICAST_OUT RETURN
> > diff --git
> > a/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > b/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > new file mode 100644
> > index 0000000..4571efc
> > --- /dev/null
> > +++
> > b/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > @@ -0,0 +1 @@
> > +*/5 * * * * sleep $(/usr/bin/random 70 85);
> 
> Hier wäre 1-59/5 und random 10 25 besser, dann läuft das Skript nicht
> so lang ...
Nein, mit mir machen wir diesen "1-59/5" nicht, weil es nicht so gut
lesbar ist. Die Diskussion hatten wir schonmal.

> 
> > /usr/sbin/alfred-monitoring-proxy
> > diff --git
> > a/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/sbin/alfred-monitoring-proxy
> > b/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/sbin/alfred-monitoring-proxy
> > new file mode 100755
> > index 0000000..c35e7f9
> > --- /dev/null
> > +++
> > b/src/packages/fff/fff-alfred-monitoring-
> > proxy/files/usr/sbin/alfred-monitoring-proxy
> > @@ -0,0 +1,7 @@
> > +#!/bin/ash
> > +
> > +api_url="https://monitoring.freifunk-franken.de/api/alfred"
> 
> Https ist okay ...
> 
> > +fetch_id="64"
> > +
> > +(echo -n "{\"$fetch_id\": "; alfred-json -r "$fetch_id"; echo -n
> > "}")
> > > \
> > 
> > +    curl -k -v -H "Content-type: application/json; charset=UTF-8"
> > -X
> > POST --data "@-" $api_url
> 
> Das @- nimmt die Daten aus der pipe?
So steht es in der Doku, ja.

> Schau mir beide patches dann daheim nochmal in Ruhe an und werde
> heute oder morgen ggf. reviewen...
Mach das. Ich wollte aber eigentlich nicht mehr so lange warten. Der
Patch gammelt ja nun schon mehr als lange genug auf der Liste rum.

Und in anbetracht, dass da noch n Berg an Patches wartet.. Würde ich
den Patch eher zeitnah applien.

Tim

> Grüße
> 
> Adrian
Adrian Schmutzler Aug. 12, 2018, 5:07 p.m. 
Hallo,

Kommentare unten.

> -----Original Message-----
> From: Tim Niemeyer [mailto:tim@tn-x.org]
> Sent: Samstag, 11. August 2018 19:47
> To: Adrian Schmutzler <mail@adrianschmutzler.de>; franken-
> dev@freifunk.net
> Subject: Re: [PATCH v2 2/2] fff-alfred-monitoring-proxy: add package
> 
> Hi Adrian
> 
> Am Samstag, den 11.08.2018, 19:35 +0200 schrieb Adrian Schmutzler:
> > Hallo,
> >
> > auch hier unten.
> >
> > On August 11, 2018 7:19:53 PM GMT+02:00, Tim Niemeyer <tim@tn-x.org>
> > wrote:
> > > From: Steffen Pankratz <kratz00@gmx.de>
> > >
> > > CC: kratz00@gmx.de
> >
> > Brauchen wir das?
> Kratz hat den Patch geschrieben und der Patch geht in seinem Namen ins
> Repo.

Mir geht es nur um das CC, außer das steht für was anderes als Carbon Copy.


> 
> >
> > > Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> > > - Changed subject
> > > - Changed curl parameters
> > > - Added firewall rule
> > > - Configure alfred to be master
> > > - Add fff-nodewatcher as dep, because we use the alfred config
> > > Signed-off-by: Fabian Bläse <fabian@blaese.de>
> > > - Fix alfred master mode introduced by packaging alfred
> > > - Adjust monitoring-proxy waittime to suggestion
> >
> > Brauchen wir die ganzen persönlichen Änderungen? Ich würde die
> > rausschmeißen und lieber erklären, was der patch tut. Ähnlich v1/2.
> s.o.
> 
> >
> > >
> > > ---
> > >
> > > Changes in v2:
> > > - change data handling during curl to pipe
> > > - add newline on cron rule
> > >
> > > .../fff/fff-alfred-monitoring-proxy/Makefile       | 32
> > > ++++++++++++++++++++++
> > > .../files/etc/uci-defaults/52-alfred-master        |  6 ++++
> > > .../files/usr/lib/filewall.d/06-enable-mc-out      |  1 +
> > > .../usr/lib/micron.d/fff-alfred-monitoring-proxy   |  1 +
> > > .../files/usr/sbin/alfred-monitoring-proxy         |  7 +++++
> > > 5 files changed, 47 insertions(+)
> > > create mode 100644
> > > src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > > create mode 100755
> > > src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > > defaults/52-alfred-master
> > > create mode 100644
> > > src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > > create mode 100644
> > > src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > > create mode 100755
> > > src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-
> > > monitoring-proxy
> > >
> > > diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > > b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > > new file mode 100644
> > > index 0000000..424dd58
> > > --- /dev/null
> > > +++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile
> > > @@ -0,0 +1,32 @@
> > > +include $(TOPDIR)/rules.mk
> > > +
> > > +PKG_NAME:=fff-alfred-monitoring-proxy
> > > +PKG_VERSION:=0.0.1
> > > +PKG_RELEASE:=1
> > > +
> > > +PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy
> > > +
> > > +include $(INCLUDE_DIR)/package.mk
> > > +
> > > +define Package/fff-alfred-monitoring-proxy
> > > +    SECTION:=base
> > > +    CATEGORY:=Freifunk
> > > +    TITLE:= Freifunk-Franken Alfred-Monitoring-Proxy
> > > +    URL:=https://www.freifunk-franken.de/
> > > +    DEPENDS:=+micrond +fff-random +curl +alfred-json +fff-
> > > nodewatcher
> > > +endef
> > > +
> > > +define Package/fff-alfred-monitoring-proxy/description
> > > + The Alfred-Monitoring-Proxy is used  to send node status
> > > +information to
> > > https://monitoring.freifunk-franken.de/
> > > +endef
> > > +
> > > +define Build/Prepare
> > > +    echo "all: " > $(PKG_BUILD_DIR)/Makefile endef
> > > +
> > > +define Package/fff-alfred-monitoring-proxy/install
> > > +    $(CP) ./files/* $(1)/
> > > +endef
> > > +
> > > +$(eval $(call BuildPackage,fff-alfred-monitoring-proxy))
> > > diff --git
> > > a/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > > defaults/52-alfred-master
> > > b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > > defaults/52-alfred-master
> > > new file mode 100755
> > > index 0000000..bf76a16
> > > --- /dev/null
> > > +++
> > > b/src/packages/fff/fff-alfred-monitoring-proxy/files/etc/uci-
> > > defaults/52-alfred-master
> > > @@ -0,0 +1,6 @@
> > > +#!/bin/sh
> > > +
> > > +uci -q set "alfred.alfred.mode=master"
> > > +
> > > +uci -q commit alfred
> > > +
> > > diff --git
> > > a/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > > b/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > > new file mode 100644
> > > index 0000000..15905de
> > > --- /dev/null
> > > +++
> > > b/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/filewall.d/06-enable-mc-out
> > > @@ -0,0 +1 @@
> > > +ebtables -P MULTICAST_OUT RETURN
> > > diff --git
> > > a/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > > b/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > > new file mode 100644
> > > index 0000000..4571efc
> > > --- /dev/null
> > > +++
> > > b/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/lib/micron.d/fff-alfred-monitoring-proxy
> > > @@ -0,0 +1 @@
> > > +*/5 * * * * sleep $(/usr/bin/random 70 85);
> >
> > Hier wäre 1-59/5 und random 10 25 besser, dann läuft das Skript nicht
> > so lang ...
> Nein, mit mir machen wir diesen "1-59/5" nicht, weil es nicht so gut lesbar ist.
> Die Diskussion hatten wir schonmal.

Dein Ernst?

Du schreibst ein C-Tool, damit sich die Hoods nicht verbinden, und hier lehnst du eine Lösung ab, die in jedem 0-8-15 Cron-Tutorial steht? Obwohl dadurch eine nutzlose Idle-Time vermieden wird ...

Also wenn das der Grund ist, dann werfe ich meinen anderen Patch wieder auf die Liste. Bei diesem Patch ist es wegen einer Minute ja relativ wurscht, aber das andere Ding macht mir massiv Probleme beim Monitoring ....

> 
> >
> > > /usr/sbin/alfred-monitoring-proxy
> > > diff --git
> > > a/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/sbin/alfred-monitoring-proxy
> > > b/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/sbin/alfred-monitoring-proxy
> > > new file mode 100755
> > > index 0000000..c35e7f9
> > > --- /dev/null
> > > +++
> > > b/src/packages/fff/fff-alfred-monitoring-
> > > proxy/files/usr/sbin/alfred-monitoring-proxy
> > > @@ -0,0 +1,7 @@
> > > +#!/bin/ash
> > > +
> > > +api_url="https://monitoring.freifunk-franken.de/api/alfred"
> >
> > Https ist okay ...
> >
> > > +fetch_id="64"
> > > +
> > > +(echo -n "{\"$fetch_id\": "; alfred-json -r "$fetch_id"; echo -n
> > > "}")
> > > > \
> > >
> > > +    curl -k -v -H "Content-type: application/json; charset=UTF-8"
> > > -X
> > > POST --data "@-" $api_url
> >
> > Das @- nimmt die Daten aus der pipe?
> So steht es in der Doku, ja.

Das heißt, du bist dir selbst nicht sicher und hast es auch nicht getestet?

Grüße

Adrian

> 
> > Schau mir beide patches dann daheim nochmal in Ruhe an und werde
> heute
> > oder morgen ggf. reviewen...
> Mach das. Ich wollte aber eigentlich nicht mehr so lange warten. Der Patch
> gammelt ja nun schon mehr als lange genug auf der Liste rum.
> 
> Und in anbetracht, dass da noch n Berg an Patches wartet.. Würde ich den
> Patch eher zeitnah applien.
> 
> Tim
> 
> > Grüße
> >
> > Adrian