package/gluon-announce/files/lib/gluon/announce/statistics.d/rootfs_usage

-local fs = require "nixio.fs"
-
-local st = fs.statvfs("/")
-return 1 - st.bfree / st.blocks

package/gluon-announce/files/lib/gluon/announce/statistics.d/uptime

-return tonumber(fs.readfile('/proc/uptime'):match('^([^ ]+) '))

package/gluon-announce/files/usr/lib/lua/gluon/announce.lua

-#!/usr/bin/lua
-
-module('gluon.announce', package.seeall)
-
-fs = require 'luci.fs'
-uci = require('luci.model.uci').cursor()
-util = require 'luci.util'
-
-local function collect_entry(entry)
-	if fs.isdirectory(entry) then
-		return collect_dir(entry)
-	else
-		return setfenv(loadfile(entry), _M)()
-	end
-end
-
-function collect_dir(dir)
-	local ret = {}
-
-	for _, entry in ipairs(fs.dir(dir)) do
-		if entry:sub(1, 1) ~= '.' then
-			local ok, val = pcall(collect_entry, dir .. '/' .. entry)
-			if ok then
-				ret[entry] = val
-			else
-				io.stderr:write(val, '\n')
-			end
-		end
-	end
-
-	return ret
-end
-

package/gluon-announced/Makefile

-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gluon-announced
-PKG_VERSION:=2
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/gluon-announced
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=Provides node information to the network
-  DEPENDS:=+gluon-announce +respondd +lua-deflate
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-announced/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-announced))

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

-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions/service.sh
-
-DEVLIST=/var/run/gluon-announced.devs
-DAEMON=/usr/bin/respondd
-
-ifname_to_dev () {
-	json_load "$(ubus call network.interface.$1 status)"
-	json_get_var dev device
-
-	echo "$dev"
-}
-
-restart_announced () {
-	SERVICE_USE_PID=1
-	SERVICE_WRITE_PID=1
-	SERVICE_DAEMONIZE=1
-
-	DEVS=$(cat $DEVLIST | while read dev iface; do echo -n " -i $dev"; done)
-
-	service_stop $DAEMON
-	service_start $DAEMON -g ff02::2:1001 -p 1001 -c 'return require("gluon.announced").handle_request' $DEVS
-}
-
-case "$ACTION" in
-	ifdown)
-		sed -i "/$INTERFACE/d" $DEVLIST
-		;;
-	ifup)
-		DEVICE="$(ifname_to_dev "$INTERFACE")"
-		MESH="$(cat "/sys/class/net/$DEVICE/batman_adv/mesh_iface" 2>/dev/null)"
-
-		[ "$MESH" = "bat0" -o "$INTERFACE" = "client" ] || exit 0
-
-		DEVS=$(cat $DEVLIST; echo $DEVICE $INTERFACE)
-
-		echo "$DEVS" | sort -u > $DEVLIST
-
-		restart_announced
-
-		;;
-esac
-

package/gluon-announced/files/lib/gluon/upgrade/400-announced-firewall

-#!/usr/bin/lua
-
-local uci = require('luci.model.uci').cursor()
-
--- Allow announced port on WAN to allow resolving neighbours over mesh-on-wan
-uci:section('firewall', 'rule', 'wan_announced',
-  {
-    name = 'wan_announced',
-    src = 'wan',
-    src_ip = 'fe80::/64',
-    dest_port = '1001',
-    proto = 'udp',
-    target = 'ACCEPT',
-  }
-)
-
-uci:save('firewall')
-uci:commit('firewall')

package/gluon-announced/files/usr/lib/lua/gluon/announced.lua

-local announce = require 'gluon.announce'
-local deflate = require 'deflate'
-local json = require 'luci.json'
-
-
-local function collect(type)
-  return announce.collect_dir('/lib/gluon/announce/' .. type .. '.d')
-end
-
-
-module('gluon.announced', package.seeall)
-
-function handle_request(query)
-  if query:match('^nodeinfo$') then
-    return json.encode(collect('nodeinfo'))
-  end
-
-  local m = query:match('^GET ([a-z ]+)$')
-  if m then
-    local data = {}
-
-    for q in m:gmatch('([a-z]+)') do
-      local ok, val = pcall(collect, q)
-      if ok then
-        data[q] = val
-      end
-    end
-
-    if next(data) then
-      return deflate.compress(json.encode(data))
-    end
-  end
-end

