Compare revisions

b1223ebd · b1223ebd · b1223ebd · b1223ebd · b1223ebd · 78b2775e
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -4,39 +4,21 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=gluon-config-mode-core
-PKG_VERSION:=2
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

 include ../gluon.mk

-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
-
 define Package/gluon-config-mode-core
-  SECTION:=gluon
-  CATEGORY:=Gluon
-  TITLE:=Luci based config mode for user friendly setup of new mesh nodes
-  DEPENDS:=gluon-setup-mode-virtual +gluon-luci-theme +gluon-lock-password +pretty-hostname $(GLUON_I18N_PACKAGES)
-  PROVIDES:=gluon-config-mode-core-virtual
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(call GluonBuildI18N,gluon-config-mode-core,i18n)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+  TITLE:=Configuration wizard for user friendly setup of new mesh nodes
+  DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd
 endef

 define Package/gluon-config-mode-core/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-	$(call GluonInstallI18N,gluon-config-mode-core,$(1))
+	$(Gluon/Build/Install)
+
+	$(INSTALL_DIR) $(1)/lib/gluon/config-mode/view/ $(1)/lib/gluon/config-mode/www/static/
+	$(LN) /lib/gluon/web/i18n $(1)/lib/gluon/config-mode/
+	$(LN) /lib/gluon/web/view/{error,model} $(1)/lib/gluon/config-mode/view/
+	$(LN) /lib/gluon/web/www/static/gluon-web-model.js $(1)/lib/gluon/config-mode/www/static/
 endef

-$(eval $(call BuildPackage,gluon-config-mode-core))
+$(eval $(call BuildPackageGluon,gluon-config-mode-core))
--- a/package/gluon-config-mode-core/files/lib/gluon/config-mode/view/wizard/reboot.html
+++ b/package/gluon-config-mode-core/files/lib/gluon/config-mode/view/wizard/reboot.html
+<h2><%:Your node's setup is now complete.%></h2>
+<%
+	local util = require "gluon.util"
+
+	local parts = {}
+	for _, entry in ipairs(util.glob('/lib/gluon/config-mode/reboot/*')) do
+		local p = assert(loadfile(entry))
+		setfenv(p, getfenv())
+		table.insert(parts, p)
+	end
+
+	for _, p in ipairs(parts) do
+		p()
+	end
+%>
--- a/package/gluon-config-mode-core/files/lib/gluon/config-mode/view/wizard/welcome.html
+++ b/package/gluon-config-mode-core/files/lib/gluon/config-mode/view/wizard/welcome.html
+<%-
+	local site_i18n = i18n 'gluon-site'
+
+	local sysconfig = require 'gluon.sysconfig'
+
+	local msg = site_i18n._translate('gluon-config-mode:welcome')
+	if not msg then return end
+-%>
+<p>
+	<%
+		renderer.render_string(msg, {
+			hostname = hostname,
+			sysconfig = sysconfig,
+		})
+	%>
+</p>
--- a/package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html
+++ b/package/gluon-config-mode-core/files/lib/gluon/config-mode/www/index.html
+<!DOCTYPE html>
+<html lang="">
+	<head>
+		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
+		<meta http-equiv="Pragma" content="no-cache">
+		<meta http-equiv="Expires" content="0">
+		<meta http-equiv="refresh" content="0; URL=/cgi-bin/config">
+	</head>
+	<body>
+	</body>
+</html>
--- a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50uhttpd
+++ b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50uhttpd
@@ -9,6 +9,6 @@ UHTTPD_BIN="/usr/sbin/uhttpd"
 start_service() {
 	procd_open_instance
 	procd_set_param respawn
-	procd_set_param command "$UHTTPD_BIN" -f -h /lib/gluon/setup-mode/www -x /cgi-bin -A 1 -R -p 0.0.0.0:80
+	procd_set_param command "$UHTTPD_BIN" -f -h /lib/gluon/config-mode/www -x /cgi-bin -A 1 -R -p 0.0.0.0:80
 	procd_close_instance
 }
