Merge 1e565d94f6 into 93e48e0a9c

gluon/gluon-alfred/Makefile

@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/gluon-alfred
   SECTION:=gluon
   CATEGORY:=Gluon
-  DEPENDS:=+gluon-core +gluon-announce +gluon-cron +alfred
+  DEPENDS:=+gluon-core +gluon-collect-data +gluon-cron +alfred
   TITLE:=Configure alfred
 endef
 

gluon/gluon-alfred/files/lib/gluon/cron/alfred

@@ -1 +1 @@
-* * * * * /lib/gluon/announce/announce.lua nodeinfo | gzip | alfred -s 158; /lib/gluon/announce/announce.lua statistics | gzip | alfred -s 159
+* * * * * /lib/gluon/collect-data/collect.lua nodeinfo | gzip | alfred -s 158; /lib/gluon/collect-data/collect.lua statistics | gzip | alfred -s 159

gluon/gluon-announced/Makefile

@@ -12,7 +12,7 @@ define Package/gluon-announced
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=announced support
-  DEPENDS:=+gluon-announce
+  DEPENDS:=+gluon-collect-data
 endef
 
 define Package/gluon-announced/description

gluon/gluon-announced/files/etc/hotplug.d/iface/10-gluon-announced

@@ -21,7 +21,7 @@ restart_announced () {
 	DEVS=$(cat $DEVLIST | while read dev iface;do echo -n " -i $dev";done)
 
 	service_stop $DAEMON
-	service_start $DAEMON -g ff02:0:0:0:0:0:2:1001 -p 1001 -s '/lib/gluon/announce/announce.lua nodeinfo' $DEVS
+	service_start $DAEMON -g ff02:0:0:0:0:0:2:1001 -p 1001 -s '/lib/gluon/collect-data/collect.lua nodeinfo' $DEVS
 }
 
 case "$ACTION" in

gluon/gluon-collect-data/Makefile

@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=gluon-announce
+PKG_NAME:=gluon-collect-data
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
@@ -8,11 +8,11 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/gluon-announce
+define Package/gluon-collect-data
   SECTION:=gluon
   CATEGORY:=Gluon
   DEPENDS:=+gluon-core +luci-lib-json +lua-ethtool-stats
-  TITLE:=Lua scripts announcing various information
+  TITLE:=Lua scripts collecting various information
 endef
 
 define Build/Prepare
@@ -25,8 +25,8 @@ endef
 define Build/Compile
 endef
 
-define Package/gluon-announce/install
+define Package/gluon-collect-data/install
 	$(CP) ./files/* $(1)/
 endef
 
-$(eval $(call BuildPackage,gluon-announce))
+$(eval $(call BuildPackage,gluon-collect-data))