package/gluon-authorized-keys/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-authorized-keys
-PKG_VERSION:=2
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
 
 define Package/gluon-authorized-keys
-  SECTION:=gluon
-  CATEGORY:=Gluon
   TITLE:=Fill /etc/dropbear/authorized_keys from site.conf
-  DEPENDS:=+gluon-core
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-endef
-
-define Package/gluon-authorized-keys/install
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/gluon-authorized-keys/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
+  DEPENDS:=+gluon-core +gluon-lock-password
 endef
 
-$(eval $(call BuildPackage,gluon-authorized-keys))
+$(eval $(call BuildPackageGluon,gluon-authorized-keys))

package/gluon-authorized-keys/check_site.lua

-need_string_array 'authorized_keys'
+need_string_array(in_site({'authorized_keys'}))

package/gluon-authorized-keys/files/lib/gluon/upgrade/100-authorized-keys → package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local file = '/etc/dropbear/authorized_keys'
 
 local keys = {}
 
-function load_keys()
+local function load_keys()
 	for line in io.lines(file) do
 		keys[line] = true
 	end
@@ -14,7 +14,7 @@ end
 pcall(load_keys)
 
 local f = io.open(file, 'a')
-for _, key in ipairs(site.authorized_keys) do
+for _, key in ipairs(site.authorized_keys()) do
 	if not keys[key] then
 		f:write(key .. '\n')
 	end

package/gluon-autoupdater/Config.in

+if PACKAGE_gluon-autoupdater
+
+config GLUON_AUTOUPDATER_BRANCH
+	string "Autoupdater branch"
+	default ""
+
+config GLUON_AUTOUPDATER_ENABLED
+	bool "Enable autoupdater by default"
+
+endif

package/gluon-autoupdater/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-autoupdater
-PKG_VERSION:=4
-PKG_RELEASE:=$(GLUON_BRANCH)
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_CONFIG_DEPENDS := CONFIG_GLUON_AUTOUPDATER_BRANCH CONFIG_GLUON_AUTOUPDATER_ENABLED
 
-include $(GLUONDIR)/include/package.mk
+include ../gluon.mk
 
 define Package/gluon-autoupdater
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  DEPENDS:=+gluon-core +gluon-cron +autoupdater
+  DEPENDS:=+gluon-core +libgluonutil +micrond +autoupdater
   TITLE:=Automatically update firmware
 endef
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
+define Package/gluon-autoupdater/config
+	source "$(SOURCE)/Config.in"
 endef
 
 define Package/gluon-autoupdater/install
