configmode: read pubkey message from site configuration
This commit is contained in:
Nils Schneider
parent
d747efc4ee
commit
61de9d693e
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
config wizard
|
||||
option enabled '1'
|
||||
option configured '0'
|
||||
option keyaddress '<a href="mailto:keys@luebeck.freifunk.net">keys@luebeck.freifunk.net</a>'
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
<%#
|
||||
LuCI - Lua Configuration Interface
|
||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.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$
|
||||
|
||||
-%>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="maincontainer">
|
||||
<div id="maincontent">
|
||||
<h2>Geschafft! Dein Freifunkknoten ist nun fertig eingerichtet.</h2>
|
||||
<% 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.
|
||||
</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%>
|
||||
</div>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
<fieldset class="cbi-section">
|
||||
<p>
|
||||
Dein Knoten startet jetzt neu. Anschließend wird er versuchen sich mit anderen Knoten in der Nähe zu verbinden. Wir wünschen dir viel Spaß dabei Freifunk zu erkunden!
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
<%#
|
||||
LuCI - Lua Configuration Interface
|
||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.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$
|
||||
|
||||
-%>
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title><%=luci.sys.hostname()%> - <% if title then %><%=title%><% else %><%:Rebooting...%><% end %></title>
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="maincontainer">
|
||||
<div id="maincontent">
|
||||
<h2>Geschafft! Dein Freifunkknoten ist nun fertig eingerichtet.</h2>
|
||||
<% if pubkey then %>
|
||||
<fieldset class="cbi-section">
|
||||
<p>
|
||||
@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%>
|
||||
</div>
|
||||
</fieldset>
|
||||
<% end %>
|
||||
<fieldset class="cbi-section">
|
||||
<p>
|
||||
Dein Knoten startet jetzt neu. Anschließend wird er versuchen sich mit anderen Knoten in der Nähe zu verbinden. Wir wünschen dir viel Spaß dabei Freifunk zu erkunden!
|
||||
</p>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue