Changeset 2187


Ignore:
Timestamp:
Sep 19, 2012, 3:29:39 PM (7 years ago)
Author:
matthijs
Message:

luci-openvpn: Restructure various settings.

The "security settings" page has been expanded in the previous commits
to a more general settings page. To make it a bit more clear, it has
been divided in multiple sections.

This also allows grouping the settings that require re-downloading the
client configuration files and adding a notice about that.

Location:
trunk/luci
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/luci/applications/luci-openvpn/luasrc/controller/openvpn.lua

    r2184 r2187  
    2929
    3030        local page  = node("fon_admin", "openvpn", "firewall")
    31         page.title  = luci.i18n.translate("openvpn_security", "Manage Security settings")
     31        page.title  = luci.i18n.translate("settings", "Settings")
    3232        page.icon_path  = "/luci-static/resources/icons/plugins"
    3333    page.page_icon  = "openvpn.png"
  • trunk/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn.lua

    r2186 r2187  
    66local m = Map("openvpn",
    77        translate("openvpn_title", "OpenVPN"),
    8         translate("openvpn_desc", "Here you can configure your vpn server. VPN allows you to remotely connect to your home network from anywhere in the world."))
     8        translate("openvpn_desc", "Here you can configure your vpn server. VPN allows you to remotely connect to your home network from anywhere in the world.")
     9        .. "<br/><br/><a href=\"https://fon.zendesk.com/entries/21925706-openvpn-configuration-and-safe-surf-feature\">"
     10        .. "&gt;&gt; " .. translate("more_info", "More information") .. "</a>")
    911m:append(Template("openvpn_status"))
    1012s = m:section(NamedSection, "openvpn", "openvpn")
     
    2729if uci:get("openvpn", "openvpn", "enable") == "0" or key == nil then
    2830        return m
    29 end
    30 
    31 local dns = require("luci.model.uci").cursor():get("ddns", "ddns_scripts", "domain")
    32 if not(dns) or #dns < 1 then
    33         s:option(Value, "public", translate("public_ip", "Public IP/hostname"))
    34 else
    35         public = s:option(DummyValue, "public", translate("public_ip", "Public IP/hostname"))
    36         public.value = "Using DDNS value: " .. dns
    3731end
    3832
  • trunk/luci/applications/luci-openvpn/luasrc/model/cbi/openvpn/firewall.lua

    r2181 r2187  
    44
    55local m = Map("openvpn",
    6         translate("openvpn_security", "Manage security settings"),
    7         translate("openvpn_security_desc", "Users connected to the VPN are able to access the foneras WebUI. In addition you can grant them access to your local network.<br>As an additional feature, you can enable the safe surf feature. Please see this wiki link for a detailed description of what it does.")
    8         .. "<br><a href=\"http://wiki.fon.com/wiki/VPN_Configuration\">http://wiki.fon.com/wiki/VPN_Configuration</a>")
     6        translate("openvpn_security", "Security settings"),
     7        translate("openvpn_security_desc", "Clients connected to the VPN are able to access the Fonera WebUI. In addition you can grant them to access your local network, other VPN clients or the internet through their VPN connection.")
     8        .. " " .. translate("openvpn_safe_surf_desc", "Enabling \"Safe surf\" causes all internet traffic for VPN clients to be securely routed through your Fonera.")
     9        .. "<br/><br/><a href=\"https://fon.zendesk.com/entries/21925706-openvpn-configuration-and-safe-surf-feature\">"
     10        .. "&gt;&gt; " .. translate("more_info", "More information") .. "</a>"
     11)
    912m.events = {"ReconfOpenVPN"}
    1013
    1114s = m:section(NamedSection, "openvpn", "openvpn")
    1215
    13 local x = s:option(ListValue, "lan", translate("openvpn_lan", "Local Network"))
     16local x = s:option(ListValue, "lan", translate("openvpn_lan", "Access to local network"))
    1417x:value("0", translate("disable"))
    1518x:value("1", translate("enable"))
    1619x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "lan") or "0"
    1720
    18 local x = s:option(ListValue, "wan", translate("openvpn_safesurf", "Safe Surf"))
     21local x = s:option(ListValue, "wan", translate("openvpn_safesurf", "Access to the internet (Safe Surf)"))
    1922x:value("0", translate("disable"))
    2023x:value("1", translate("enable"))
    2124x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "wan") or "0"
    2225
    23 local x = s:option(ListValue, "client_to_client", translate("openvpn_ctc", "Other clients"))
     26local x = s:option(ListValue, "client_to_client", translate("openvpn_ctc", "Access to other clients"))
    2427x:value("0", translate("disable"))
    2528x:value("1", translate("enable"))
    2629x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "client_to_client") or "0"
     30
     31local n = Map("openvpn",
     32        translate("openvpn_connection", "Connection settings"),
     33        translate("openvpn_connection_desc", "These settings determine how clients connect to the OpenVPN server. If you change any of these settings, you should re-download any client configurations previously downloaded, otherwise those clients will not be able to connect!"))
     34n.events = {"ReconfOpenVPN"}
     35
     36s = n:section(NamedSection, "openvpn", "openvpn")
     37
     38local dns = require("luci.model.uci").cursor():get("ddns", "ddns_scripts", "domain")
     39if not(dns) or #dns < 1 then
     40        s:option(Value, "public", translate("public_ip", "Public IP/hostname"))
     41else
     42        public = s:option(DummyValue, "public", translate("public_ip", "Public IP/hostname"))
     43        public.value = "Using DDNS value: " .. dns
     44end
    2745
    2846local x = s:option(ListValue, "proto", translate("openvpn_proto", "Protocol"))
     
    3452x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "port") or "1194"
    3553
     54local x = s:option(ListValue, "tls_auth", translate("openvpn_tls_auth", "TLS handshake hardening (tls-auth)"))
     55x:value("", translate("disable", "Disabled"))
     56x:value("/etc/openvpn/keys/ta.key 0", translate("enable", "Enabled"))
     57x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "tls_auth")
     58
     59local o = Map("openvpn",
     60        translate("openvpn_other", "Other settings"), "")
     61o.events = {"ReconfOpenVPN"}
     62
     63s = o:section(NamedSection, "openvpn", "openvpn")
    3664local x = s:option(ListValue, "keepalive", translate("openvpn_keepalive", "Send periodic keepalives"))
    3765x:value("0 0", translate("openvpn_keepalive_never", "Never"))
     
    5179x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "max_clients") or 2
    5280
    53 local x = s:option(ListValue, "tls_auth", translate("openvpn_tls_auth", "TLS handshake hardening (tls-auth)"))
    54 x:value("", translate("disable", "Disabled"))
    55 x:value("/etc/openvpn/keys/ta.key 0", translate("enable", "Enabled"))
    56 x.default = require("luci.model.uci").cursor():get("openvpn", "openvpn", "tls_auth")
    57 
    58 return m
     81return m,n,o
  • trunk/luci/applications/luci-openvpn/luasrc/view/openvpn_buttons.htm

    r2184 r2187  
    77        <td>
    88                <a style="color: #000;" href="<%=require("luci.dispatcher").build_url("fon_admin", "openvpn", "firewall")%>">
    9                         <img src="<%=luci.config.main.resourcebase%>/icons/vadd.png"><%:openvpn_security Manage Security settings%></a>
     9                        <img src="<%=luci.config.main.resourcebase%>/icons/vadd.png"><%:settings Settings%></a>
    1010        </td>
    1111        <td colspan=2>
  • trunk/luci/i18n/basque/luasrc/i18n/default.eu.lua

    r2048 r2187  
    122122openvpn_generating = "Gakoak sortzen"
    123123openvpn_key = "OpenVPN gakoak sortzen ari da. Honek 10 minutu inguru har ditzake."
    124 openvpn_lan = "Inguruko Sarea"
    125124openvpn_new_desc = "Izendatu konekzio hau, mesedez."
    126125openvpn_new_title = "VPN bezero berria gehitu"
    127126openvpn_remove = "Ziur al zaude bezero gakoa ezabatu nahi duzunaz?"
    128 openvpn_safesurf = "Nabegazio segurua"
    129 openvpn_security_desc = "VPNra konektaturiko bezeroak, Foneraren WebUIa ikus dezakete. Gainera, zure inguruko sarera konektateko baimena eman diezaiekezu eta baita Internetera zure Foneraren bidez konektatuta egongo balira iruditzea, trafik oguztia zure etxetik pasatuz.<br>Azpiko lotura hau ikusi azalpen zabalago bat lortzeko."
    130127openvpn_security = "Segurtasun ezarpenak kudeatu"
    131128openvpn_title = "OpenVPN"
  • trunk/luci/i18n/dutch/luasrc/i18n/default.nl.lua

    r2048 r2187  
    122122openvpn_generating = " Sleutels Genereren"
    123123openvpn_key = "OpenVPN is sleutels aan het genereren. Dit kan tot 10 minuten duren."
    124 openvpn_lan = "Lokaal Netwerk"
    125124openvpn_new_desc = "Specificeer alstublieft de naam van deze connectie."
    126125openvpn_new_title = "Voeg nieuwe VPN Clients toe"
    127126openvpn_remove = "Weet u zeker dat u de client sleutels wilt verwijderen ?"
    128 openvpn_safesurf = "Safe Surf"
    129127openvpn_security = "Beheer Beveiligings opties"
    130 openvpn_security_desc = "Gebruikers die verbonden zijn met de VPN hebben de mogelijkheid toegang te krijgen tot uw Foneras WebInterface. U kunt hen toegang geven tot uw lokale netwerk.<br>U kunt ook de safe surf functie inschakelen. Bekijk alstublieft deze wiki link voor een gedetailleerde beschrijfing van wat het doet."
    131128openvpn_title = "OpenVPN"
    132129page_title = "FON Router GUI"
  • trunk/luci/i18n/english/luasrc/i18n/default.en.lua

    r2182 r2187  
    103103macaddress = "MAC"
    104104mac = "MAC"
     105more_info = "More information"
    105106music_desc = "The Music application allows you to play mp3 media from a attached storage device. In Addition, you can stream music directly from the internet."
    106107name = "Name"
     
    119120openvpn_client_desc = "Here you can manage your clients"
    120121openvpn_client_title = "Clients"
    121 openvpn_ctc = "Other clients"
     122openvpn_connection = "Connection settings"
     123openvpn_connection_desc = "These settings determine how clients connect to the OpenVPN server. If you change any of these settings, you should re-download any client configurations previously downloaded, otherwise those clients will not be able to connect!"
     124openvpn_ctc = "Access to other clients"
    122125openvpn_ddns = " You currently have no DynDns configured. <br>If you are on a dial-up line and your ip changes, you need to active DynDns."
    123126openvpn_desc = "Here you can configure your vpn server. VPN allows you to remotely connect to your home network from anywhere in the world."
     
    129132openvpn_keepalive_seldom = "Seldom (every 10 minutes)"
    130133openvpn_key = "OpenVPN is generating keys. This can take up to 10 minutes."
    131 openvpn_lan = "Local Network"
     134openvpn_lan = "Access to local network"
    132135openvpn_new_desc = "Please specify the name of this connection."
    133136openvpn_new_title = "Add a new VPN Clients"
     137openvpn_other = "Other settings"
    134138openvpn_passphrase = "Passhrase"
    135139openvpn_passphrase_desc = "This passphrase will be used to encrypt the key file for the client. It will need to be entered on every connection. Leave empty for no passphrase."
     
    137141openvpn_proto = "Protocol"
    138142openvpn_remove = "Do you really want to remove the clients keys ?"
    139 openvpn_safesurf = "Safe Surf"
    140 openvpn_security_desc = "Users connected to the VPN are able to access the foneras WebUI. In addition you can grant them access to your local network.<br>As an additional feature, you can enable the safe surf feature. Please see this wiki link for a detailed description of what it does."
    141 openvpn_security = "Manage Security settings"
     143openvpn_safesurf = "Access to the internet (Safe Surf)"
     144openvpn_safe_surf_desc = "Enabling \"Safe surf\" causes all internet traffic for VPN clients to be securely routed through your Fonera."
     145openvpn_security = "Security settings"
     146openvpn_security_desc = "Clients connected to the VPN are able to access the Fonera WebUI. In addition you can grant them to access your local network, other VPN clients or the internet through their VPN connection."
    142147openvpn_title = "OpenVPN"
    143148openvpn_tls_auth = "TLS handshake hardening (tls-auth)"
  • trunk/luci/i18n/french/luasrc/i18n/default.fr.lua

    r2048 r2187  
    122122openvpn_generating = " Génération des Clés"
    123123openvpn_key = "OpenVPN génère les Clés. Cela peut prendre jusqu'à 10 minutes."
    124 openvpn_lan = "Réseau Local"
    125124openvpn_new_desc = "Veuillez nommer cette connexion."
    126125openvpn_new_title = "Ajouter un nouveau client VPN"
    127126openvpn_remove = "Souhaitez vous vraiment retirer ces clés ?"
    128 openvpn_safesurf = "Safe Surf"
    129 openvpn_security_desc = "Les utilisateurs connectés en VPN peuvent accéder à l'interface de la Fonera. De plus, vous pouvez leur donner accès à votre réseau local.<br>De plus, vous pouvez activer la fonction Safe Surf. Veuillez suivre ce lien vers le Wiki pour plus de détails à propos de cette fonction."
    130127openvpn_security = "Gérer les réglages de sécurité"
    131128openvpn_title = "OpenVPN"
  • trunk/luci/i18n/german/luasrc/i18n/default.de.lua

    r2137 r2187  
    122122openvpn_generating = " Schlüssel erstellen"
    123123openvpn_key = "OpenVPN generiert Schlüssel. Dies kann bis zu 10 Minutes in Anspruch nehmen."
    124 openvpn_lan = "Lokales Netzwerk"
    125124openvpn_new_desc = "Bitte gebe einen Namen für diese Verbindung an."
    126125openvpn_new_title = "Füge einen neuen VPN Client hinzu"
    127126openvpn_remove = "Willst Du die Client Schlüssel wirklich entfernen?"
    128 openvpn_safesurf = "Safe Surf"
    129 openvpn_security_desc = "Nutzer die mit dem VPN verbunden sind, können auf das Benutzerinterface die Fonera zugreifen. Zustätzlich kannst Du ihnen Zugang zu Deinem lokalen Netzwerk gewähren.<br>Als weiteres Feature kannst Du die Safe Surf Funktion aktivieren. Bitte folge dem Wiki Link für eine detailierte Beschreibung."
    130127openvpn_security = "Verwalte Sicherheitseinstellungen"
    131128openvpn_title = "OpenVPN"
  • trunk/luci/i18n/italian/luasrc/i18n/default.it.lua

    r2048 r2187  
    121121openvpn_client_desc = "Qui puoi gestire i tuoi client"
    122122openvpn_security = "Gestisci le impostazioni per la Sicurezza"
    123 openvpn_security_desc = "Gli utenti connessi via VPN possono accedere alla WebUI della Fonera. Puoi inoltre consentir loro l'acceso alla tua rete locale. <br>Puoi anche abilitare la funzionalità di Navigazione Sicura. Per maggiori informazioni, visita il wiki a questo indirizzo"
    124 openvpn_lan = "Local Network"
    125123openvpn_new_desc = "Specifica il nome da assegnare a questa connessione."
    126124openvpn_backup_title = "Salva/Ripristina i Certificati"
  • trunk/luci/i18n/japanese/luasrc/i18n/default.ja.lua

    r2048 r2187  
    130130openvpn_generating = " キーの作成"
    131131openvpn_key = "OpenVPNは、キーを作成しています。最大10分程かかります。"
    132 openvpn_lan = "ローカルネットワーク"
    133132openvpn_new_desc = "接続先の名前を指定してください。"
    134133openvpn_new_title = "新しいVPNクライアントを加える"
    135134openvpn_remove = "本当にクライアントキーを削除しても宜しいでしょうか?"
    136 openvpn_safesurf = "安全なインターネットサーフィン"
    137 openvpn_security_desc = "VPNを使用されるユーザーはfoneras WebUIにアクセス可能に成り、あなたのローカルネットワークへのアクセスも可能になります。<br>加えて、安全なインターネットが可能になります。詳しい説明については、wikiをご参照下さい。"
    138135openvpn_security = "セキュリティー設定の管理"
    139136openvpn_title = "OpenVPN"
  • trunk/luci/i18n/portuguese/luasrc/i18n/default.pt.lua

    r2048 r2187  
    120120openvpn_client_desc = "Aqui pode gerir os seus clientes"
    121121openvpn_security = "Gerir definições de segurança"
    122 openvpn_security_desc = "Utilizadores ligados ao VPN são capazes de aceder á WebUI da fonera.Além disso, pode conceder-lhes acesso à sua rede local.<br>Como caracteristica adicional, pode activar o Safe Surf(navegação segura). Por favor consulte este link da wiki para uma descrição detalhada do seu funcionamento."
    123 openvpn_lan = "Rede Local"
    124122openvpn_new_title = "Adicionar novo cliente VPN"
    125123openvpn_new_desc = "Especifique o nome desta ligação."
  • trunk/luci/i18n/spanish/luasrc/i18n/default.es.lua

    r2048 r2187  
    122122openvpn_generating = " Generando claves"
    123123openvpn_key = "OpenVPN está generando las claves. Esto puede tardar hasta 10 minutos."
    124 openvpn_lan = "Red Local"
    125124openvpn_new_desc = "Por favor, especifique el nombre de está conexión."
    126125openvpn_new_title = "Añadir un nuevo cliente de VPN"
    127126openvpn_remove = "Está seguro de que quiere borrar la clave del cliente?"
    128 openvpn_safesurf = "Navegación Segura"
    129 openvpn_security_desc = "Los usuarios conectados a la VPN pueden acceder a la interfaz de la Fonera. Además, puede darles acceso su red local.<br>También puede permitirles que naveguen a Internet como si estuvieran conectados desde esta Fonera (pasando todo el tráfico por la línea de su casa). Más información sobre su funcionamiento en el link de debajo."
    130127openvpn_security = "Gestionar la configuración de seguridad"
    131128openvpn_title = "OpenVPN"
Note: See TracChangeset for help on using the changeset viewer.