nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configmode: read pubkey message from site configuration

Browse Source
This commit is contained in:
Nils Schneider 2013-09-30 00:55:38 +02:00
parent 91d70b98c7
commit 663b419cd5
5 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gluon-config-mode/Makefile
View File

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

1
package/gluon-config-mode/files/etc/config/configmode
View File

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

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

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

43
package/gluon-config-mode/files/usr/lib/lua/luci/view/configmode/reboot.htm
View File

@ -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>

43
package/gluon-config-mode/generate/usr/lib/lua/luci/view/configmode/reboot.htm Normal file
View File

@ -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>