configmode: read pubkey message from site configuration

package/gluon-config-mode/Makefile

@@ -34,6 +34,7 @@ endef
 
 define Package/gluon-config-mode/install
 	$(CP) ./files/* $(1)/
+	$(GLUON_GENERATE) ./generate/* $(1)/
 endef
 
 $(eval $(call BuildPackage,gluon-config-mode))

package/gluon-config-mode/files/etc/config/configmode

 config wizard
   option enabled '1'
   option configured '0'
-  option keyaddress '<a href="mailto:keys@luebeck.freifunk.net">keys@luebeck.freifunk.net</a>'

package/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua

@@ -47,12 +47,11 @@ function action_reboot()
   local configmode = require "luci.tools.configmode"
   local pubkey
   local uci = luci.model.uci.cursor()
-  local address = uci:get_first("configmode", "wizard", "keyaddress")
   local meshvpn_enabled = uci:get("fastd", meshvpn_name, "enabled", "0")
   if meshvpn_enabled == "1" then
     pubkey = configmode.get_fastd_pubkey(meshvpn_name)
   end
-	luci.template.render("configmode/reboot", {pubkey=pubkey, address=address})
+	luci.template.render("configmode/reboot", {pubkey=pubkey})
 
   uci:foreach("configmode", "wizard", function(s)
       uci:set("configmode", s[".name"], "configured", "1")

package/gluon-config-mode/files/usr/lib/lua/luci/view/configmode/reboot.htm → package/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm

@@ -25,7 +25,7 @@ $Id$
         <% if pubkey then %>
         <fieldset class="cbi-section">
           <p>
-            Dies ist der öffentliche Schlüssel deines Freifunkknotens. Bitte schicke ihn an <%=address%>, um ihn auf den Freifunkservern eintragen zu lassen. Sobald der Schlüssel eingetragen wurde, kann dein Knoten das Mesh-VPN nutzen.
+            @configmode.msg_pubkey@
           </p>
           <div style="text-align: center;font-size: 2em;line-height: 1em; background: #f5f5f5; border: 1px solid #ececec; margin-bottom: 0.5em; padding: 0.5em">
             <%=pubkey%>