From 9d69f61f4c1b46074205970774694e0f2d5ce88d Mon Sep 17 00:00:00 2001 From: Jonathan Bennett Date: Wed, 10 Jun 2015 09:31:53 -0500 Subject: [PATCH 1/1] Luci-app-fwknopd:add a couple config options to the interface Minor tweaks to uci-defaults refresh translation files Signed-off-by: Jonathan Bennett --- applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua | 2 ++ applications/luci-app-fwknopd/po/en/{en.po => fwknopd.po} | 10 ++++++++++ applications/luci-app-fwknopd/po/templates/fwknopd.pot | 8 ++++++++ .../luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd | 5 +++++ 4 files changed, 25 insertions(+) rename applications/luci-app-fwknopd/po/en/{en.po => fwknopd.po} (90%) diff --git a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua index 84a1a23d8..096724f73 100644 --- a/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua +++ b/applications/luci-app-fwknopd/luasrc/model/cbi/fwknopd.lua @@ -46,6 +46,8 @@ s = m:section(TypedSection, "config", translate("fwknopd.conf config options")) s.anonymous=true s.dynamic=true s:option(Value, "MAX_SPA_PACKET_AGE", "MAX_SPA_PACKET_AGE", translate("Maximum age in seconds that an SPA packet will be accepted. defaults to 120 seconds")) +s:option(Value, "PCAP_INTF", "PCAP_INTF", translate("Specify the ethernet interface on which fwknopd will sniff packets.")) +s:option(Value, "ENABLE_IPT_FORWARDING", "ENABLE_IPT_FORWARDING", translate("Allow SPA clients to request access to services through an iptables firewall instead of just to it.")) s:option(DummyValue, "note2", translate("Enter custom fwknopd.conf variables below:")) return m diff --git a/applications/luci-app-fwknopd/po/en/en.po b/applications/luci-app-fwknopd/po/en/fwknopd.po similarity index 90% rename from applications/luci-app-fwknopd/po/en/en.po rename to applications/luci-app-fwknopd/po/en/fwknopd.po index 1abc6a8f9..d75c99d52 100644 --- a/applications/luci-app-fwknopd/po/en/en.po +++ b/applications/luci-app-fwknopd/po/en/fwknopd.po @@ -10,6 +10,13 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +msgid "" +"Allow SPA clients to request access to services through an iptables firewall " +"instead of just to it." +msgstr "" +"Allow SPA clients to request access to services through an iptables firewall " +"instead of just to it." + msgid "Base 64 key" msgstr "Base 64 key" @@ -83,6 +90,9 @@ msgstr "" msgid "Normal Key" msgstr "Normal Key" +msgid "Specify the ethernet interface on which fwknopd will sniff packets." +msgstr "Specify the ethernet interface on which fwknopd will sniff packets." + msgid "The base64 hmac key" msgstr "The base64 hmac key" diff --git a/applications/luci-app-fwknopd/po/templates/fwknopd.pot b/applications/luci-app-fwknopd/po/templates/fwknopd.pot index ec1550462..4fb616f25 100644 --- a/applications/luci-app-fwknopd/po/templates/fwknopd.pot +++ b/applications/luci-app-fwknopd/po/templates/fwknopd.pot @@ -1,6 +1,11 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "" +"Allow SPA clients to request access to services through an iptables firewall " +"instead of just to it." +msgstr "" + msgid "Base 64 key" msgstr "" @@ -57,6 +62,9 @@ msgstr "" msgid "Normal Key" msgstr "" +msgid "Specify the ethernet interface on which fwknopd will sniff packets." +msgstr "" + msgid "The base64 hmac key" msgstr "" diff --git a/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd b/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd index 689bedcd1..01b85de25 100644 --- a/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd +++ b/applications/luci-app-fwknopd/root/etc/uci-defaults/luci-fwknopd @@ -1,6 +1,7 @@ #!/bin/sh #-- Copyright 2015 Jonathan Bennett #-- Licensed to the public under the GNU General Public License v2. +. /lib/functions/network.sh uci batch <