--- a/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/cbi/config-mode.htm
+++ b/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/cbi/config-mode.htm
-<%-
-	local gluon_luci = require 'gluon.luci'
-	local sysconfig = require 'gluon.sysconfig'
-	local i18n = require 'luci.i18n'
-	local template = require 'luci.template'
-%>
-
-<h2><%:Welcome!%></h2>
-<p>
-	<%= template.render_string(i18n.translate('gluon-config-mode:welcome'), {
-		hostname = hostname,
-		sysconfig = sysconfig,
-		escape = gluon_luci.escape,
-		urlescape = gluon_luci.urlescape,
-	}) %>
-</p>
-
-<% if not self.embedded then %>
-<form method="post" enctype="multipart/form-data" action="<%=REQUEST_URI%>">
-	<div>
-		<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-		<input type="hidden" name="token" value="<%=token%>" />
-		<input type="hidden" name="cbi.submit" value="1" />
-	</div>
-<% end %>
-	<div class="cbi-map" id="cbi-<%=self.config%>">
-		<% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
-		<% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
-		<% self:render_children() %>
-		<br />
-	</div>
-<%- if self.message then %>
-	<div><%=self.message%></div>
-<%- end %>
-<%- if self.errmessage then %>
-	<div class="error"><%=self.errmessage%></div>
-<%- end %>
-<% if not self.embedded then %>
-	<div class="cbi-page-actions">
-<%-
-		if type(self.hidden) == "table" then
-		  for k, v in pairs(self.hidden) do
-%>
-		<input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
-<%-
-		  end
-		end
-%>
-		<input class="cbi-button cbi-button-save" type="submit" value="<%:Save & restart%>" />
-		<script type="text/javascript">cbi_d_update();</script>
-	</div>
-</form>
-<% end %>
--- a/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/config-mode/reboot.htm
+++ b/package/gluon-config-mode-core/files/usr/lib/lua/luci/view/gluon/config-mode/reboot.htm
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%=luci.i18n.context.lang%>" lang="<%=luci.i18n.context.lang%>">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title><%=escape(hostname)%> is rebooting</title>
-    <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
-  </head>
-  <body>
-    <div id="maincontainer">
-      <div id="maincontent">
-        <h2><%:Your node's setup is now complete.%></h2>
-        <% for k, v in ipairs(parts) do v() end %>
-      </div>
-    </div>
-  </body>
-</html>
--- a/package/gluon-config-mode-core/i18n/de.po
+++ b/package/gluon-config-mode-core/i18n/de.po
@@ -10,7 +10,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#, fuzzy
 msgid "Save & restart"
 msgstr "Speichern & Neustarten"


--- a/package/gluon-config-mode-core/i18n/fr.po
+++ b/package/gluon-config-mode-core/i18n/fr.po
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "PO-Revision-Date: 2015-08-12 23:30+0100\n"
 "Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#, fuzzy
+
 msgid "Save & restart"
 msgstr "Enregistrer & Redémarer"


--- a/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/controller/gluon-config-mode/index.lua
+++ b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/controller/gluon-config-mode/index.lua
+package 'gluon-config-mode-core'
+
+entry({}, alias("wizard"))
+entry({"wizard"}, model("gluon-config-mode/wizard"), _("Wizard"), 5)
--- a/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/model/gluon-config-mode/wizard.lua
+++ b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/model/gluon-config-mode/wizard.lua
+local util = require "gluon.util"
+local uci = require("simple-uci").cursor()
+
+local f = Form(translate("Welcome!"))
+f.submit = translate('Save & restart')
+f.reset = false
+
+local s = f:section(Section)
+s.template = "wizard/welcome"
+s.package = "gluon-config-mode-core"
+
+for _, entry in ipairs(util.glob('/lib/gluon/config-mode/wizard/*')) do
+	local section = assert(loadfile(entry))
+	setfenv(section, getfenv())
+	section()(f, uci)
+end
+
+function f:write()
+	local fcntl = require 'posix.fcntl'
+	local unistd = require 'posix.unistd'
+
+	uci:set("gluon-setup-mode", uci:get_first("gluon-setup-mode", "setup_mode"), "configured", true)
+	uci:save("gluon-setup-mode")
+
+	os.execute('exec gluon-reconfigure >/dev/null')
+
+	f.template = "wizard/reboot"
+	f.package = "gluon-config-mode-core"
+	f.hidenav = true
+
+	if unistd.fork() == 0 then
+		-- Replace stdout with /dev/null
+		local null = fcntl.open('/dev/null', fcntl.O_WRONLY)
+		unistd.dup2(null, unistd.STDOUT_FILENO)
+
+		-- Sleep a little so the browser can fetch everything required to
+		-- display the reboot page, then reboot the device.
+		unistd.sleep(1)
+
+		unistd.execp('reboot', {[0] = 'reboot'})
+	end
+end
+
+return f
--- a/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua
+++ b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/reboot/0900-msg-reboot.lua
-local i18n = require 'luci.i18n'
-local site = require 'gluon.site_config'
-local gluon_luci = require 'gluon.luci'
+local site_i18n = i18n 'gluon-site'
+
+local site = require 'gluon.site'
 local sysconfig = require 'gluon.sysconfig'
 local pretty_hostname = require 'pretty_hostname'

