Commit bed3c8ad authored by chrissi^'s avatar chrissi^

Removed Owner Contact Info from Gluon

This commit removes the Contact Info from the router itself. Until now
contact info was entered in the config wizzard and brought to the
Freifunk Brauschweig Technical Admins in two ways:
* Via the fastd-key entered in the webapp
* Via alfed and the stats.json

Since the goal is to keep the info as secret as possible we will remove
the contact-info field from the wizzard and we will reset the contact
info field on all router on the next update.

We will offer an interface on the webapp where user *can* add their
contact info instead.

Actual changes to our gluon:
* removed the contact info package
* added a ffbs-package to reset the contact info in uci.
* Removed now unused patch for the wizzard
Signed-off-by: chrissi^'s avatarChrissi^ <chris@tinyhost.de>
parent 095bc9b9
GLUON_SITE_FEEDS='packages_fffd'
PACKAGES_PACKAGES_FFFD_REPO=git://github.com/freifunk-fulda/fffd-packages.git
PACKAGES_PACKAGES_FFFD_COMMIT=e46e41a44dfddbfaf8ec97b2ebc2eb363ccba08d
PACKAGES_PACKAGES_FFFD_BRANCH=stable
GLUON_SITE_FEEDS='packages_ffbs'
PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
PACKAGES_PACKAGES_FFBS_COMMIT=b19f4a069896c96602c47308282aa5d522c7a926
PACKAGES_PACKAGES_FFBS_BRANCH=master
From e2f0d74d284b12c63c66425b8749e4a7b4b6810a Mon Sep 17 00:00:00 2001
From: Chris Fiege <c.fiege@pengutronix.de>
Date: Wed, 21 Jun 2017 21:29:45 +0200
Subject: [PATCH] Modifying the config-mode-contact-package to match the FFBS
texts
---
package/gluon-config-mode-contact-info/i18n/de.po | 13 +++++------
package/gluon-config-mode-contact-info/i18n/fr.po | 26 ----------------------
.../i18n/gluon-config-mode-contact-info.pot | 5 ++---
.../gluon/config-mode/wizard/0500-contact-info.lua | 6 ++---
4 files changed, 10 insertions(+), 40 deletions(-)
delete mode 100644 package/gluon-config-mode-contact-info/i18n/fr.po
diff --git a/package/gluon-config-mode-contact-info/i18n/de.po b/package/gluon-config-mode-contact-info/i18n/de.po
index 35f0ee95..a4ef972a 100644
--- a/package/gluon-config-mode-contact-info/i18n/de.po
+++ b/package/gluon-config-mode-contact-info/i18n/de.po
@@ -14,14 +14,13 @@ msgid "Contact info"
msgstr "Kontakt"
msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates."
+"Please provide your contact information here to allow us to contact "
+"you. We will not publish this information."
+
msgstr ""
-"Bitte hinterlege hier einen Hinweis, um anderen zu ermöglichen, "
-"Kontakt mit dir aufzunehmen. Beachte, dass dieser Hinweis auch "
-"<em>öffentlich</em> im Internet, zusammen mit den Koordinaten "
-"deines Knotens, einsehbar sein wird."
+"Bitte hinterlege hier einen Hinweis, um uns zu ermöglichen, "
+"Kontakt mit dir aufzunehmen. Wir werden diese Information nicht "
+"mit anderen teilen."
msgid "e.g. E-mail or phone number"
msgstr "z.B. E-Mail oder Telefonnummer"
diff --git a/package/gluon-config-mode-contact-info/i18n/fr.po b/package/gluon-config-mode-contact-info/i18n/fr.po
deleted file mode 100644
index 624b1864..00000000
--- a/package/gluon-config-mode-contact-info/i18n/fr.po
+++ /dev/null
@@ -1,26 +0,0 @@
-msgid ""
-msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: PACKAGE VERSION\n"
-"PO-Revision-Date: 2015-08-12 23:30+0100\n"
-"Last-Translator:Tobias Bernot <tqbs@airmail.cc>\n"
-"Language-Team: French\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgid "Contact info"
-msgstr "Informations de Contact"
-
-msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates."
-msgstr ""
-"S'il vous plaît entrez ici des informations <em>publiques</em> pour "
-"permettre aux autres de vous contacter. "
-"Ces informations seront affichées en ligne, avec les coordonnées du nœud."
-
-msgid "e.g. E-mail or phone number"
-msgstr "Ex : E-mail ou numéro de téléphone"
diff --git a/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot b/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot
index 9dcaf9ec..933d5d0c 100644
--- a/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot
+++ b/package/gluon-config-mode-contact-info/i18n/gluon-config-mode-contact-info.pot
@@ -5,9 +5,8 @@ msgid "Contact info"
msgstr ""
msgid ""
-"Please provide your contact information here to allow others to contact "
-"you. Note that this information will be visible <em>publicly</em> on "
-"the internet together with your node's coordinates."
+"Please provide your contact information here to allow us to contact "
+"you. We will not publish this information."
msgstr ""
msgid "e.g. E-mail or phone number"
diff --git a/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua b/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua
index 1ef5deaf..47775fb9 100644
--- a/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua
+++ b/package/gluon-config-mode-contact-info/luasrc/lib/gluon/config-mode/wizard/0500-contact-info.lua
@@ -4,10 +4,8 @@ return function(form, uci)
local owner = uci:get_first("gluon-node-info", "owner")
local s = form:section(Section, nil, translate(
- 'Please provide your contact information here to '
- .. 'allow others to contact you. Note that '
- .. 'this information will be visible <em>publicly</em> '
- .. 'on the internet together with your node\'s coordinates.'
+ "Please provide your contact information here to allow us to contact "
+ .. "you. We will not publish this information."
))
local o = s:option(Value, "contact", translate("Contact info"), translate("e.g. E-mail or phone number"))
--
2.11.0
From 7f6fa37c2de9ee6d4ac76575069096231ed838e3 Mon Sep 17 00:00:00 2001
From 135ea670ba78328cdb68e89ddb01e168af971a9e Mon Sep 17 00:00:00 2001
From: Chrissi^ <chris@tinyhost.de>
Date: Wed, 12 Jul 2017 20:14:11 +0200
Subject: [PATCH] Removing Owner Contact-Info from Statuspage
Subject: [PATCH 1/2] Removing Owner Contact-Info from Statuspage
This is one of multiple patches to stop the node from leaking the contact Info
into the network.
......@@ -24,5 +24,5 @@ index 1441b34e..15354bc1 100644
dlEntry(list, nodeInfo, "network.mac", Helper._("Primary MAC"))
dlEntry(list, nodeInfo, "network.addresses", Helper._("IP Address"))
--
2.11.0
2.17.1
From 2203b50642b4d46ad6a23b1f4e00399e811b2674 Mon Sep 17 00:00:00 2001
From a1e91bcf3f6cde08f56e82857e412ea47737ec07 Mon Sep 17 00:00:00 2001
From: Chris Fiege <c.fiege@pengutronix.de>
Date: Wed, 21 Jun 2017 22:04:41 +0200
Subject: [PATCH] Setting example coordinates to the brunswick lion
Subject: [PATCH 2/2] Setting example coordinates to the brunswick lion
Well, we don't actually need this. But let's try some patriotism.
---
.../luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua | 4 ++--
.../luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua
......@@ -31,5 +31,5 @@ index 4d7fec01..38cd8604 100644
o:depends(share_location, true)
o.datatype = "float"
--
2.11.0
2.17.1
......@@ -7,7 +7,6 @@ GLUON_SITE_PACKAGES := \
gluon-config-mode-geo-location \
gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \
gluon-config-mode-contact-info \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-web-admin \
......@@ -22,11 +21,9 @@ GLUON_SITE_PACKAGES := \
iptables \
gluon-web-network \
gluon-ebtables-source-filter \
haveged
haveged \
gluon-ffbs-rm-contactinfo
# Removed packages
# gluon-fffd-wifi-aliases \
# x86-generic
ifeq ($(GLUON_TARGET),x86-generic)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment