nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename /lib/gluon/respondd/ to /lib/respondd/

Browse Source 
respondd is supposed to be non-Gluon-specific (it is in the packages
repository), thus having its data direectory in /lib/gluon/ doesn't make sense.
This commit is contained in:
Jan-Philipp Litza 2016-09-22 20:43:53 +02:00
parent cb86fce29f
commit 680a18035d
13 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/features/monitoring.rst
View File

@ -133,6 +133,6 @@ about the supported arguments.
Adding a data provider Adding a data provider
---------------------- ----------------------
To add a provider, you need to install a shared object into ``/lib/gluon/respondd``. To add a provider, you need to install a shared object into ``/lib/respondd``.
For more information, refer to the `respondd README <https://github.com/freifunk-gluon/packages/blob/master/net/respondd/README.md>`_ For more information, refer to the `respondd README <https://github.com/freifunk-gluon/packages/blob/master/net/respondd/README.md>`_
and have a look the existing providers. and have a look the existing providers.

4
package/gluon-autoupdater/Makefile
View File

@ -31,8 +31,8 @@ define Package/gluon-autoupdater/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd $(INSTALL_DIR) $(1)/lib/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/autoupdater.so $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/autoupdater.so
if [ '$(GLUON_BRANCH)' ]; then \ if [ '$(GLUON_BRANCH)' ]; then \
$(INSTALL_DIR) $(1)/lib/gluon/autoupdater; \ $(INSTALL_DIR) $(1)/lib/gluon/autoupdater; \

4
package/gluon-mesh-batman-adv-core/Makefile
View File

@ -29,8 +29,8 @@ endef
define Package/gluon-mesh-batman-adv-core/install define Package/gluon-mesh-batman-adv-core/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd $(INSTALL_DIR) $(1)/lib/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-batman-adv-core.so $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/mesh-batman-adv-core.so
endef endef
define Package/gluon-mesh-batman-adv-core/postinst define Package/gluon-mesh-batman-adv-core/postinst

0
package/gluon-mesh-batman-adv-core/files/lib/gluon/respondd/client.dev → package/gluon-mesh-batman-adv-core/files/lib/respondd/client.dev
View File

4
package/gluon-mesh-vpn-fastd/Makefile
View File

@ -29,8 +29,8 @@ endef
define Package/gluon-mesh-vpn-fastd/install define Package/gluon-mesh-vpn-fastd/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd $(INSTALL_DIR) $(1)/lib/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-vpn-fastd.so $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/mesh-vpn-fastd.so
endef endef
define Package/gluon-mesh-vpn-fastd/postinst define Package/gluon-mesh-vpn-fastd/postinst

4
package/gluon-node-info/Makefile
View File

@ -25,8 +25,8 @@ endef
define Package/gluon-node-info/install define Package/gluon-node-info/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd $(INSTALL_DIR) $(1)/lib/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/node-info.so $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/node-info.so
endef endef
define Package/gluon-node-info/postinst define Package/gluon-node-info/postinst

4
package/gluon-respondd/Makefile
View File

@ -28,8 +28,8 @@ endef
define Package/gluon-respondd/install define Package/gluon-respondd/install
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd $(INSTALL_DIR) $(1)/lib/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/respondd.so $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/respondd.so
endef endef
$(eval $(call BuildPackage,gluon-respondd)) $(eval $(call BuildPackage,gluon-respondd))

2
package/gluon-respondd/files/etc/hotplug.d/iface/10-gluon-respondd
View File

@ -10,7 +10,7 @@ case "$ACTION" in
ifup) ifup)
DEVICE="$(ifname_to_dev "$INTERFACE")" DEVICE="$(ifname_to_dev "$INTERFACE")"
[ "$DEVICE" != "$(cat /lib/gluon/respondd/client.dev 2>/dev/null)" ] || [ "$DEVICE" != "$(cat /lib/respondd/client.dev 2>/dev/null)" ] ||
/etc/init.d/gluon-respondd restart_if_running & /etc/init.d/gluon-respondd restart_if_running &
;; ;;
esac esac

4
package/gluon-respondd/files/etc/init.d/gluon-respondd
View File

@ -13,11 +13,11 @@ LOCK=/var/run/gluon-respondd.lock
do_start() { do_start() {
DEVS="" DEVS=""
for dev in $( ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device") $(cat /lib/gluon/respondd/client.dev 2>/dev/null) for dev in $( ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device") $(cat /lib/respondd/client.dev 2>/dev/null)
do do
DEVS="$DEVS -i $dev" DEVS="$DEVS -i $dev"
done done
service_start $DAEMON -g ff02::2:1001 -p 1001 -d /lib/gluon/respondd $DEVS service_start $DAEMON -g ff02::2:1001 -p 1001 -d /lib/respondd $DEVS
} }
do_stop() { do_stop() {

0
package/gluon-respondd/files/lib/gluon/respondd/neighbours.cache → package/gluon-respondd/files/lib/respondd/neighbours.cache
View File

0
package/gluon-respondd/files/lib/gluon/respondd/nodeinfo.cache → package/gluon-respondd/files/lib/respondd/nodeinfo.cache
View File

0
package/gluon-respondd/files/lib/gluon/respondd/statistics.cache → package/gluon-respondd/files/lib/respondd/statistics.cache
View File

4
package/gluon-status-page-api/Makefile
View File

@ -32,8 +32,8 @@ define Package/gluon-status-page-api/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-batadv $(1)/lib/gluon/status-page/providers/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-batadv $(1)/lib/gluon/status-page/providers/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/
$(INSTALL_DIR) $(1)/lib/gluon/respondd $(INSTALL_DIR) $(1)/lib/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/status-page-api.so $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/respondd/status-page-api.so
$(CP) ./files/* $(1)/ $(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/ $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/