diff --git a/gluon/gluon-config-mode/Makefile b/gluon/gluon-config-mode/Makefile
index 3703508..8a081aa 100644
--- a/gluon/gluon-config-mode/Makefile
+++ b/gluon/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))
diff --git a/gluon/gluon-config-mode/files/etc/config/configmode b/gluon/gluon-config-mode/files/etc/config/configmode
index d5e9100..ff348bb 100644
--- a/gluon/gluon-config-mode/files/etc/config/configmode
+++ b/gluon/gluon-config-mode/files/etc/config/configmode
@@ -1,4 +1,3 @@
config wizard
option enabled '1'
option configured '0'
- option keyaddress 'keys@luebeck.freifunk.net'
diff --git a/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua b/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua
index 5c12c49..71a1a60 100644
--- a/gluon/gluon-config-mode/files/usr/lib/lua/luci/controller/configmode/configmode.lua
+++ b/gluon/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")
diff --git a/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/configmode/reboot.htm b/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/configmode/reboot.htm
deleted file mode 100644
index 4ef5a1d..0000000
--- a/gluon/gluon-config-mode/files/usr/lib/lua/luci/view/configmode/reboot.htm
+++ /dev/null
@@ -1,43 +0,0 @@
-<%#
-LuCI - Lua Configuration Interface
-Copyright 2008 Steven Barth
-Copyright 2008 Jo-Philipp Wich
-
-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$
-
--%>
-
-
-
- <%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %>
-
-
-
-
-
-
Geschafft! Dein Freifunkknoten ist nun fertig eingerichtet.
- <% if pubkey then %>
-
- <% end %>
-
-
-
-
-
diff --git a/gluon/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm b/gluon/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm
new file mode 100644
index 0000000..c60dc9c
--- /dev/null
+++ b/gluon/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm
@@ -0,0 +1,43 @@
+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth
+Copyright 2008 Jo-Philipp Wich
+
+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$
+
+-%>
+
+
+
+ <%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %>
+
+
+
+
+
+
Geschafft! Dein Freifunkknoten ist nun fertig eingerichtet.