[PATCH v3 2/2] fff-alfred-monitoring-proxy: add package

So Dez 2 14:57:22 CET 2018

Hier sollte man jetzt alfred2 verwenden:

+++ 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/alfred2"
+fetch_id="64"
+
+alfred-json -r "$fetch_id" | \
+    curl -k -v -H "Content-type: application/json; charset=UTF-8" -X POST --data "@-" $api_url

Brauchen wir das "-k" wirklich?

Grüße

Adrian



> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of robert
> Sent: Montag, 10. September 2018 02:07
> To: franken-dev at freifunk.net
> Subject: Re: [PATCH v3 2/2] fff-alfred-monitoring-proxy: add package
> 
> Hi,
> 
> mich wuerde auch interessieren, warum die Policy von MULTICAST_OUT auf
> RETURN?
> 
> 
> Am 11.08.2018 um 19:53 schrieb Tim Niemeyer:
> > From: Steffen Pankratz <kratz00 at gmx.de>
> >
> > CC: kratz00 at gmx.de
> > Signed-off-by: Tim Niemeyer <tim at 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
> > - Change data handling during curl to pipe
> > - Add newline on cron rule
> > Signed-off-by: Fabian Bläse <fabian at 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
> > Series-changes: 3
> > - copied changes to commit message
> >
> >  .../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/ff
> > f-alfred-monitoring-proxy
> >  create mode 100755
> > src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-mon
> > itoring-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);
> > /usr/sbin/alfred-monitoring-proxy
> > diff --git
> > a/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-m
> > onitoring-proxy
> > b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-m
> > onitoring-proxy
> > new file mode 100755
> > index 0000000..c35e7f9
> > --- /dev/null
> > +++
> > b/src/packages/fff/fff-alfred-monitoring-proxy/files/usr/sbin/alfred-m
> > onitoring-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
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : nicht verfügbar
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20181202/f491b278/attachment.sig>
