From 434da00e494c1256f97b7a8d635e88f1a36d92a3 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Thu, 10 Nov 2016 07:40:21 +0100
Subject: [PATCH] gluon-config-mode-mesh-vpn: add extra message if mesh-VPN was
 not selected

This was introduced in ffhh-packages at https://github.com/freifunkhamburg/ffhh-packages/tree/master/gluon-config-mode-reboot-ffhh
---
 docs/site-example/i18n/de.po                  |  7 +++
 docs/site-example/i18n/en.po                  |  6 +++
 docs/site-example/i18n/fr.po                  |  8 ++-
 docs/site-example/i18n/gluon-site.pot         |  3 ++
 docs/user/site.rst                            |  3 ++
 .../config-mode/reboot/0100-mesh-vpn.lua      | 53 ++++++++++---------
 6 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/docs/site-example/i18n/de.po b/docs/site-example/i18n/de.po
index 872d2d1c..e7ff1b17 100644
--- a/docs/site-example/i18n/de.po
+++ b/docs/site-example/i18n/de.po
@@ -31,6 +31,13 @@ msgstr ""
 "<%= pubkey %>"
 "</div>"
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p><div class=\"the-key\">Du hast ausgewählt, <strong>kein Mesh-VPN</strong> "
+"zu nutzen. Dein Knoten kann also nur dann eine Verbindung zum Freifunk Netz "
+"aufbauen, wenn andere Freifunk-Router in WLAN-Reichweite sind."
+"</div></p>"
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, "
diff --git a/docs/site-example/i18n/en.po b/docs/site-example/i18n/en.po
index e119818b..e5c9f31a 100644
--- a/docs/site-example/i18n/en.po
+++ b/docs/site-example/i18n/en.po
@@ -28,6 +28,12 @@ msgstr ""
 "<%= pubkey %>"
 "</div>"
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p><div class=\"the-key\">You have selected <strong>not</strong> to use the mesh VPN. "
+"Your node will only be able to connect to the Freifunk network if other nodes in reach "
+"already have a connection.</div></p>"
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>The node is currently rebooting and will try to connect to other "
diff --git a/docs/site-example/i18n/fr.po b/docs/site-example/i18n/fr.po
index e83ce0de..5a3df1bc 100644
--- a/docs/site-example/i18n/fr.po
+++ b/docs/site-example/i18n/fr.po
@@ -14,7 +14,7 @@ msgid "gluon-config-mode:welcome"
 msgstr ""
 "Bienvenue dans l'assistant de configuration pour votre nouveau nœud "
 "Freifunk. Remplissez le formulaire suivant en fonction de vos besoins "
-"et enregistrez le" 
+"et enregistrez le"
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
@@ -31,6 +31,12 @@ msgstr ""
 "<%= pubkey %>"
 "</div>"
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+"<p><div class=\"the-key\">Vous avez choisi de <strong>ne pas utiliser</strong> "
+"le réseau VPN. Votre nœud ne pourra se connecter au réseau Freifunk que si "
+"d'autres nœuds à portée ont déjà une connexion.</div></p>"
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Votre nœud es en train de redémarrer et va ensuite éssayer de se connecter "
diff --git a/docs/site-example/i18n/gluon-site.pot b/docs/site-example/i18n/gluon-site.pot
index a161a12b..7fe3293c 100644
--- a/docs/site-example/i18n/gluon-site.pot
+++ b/docs/site-example/i18n/gluon-site.pot
@@ -7,6 +7,9 @@ msgstr ""
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 
+msgid "gluon-config-mode:novpn"
+msgstr ""
+
 msgid "gluon-config-mode:reboot"
 msgstr ""
 
diff --git a/docs/user/site.rst b/docs/user/site.rst
index df8525be..7f944e8a 100644
--- a/docs/user/site.rst
+++ b/docs/user/site.rst
@@ -364,6 +364,9 @@ gluon-config-mode:welcome
 gluon-config-mode:pubkey
     Information about the public VPN key on the reboot page.
 
+gluon-config-mode:novpn
+    Information shown on the reboot page, if the mesh VPN was not selected.
+
 gluon-config-mode:altitude-label
     Label for the ``altitude`` field
 
diff --git a/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
index 07b6d228..0e707154 100644
--- a/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
+++ b/package/gluon-config-mode-mesh-vpn/luasrc/lib/gluon/config-mode/reboot/0100-mesh-vpn.lua
@@ -1,33 +1,34 @@
 local uci = luci.model.uci.cursor()
 local meshvpn_enabled = uci:get("fastd", "mesh_vpn", "enabled", "0")
 
+local i18n = require "luci.i18n"
+local util = require "luci.util"
+
+local gluon_luci = require 'gluon.luci'
+local site = require 'gluon.site_config'
+local sysconfig = require 'gluon.sysconfig'
+
+local pretty_hostname = require 'pretty_hostname'
+
+local pubkey = ""
+local hostname = pretty_hostname.get(uci)
+local contact = uci:get_first("gluon-node-info", "owner", "contact")
+
 if meshvpn_enabled ~= "1" then
-  return nil
+  local msg = i18n.translate('gluon-config-mode:novpn')
 else
-  local i18n = require "luci.i18n"
-  local util = require "luci.util"
-
-  local gluon_luci = require 'gluon.luci'
-  local site = require 'gluon.site_config'
-  local sysconfig = require 'gluon.sysconfig'
-
-  local pretty_hostname = require 'pretty_hostname'
-
-  local pubkey = util.trim(util.exec("/etc/init.d/fastd show_key " .. "mesh_vpn"))
-  local hostname = pretty_hostname.get(uci)
-  local contact = uci:get_first("gluon-node-info", "owner", "contact")
-
+  pubkey = util.trim(util.exec("/etc/init.d/fastd show_key " .. "mesh_vpn"))
   local msg = i18n.translate('gluon-config-mode:pubkey')
-
-  return function ()
-    luci.template.render_string(msg, {
-      pubkey = pubkey,
-      hostname = hostname,
-      site = site,
-      sysconfig = sysconfig,
-      contact = contact,
-      escape = gluon_luci.escape,
-      urlescape = gluon_luci.urlescape,
-    })
-  end
+end
+
+return function ()
+  luci.template.render_string(msg, {
+    pubkey = pubkey,
+    hostname = hostname,
+    site = site,
+    sysconfig = sysconfig,
+    contact = contact,
+    escape = gluon_luci.escape,
+    urlescape = gluon_luci.urlescape,
+  })
 end