-local uci = luci.model.uci.cursor()
+local uci = require("simple-uci").cursor()

 local hostname = pretty_hostname.get(uci)
 local contact = uci:get_first('gluon-node-info', 'owner', 'contact')

-local msg = i18n.translate('gluon-config-mode:reboot')
+local msg = site_i18n._translate('gluon-config-mode:reboot')
+if not msg then return end

-return function ()
-  luci.template.render_string(msg, {
+renderer.render_string(msg, {
 	hostname = hostname,
 	site = site,
 	sysconfig = sysconfig,
 	contact = contact,
-    escape = gluon_luci.escape,
-    urlescape = gluon_luci.urlescape,
 })
-end
--- a/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/www/cgi-bin/config
+++ b/package/gluon-config-mode-core/luasrc/lib/gluon/config-mode/www/cgi-bin/config
+#!/usr/bin/lua
+
+require 'gluon.web.cgi' {
+	base_path = '/lib/gluon/config-mode',
+
+	layout_package = 'gluon-config-mode-theme',
+	layout_template = 'theme/layout',
+}
--- a/package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
+++ b/package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/controller/gluon-config-mode/index.lua
--[[
-Copyright 2013 Nils Schneider <nils@nilsschneider.net>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-]]--
-
-module("luci.controller.gluon-config-mode.index", package.seeall)
-
-function index()
-  local uci_state = luci.model.uci.cursor_state()
-
-  if uci_state:get_first("gluon-setup-mode", "setup_mode", "running", "0") == "1" then
-    local root = node()
-    if not root.target then
-      root.target = alias("gluon-config-mode")
-      root.index = true
-    end
-
-    page          = node()
-    page.lock     = true
-    page.target   = alias("gluon-config-mode")
-    page.subindex = true
-    page.index    = false
-
-    page          = node("gluon-config-mode")
-    page.title    = _("Wizard")
-    page.target   = alias("gluon-config-mode", "wizard")
-    page.order    = 5
-    page.sysauth = "root"
-    page.sysauth_authenticator = function() return "root" end
-    page.index    = true
-
-    entry({"gluon-config-mode", "wizard"}, cbi("gluon-config-mode/wizard")).index = true
-    entry({"gluon-config-mode", "reboot"}, call("action_reboot"))
-  end
-end
-
-function action_reboot()
-  local uci = luci.model.uci.cursor()
-
-  uci:set("gluon-setup-mode", uci:get_first("gluon-setup-mode", "setup_mode"), "configured", "1")
-  uci:save("gluon-setup-mode")
-  uci:commit("gluon-setup-mode")
-
-  local gluon_luci = require "gluon.luci"
-  local fs = require "nixio.fs"
-  local util = require "nixio.util"
-  local pretty_hostname = require "pretty_hostname"
-
-  local parts_dir = "/lib/gluon/config-mode/reboot/"
-  local files = util.consume(fs.dir(parts_dir))
-
-  table.sort(files)
-
-  local parts = {}
-
-  for _, entry in ipairs(files) do
-    if entry:sub(1, 1) ~= '.' then
-      local f = dofile(parts_dir .. '/' .. entry)
-      if f ~= nil then
-        table.insert(parts, f)
-      end
-    end
-  end
-
-  local hostname = pretty_hostname.get(uci)
-
-  luci.template.render("gluon/config-mode/reboot",
-    {
-      parts = parts,
-      hostname = hostname,
-      escape = gluon_luci.escape,
-      urlescape = gluon_luci.urlescape,
-    }
-  )
-
-  if nixio.fork() == 0 then
-    -- Replace stdout with /dev/null
-    nixio.dup(nixio.open('/dev/null', 'w'), nixio.stdout)
-
-    -- Sleep a little so the browser can fetch everything required to
-    -- display the reboot page, then reboot the device.
-    nixio.nanosleep(1)
-
-    nixio.execp("reboot")
-  end
-end
--- a/package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
+++ b/package/gluon-config-mode-core/luasrc/usr/lib/lua/luci/model/cbi/gluon-config-mode/wizard.lua
-local wizard_dir = "/lib/gluon/config-mode/wizard/"
-local i18n = luci.i18n
-local uci = luci.model.uci.cursor()
-local fs = require "nixio.fs"
-local util = require "nixio.util"
-local f, s
-
-local wizard = {}
-local files = {}
-
-if fs.access(wizard_dir) then
-  files = util.consume(fs.dir(wizard_dir))
-  table.sort(files)
-end
-
-for _, entry in ipairs(files) do
-  if entry:sub(1, 1) ~= '.' then
-    table.insert(wizard, dofile(wizard_dir .. '/' .. entry))
-  end
-end
-
-f = SimpleForm("wizard")
-f.reset = false
-f.template = "gluon/cbi/config-mode"
-
-for _, s in ipairs(wizard) do
-  s.section(f)
-end
-
-function f.handle(self, state, data)
-  if state == FORM_VALID then
-    for _, s in ipairs(wizard) do
-      s.handle(data)
-    end
-
-    luci.http.redirect(luci.dispatcher.build_url("gluon-config-mode", "reboot"))
-  end
-
-  return true
-end
-
-return f
--- a/package/gluon-config-mode-domain-select/Makefile
+++ b/package/gluon-config-mode-domain-select/Makefile
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-config-mode-domain-select
+
+include ../gluon.mk
+
+define Package/gluon-config-mode-domain-select
+  TITLE:=UI for changing the node-config
+  DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN
+endef
+
+$(eval $(call BuildPackageGluon,gluon-config-mode-domain-select))
--- a/package/gluon-config-mode-domain-select/check_site.lua
+++ b/package/gluon-config-mode-domain-select/check_site.lua
+local valid_domain_codes = table_keys(need_table(in_domain({'domain_names'})))
+
+alternatives(function()
+	need_boolean(in_domain({'hide_domain'}), false)
+end, function()
+	need_array_of(in_domain({'hide_domain'}), valid_domain_codes, false)
+end)
--- a/package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua
+++ b/package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua
+
+return function(form, uci)
+	local site_i18n = i18n 'gluon-site'
+
+	local json = require 'jsonc'
+	local site = require 'gluon.site'
+	local util = require 'gluon.util'
+
+	local selected_domain = uci:get('gluon', 'core', 'domain')
+	local configured = uci:get_first('gluon-setup-mode','setup_mode', 'configured') == '1' or
+		(selected_domain ~= site.default_domain())
+
+	local function hide_domain_code(domain, code)
+		if configured and code == selected_domain then
+			return false
+		elseif type(domain.hide_domain) == 'table' then
+			return util.contains(domain.hide_domain, code)
+		else
+			return domain.hide_domain
+		end
+	end
+
+	local function get_domain_list()
+		local list = {}
+		for _, domain_path in ipairs(util.glob('/lib/gluon/domains/*.json')) do
+			local domain_code = domain_path:match('([^/]+)%.json$')
+			local domain = assert(json.load(domain_path))
+
+			if not hide_domain_code(domain, domain_code) then
+				table.insert(list, {
+					domain_code = domain_code,
+					domain_name = domain.domain_names[domain_code],
+				})
+			end
+		end
+
+		table.sort(list, function(a, b) return a.domain_name < b.domain_name end)
+		return list
+	end
+
+	local s = form:section(Section, nil, site_i18n.translate('gluon-config-mode:domain-select'))
+	local o = s:option(ListValue, 'domain', site_i18n.translate('gluon-config-mode:domain'))
+
+	if configured then
+		o.default = selected_domain
+	end
+
+	for _, domain in ipairs(get_domain_list()) do
+		o:value(domain.domain_code, domain.domain_name)
+	end
+
+	function o:write(data)
+		uci:set('gluon', 'core', 'domain', data)
+		uci:save('gluon')
+	end
+end
--- a/package/gluon-config-mode-geo-location-osm/Makefile
+++ b/package/gluon-config-mode-geo-location-osm/Makefile
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-config-mode-geo-location-osm
+
+include ../gluon.mk
+
+define Package/gluon-config-mode-geo-location-osm
+  TITLE:=Set geographic location of a node (map support)
+  DEPENDS:=+gluon-config-mode-geo-location +gluon-web-osm
+endef
+
+define Package/gluon-config-mode-geo-location-osm/install
+	$(Gluon/Build/Install)
+
+	$(INSTALL_DIR) $(1)/lib/gluon/config-mode/www/static/
+	$(LN) /lib/gluon/web/www/static/gluon-web-osm.js $(1)/lib/gluon/config-mode/www/static/
+endef
+
+$(eval $(call BuildPackageGluon,gluon-config-mode-geo-location-osm))
--- a/package/gluon-config-mode-geo-location-osm/check_site.lua
+++ b/package/gluon-config-mode-geo-location-osm/check_site.lua
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lon'}))
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'center', 'lat'}))
+need_number(in_site({'config_mode', 'geo_location', 'osm', 'zoom'}), false)
+need_string(in_site({'config_mode', 'geo_location', 'osm', 'openlayers_url'}), false)
+
+if need_table(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer'}), nil, false) then
+	need_one_of(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer', 'type'}), {'XYZ'})
+	need_string(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer', 'url'}))
+	need_string(in_site({'config_mode', 'geo_location', 'osm', 'tile_layer', 'attributions'}))
+end
No results found