gluon-announce to nodeinfo

gistfile1.diff

diff --git a/gluon/gluon-alfred/Makefile b/gluon/gluon-alfred/Makefile
index bb6926a..ee8ee74 100644
--- a/gluon/gluon-alfred/Makefile
+++ b/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-nodeinfo +gluon-cron +alfred
   TITLE:=Configure alfred
 endef
 
diff --git a/gluon/gluon-alfred/files/lib/gluon/cron/alfred b/gluon/gluon-alfred/files/lib/gluon/cron/alfred
index fbab634..19a9987 100644
--- a/gluon/gluon-alfred/files/lib/gluon/cron/alfred
+++ b/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/nodeinfo/generate_json.lua general | gzip | alfred -s 158; /lib/gluon/nodeinfo/generate_json.lua statistics | gzip | alfred -s 159
diff --git a/gluon/gluon-announced/Makefile b/gluon/gluon-announced/Makefile
index 1f802dc..c0bce10 100644
--- a/gluon/gluon-announced/Makefile
+++ b/gluon/gluon-announced/Makefile
@@ -12,7 +12,7 @@ define Package/gluon-announced
   SECTION:=gluon
   CATEGORY:=Gluon
   TITLE:=announced support
-  DEPENDS:=+gluon-announce
+  DEPENDS:=+gluon-nodeinfo
 endef
 
 define Package/gluon-announced/description
diff --git a/gluon/gluon-announced/files/etc/hotplug.d/iface/10-gluon-announced b/gluon/gluon-announced/files/etc/hotplug.d/iface/10-gluon-announced
index 4fb154f..cc223e7 100644
--- a/gluon/gluon-announced/files/etc/hotplug.d/iface/10-gluon-announced
+++ b/gluon/gluon-announced/files/etc/hotplug.d/iface/10-gluon-announced
@@ -3,7 +3,7 @@
 . /usr/share/libubox/jshn.sh
 . /lib/functions/service.sh
 
-DEVLIST=/var/run/gluon-announce.devs
+DEVLIST=/var/run/gluon-announced.devs
 DAEMON=/usr/bin/gluon-announced
 
 ifname_to_dev () {
@@ -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/nodeinfo/generate_json.lua general' $DEVS
 }
 
 case "$ACTION" in
diff --git a/gluon/gluon-announce/Makefile b/gluon/gluon-nodeinfo/Makefile
similarity index 65%
rename from gluon/gluon-announce/Makefile
rename to gluon/gluon-nodeinfo/Makefile
index 3f62c88..73c3e9b 100644
--- a/gluon/gluon-announce/Makefile
+++ b/gluon/gluon-nodeinfo/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=gluon-announce
+PKG_NAME:=gluon-nodeinfo
 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-nodeinfo
   SECTION:=gluon
   CATEGORY:=Gluon
   DEPENDS:=+gluon-core +luci-lib-json +lua-ethtool-stats
-  TITLE:=Lua scripts announcing various information
+  TITLE:=Lua scripts generating json containing node information
 endef
 
 define Build/Prepare
@@ -25,8 +25,8 @@ endef
 define Build/Compile
 endef
 
-define Package/gluon-announce/install
+define Package/gluon-nodeinfo/install
 	$(CP) ./files/* $(1)/
 endef
 
-$(eval $(call BuildPackage,gluon-announce))
+$(eval $(call BuildPackage,gluon-nodeinfo))
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hardware/model b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/hardware/model
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hardware/model
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/hardware/model
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hostname b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/hostname
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/hostname
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/hostname
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/network/mac b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/network/mac
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/network/mac
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/network/mac
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/node_id b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/node_id
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/node_id
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/node_id
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/software/firmware b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/software/firmware
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/software/firmware
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/general.d/software/firmware
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/announce.lua b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/generate_json.lua
similarity index 81%
rename from gluon/gluon-announce/files/lib/gluon/announce/announce.lua
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/generate_json.lua
index 7bce0a7..8ed4b84 100755
--- a/gluon/gluon-announce/files/lib/gluon/announce/announce.lua
+++ b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/generate_json.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/lua
 
-local announce_base = '/lib/gluon/announce/'
+local nodeinfo_base = '/lib/gluon/nodeinfo/'
 
 
 fs = require 'luci.fs'
@@ -37,7 +37,7 @@ function collect_dir(dir)
 	return ret
 end
 
-local announce_dir  = announce_base .. arg[1] .. '.d/'
+local nodeinfo_dir  = nodeinfo_base .. arg[1] .. '.d/'
 
-encoder = json.Encoder(collect_dir(announce_dir))
+encoder = json.Encoder(collect_dir(nodeinfo_dir))
 ltn12.pump.all(encoder:source(), ltn12.sink.file(io.stdout))
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/idletime b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/idletime
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/idletime
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/idletime
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/loadavg b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/loadavg
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/loadavg
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/loadavg
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/memory b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/memory
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/memory
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/memory
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/node_id
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/nodeinfo.d/node_id
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/node_id
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/processes b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/processes
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/processes
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/processes
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/rootfs_usage b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/rootfs_usage
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/rootfs_usage
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/rootfs_usage
diff --git a/gluon/gluon-announce/files/lib/gluon/announce/statistics.d/uptime b/gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/uptime
similarity index 100%
rename from gluon/gluon-announce/files/lib/gluon/announce/statistics.d/uptime
rename to gluon/gluon-nodeinfo/files/lib/gluon/nodeinfo/statistics.d/uptime