-	$(CP) ./files/* $(1)/
-
-	if [ '$(GLUON_BRANCH)' ]; then \
-		$(INSTALL_DIR) $(1)/lib/gluon/autoupdater; \
-		echo '$(GLUON_BRANCH)' > $(1)/lib/gluon/autoupdater/default_branch; \
-	fi
-endef
-
-define Package/gluon-autoupdater/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
+	$(Gluon/Build/Install)
+
+	$(INSTALL_DIR) $(1)/lib/gluon/autoupdater
+  ifneq ($(CONFIG_GLUON_AUTOUPDATER_BRANCH),"")
+	echo '$(call qstrip,$(CONFIG_GLUON_AUTOUPDATER_BRANCH))' > $(1)/lib/gluon/autoupdater/default_branch
+  endif
+  ifneq ($(CONFIG_GLUON_AUTOUPDATER_ENABLED),)
+	touch $(1)/lib/gluon/autoupdater/default_enabled
+  endif
 endef
 
-$(eval $(call BuildPackage,gluon-autoupdater))
+$(eval $(call BuildPackageGluon,gluon-autoupdater))

package/gluon-autoupdater/check_site.lua

-need_string 'autoupdater.branch'
+local has_tls = (function()
+	local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/features/tls')
+	if f then
+		f:close()
+		return true
+	end
+	return false
+end)()
 
-local function check_branch(k, _)
-   local prefix = string.format('autoupdater.branches[%q].', k)
+local branches = table_keys(need_table({'autoupdater', 'branches'}, function(branch)
+	need_alphanumeric_key(branch)
 
-   need_string(prefix .. 'name')
-   need_string_array(prefix .. 'mirrors')
-   need_number(prefix .. 'good_signatures')
-   need_string_array(prefix .. 'pubkeys')
-end
+	need_string(in_site(extend(branch, {'name'})))
+	need_array(extend(branch, {'mirrors'}), function(mirror)
+		alternatives(function()
+			need_string_match(mirror, 'http://')
+		end, function()
+			need_string_match(mirror, 'https://')
+			need(mirror, function() return has_tls end, nil,
+				"use HTTPS only if the 'tls' feature is enabled")
+		end, function()
+			need_string_match(mirror, '^//')
+		end)
+	end)
+
+	local pubkeys = need_string_array_match(in_site(extend(branch, {'pubkeys'})), '^%x+$')
+	need_number(in_site(extend(branch, {'good_signatures'})))
+	need(in_site(extend(branch, {'good_signatures'})), function(good_signatures)
+		return good_signatures <= #pubkeys
+	end, nil, string.format('be less than or equal to the number of public keys (%d)', #pubkeys))
 
-need_table('autoupdater.branches', check_branch)
+	obsolete(extend(branch, {'probability'}), 'Use GLUON_PRIORITY in site.mk instead.')
+end))
+
+need_one_of(in_site({'autoupdater', 'branch'}), branches, false)
+
+-- Check GLUON_AUTOUPDATER_BRANCH
+local default_branch
+local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/autoupdater/default_branch')
+if f then
+	default_branch = f:read('*line')
+	f:close()
+end
+need_one_of(value('GLUON_AUTOUPDATER_BRANCH', default_branch), branches, false)

package/gluon-autoupdater/files/lib/gluon/announce/nodeinfo.d/software/autoupdater

-local autoupdater = uci:get_all('autoupdater', 'settings')
-if autoupdater then
-	return {
-		branch = autoupdater['branch'],
-		enabled = uci:get_bool('autoupdater', 'settings', 'enabled'),
-	}
-end

package/gluon-autoupdater/files/lib/gluon/autoupdater/lib.sh

+# Library to be sourced by download.d/abort.d scripts
+
+
+stop() {
+	if [ -x /etc/init.d/"$1" ]; then
+		echo "Stopping $1..."
+		/etc/init.d/"$1" stop
+	fi
+}
+
+start_enabled() {
+	if [ -x /etc/init.d/"$1" ] && /etc/init.d/"$1" enabled; then
+		echo "Starting $1..."
+		/etc/init.d/"$1" start
+	fi
+}

package/gluon-autoupdater/files/lib/gluon/upgrade/500-autoupdater

-#!/usr/bin/lua
-
-local site = require 'gluon.site_config'
-local uci = require 'luci.model.uci'
-
-local c = uci.cursor()
-
-
-for name, config in pairs(site.autoupdater.branches) do
-	c:delete('autoupdater', name)
-	c:section('autoupdater', 'branch', name,
-		  {
-			  name = config.name,
-			  mirror = config.mirrors,
-			  good_signatures = config.good_signatures,
-			  pubkey = config.pubkeys,
-		  }
-	)
-end
-
-if not c:get('autoupdater', 'settings') then
-	local enabled = 0
-	local branch = site.autoupdater.branch
-
-	local f = io.open('/lib/gluon/autoupdater/default_branch')
-	if f then
-		enabled = 1
-		branch = f:read('*line')
-		f:close()
-	end
-
-	c:section('autoupdater', 'autoupdater', 'settings',
-		  {
-			  enabled = enabled,
-			  branch = branch,
-		  }
-	)
-end
-
-c:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release')
-
-c:save('autoupdater')
-c:commit('autoupdater')
-
-
-local autoupdater_util = require 'autoupdater.util'
-autoupdater_util.randomseed()
-
-
--- Perform updates at a random time between 04:00 and 05:00, and once an hour
--- a fallback update (used after the regular updates haven't
-local minute = math.random(0, 59)
-
-local f = io.open('/lib/gluon/cron/autoupdater', 'w')
-f:write(string.format('%i 4 * * * /usr/sbin/autoupdater\n', minute))
-f:write(string.format('%i 0-3,5-23 * * * /usr/sbin/autoupdater --fallback\n', minute))
-f:close()

package/gluon-autoupdater/files/usr/lib/autoupdater/abort.d/90gluon-autoupdater

+#!/bin/sh
+
+# shellcheck source=package/gluon-autoupdater/files/lib/gluon/autoupdater/lib.sh
+. /lib/gluon/autoupdater/lib.sh
+
+
+start_enabled cron
+start_enabled urngd
+start_enabled micrond
+start_enabled sysntpd

package/gluon-autoupdater/files/usr/lib/autoupdater/download.d/10gluon-autoupdater

+#!/bin/sh
+
+# shellcheck source=package/gluon-autoupdater/files/lib/gluon/autoupdater/lib.sh
+. /lib/gluon/autoupdater/lib.sh
+
+
+stop cron
+stop urngd
+stop micrond
+stop sysntpd

package/gluon-autoupdater/luasrc/lib/gluon/upgrade/500-autoupdater

+#!/usr/bin/lua
+
+local site = require 'gluon.site'
+local uci = require('simple-uci').cursor()
+local unistd = require 'posix.unistd'
+
+local has_tls = unistd.access('/lib/gluon/features/tls') ~= nil
+local default_scheme = has_tls and 'https:' or 'http:'
+
+local min_branch
+
+local function mirror_urls(mirrors)
+	local ret = {}
+
+	for _, mirror in ipairs(mirrors) do
+		if string.match(mirror, '^//') ~= nil then
+			table.insert(ret, default_scheme .. mirror)
+		else
+			table.insert(ret, mirror)
+		end
+	end
+
+	return ret
+end
+
+for name, config in pairs(site.autoupdater.branches()) do
+	uci:delete('autoupdater', name)
+	uci:section('autoupdater', 'branch', name, {
+		name = config.name,
+		mirror = mirror_urls(config.mirrors),
+		good_signatures = config.good_signatures,
+		pubkey = config.pubkeys,
+	})
+
+	if not min_branch or (name < min_branch) then
+		min_branch = name
+	end
+end
+
+local function default_branch()
+	local f = io.open('/lib/gluon/autoupdater/default_branch')
+	if f then
+		local ret = f:read('*line')
+		f:close()
+		return ret
+	end
+
+	return site.autoupdater.branch(min_branch)
+end
+
+local enabled, branch
+if not uci:get('autoupdater', 'settings') then
+	enabled = unistd.access('/lib/gluon/autoupdater/default_enabled') ~= nil
+end
+
+local old_branch = uci:get('autoupdater', 'settings', 'branch')
+if not old_branch or not uci:get('autoupdater', old_branch) then
+	branch = default_branch()
+	if not branch then
+		enabled = false
+	end
+end
+
+uci:section('autoupdater', 'autoupdater', 'settings', {
+	enabled = enabled,
+	branch = branch,
+})
+
+uci:set('autoupdater', 'settings', 'version_file', '/lib/gluon/release')
+
+uci:save('autoupdater')
+
+
+local urandom = io.open('/dev/urandom', 'r')
+local seed1, seed2 = urandom:read(2):byte(1, 2)
+math.randomseed(seed1*0x100 + seed2)
+urandom:close()
+
+-- Perform updates at a random time between 04:00 and 05:00, and once an hour
+-- a fallback update (used after the regular updates haven't worked for
+-- (priority+1) days after a firmware release, for example because the node
+-- is always offline at night)
+local minute = math.random(0, 59)
+
+local f = io.open('/usr/lib/micron.d/autoupdater', 'w')
+f:write(string.format('%i 4 * * * /usr/sbin/autoupdater\n', minute))
+f:write(string.format('%i 0-3,5-23 * * * /usr/sbin/autoupdater --fallback\n', minute))
+f:close()

package/gluon-autoupdater/src/Makefile

+all: respondd.so
+
+CFLAGS += -Wall
+
+respondd.so: respondd.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -o $@ $^ $(LDLIBS) -lgluonutil -luci