From df3473b82aaab377247c17915c457b7a92995c86 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Sun, 22 Oct 2017 23:48:02 +0200 Subject: [PATCH] net/haproxy: s/old name/new name/ everyhwere --- .../OPNsense/HAProxy/forms/dialogAcl.xml | 10 +++--- .../OPNsense/HAProxy/forms/dialogAction.xml | 24 ++++++------- .../OPNsense/HAProxy/forms/dialogBackend.xml | 30 ++++++++-------- .../HAProxy/forms/dialogErrorfile.xml | 8 ++--- .../OPNsense/HAProxy/forms/dialogFrontend.xml | 34 +++++++++---------- .../HAProxy/forms/dialogHealthcheck.xml | 4 +-- .../mvc/app/views/OPNsense/HAProxy/index.volt | 2 +- 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAcl.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAcl.xml index dc61d00ef..86b608296 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAcl.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAcl.xml @@ -3,13 +3,13 @@ acl.name text - Name to identify this ACL. + Name to identify this condition. acl.description text - Description for this ACL. + Description for this condition. @@ -266,8 +266,8 @@ acl.custom_acl - - text - + + textbox +
NOTE: This is strongly discouraged! The syntax will not be checked, use at your own risk!
]]> diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml index ff3ef59dc..788660239 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogAction.xml @@ -3,13 +3,13 @@ action.name text - Name to identify this action. + Name to identify this rule. action.description text - Description for this action. + Description for this rule. @@ -23,16 +23,16 @@ action.linkedAcls - + select_multiple - + action.operator - + dropdown - + @@ -42,7 +42,7 @@ action.type dropdown - + @@ -51,9 +51,9 @@ action.use_backend - + dropdown - + @@ -319,8 +319,8 @@ action.custom - - text - + + textbox +
NOTE: This is strongly discouraged! The syntax will not be checked, use at your own risk!
]]> diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml index 2bad28b6d..57c8e5774 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml @@ -3,32 +3,32 @@ backend.enabled checkbox - Enable this backend + Enable this Backend Pool backend.name text - Name to identify this backend. + Name to identify this Backend Pool. backend.description text - Description for this backend. + Description for this Backend Pool. backend.mode dropdown - + Set the same mode for backend and frontend. backend.algorithm dropdown - HAProxy documentation for a full description.]]> + HAProxy documentation for a full description.]]> Choose a load balancing algorithm. @@ -60,9 +60,9 @@ backend.healthCheck - + dropdown - + backend.healthCheckLogStatus @@ -160,27 +160,27 @@ true - + header backend.linkedActions - + select_multiple - - Choose actions. + + Choose rules. - + header backend.linkedErrorfiles - + select_multiple - - Choose error files. + + Choose error messages. diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogErrorfile.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogErrorfile.xml index b47402da1..818127c46 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogErrorfile.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogErrorfile.xml @@ -3,24 +3,24 @@ errorfile.name text - Name to identify this error file. + Name to identify this error message. errorfile.description text - Description for this error file. + Description for this error message. errorfile.code dropdown -
NOTE: It is important to understand that errorfiles are NOT meant to rewrite errors returned by the server, but errors detected and returned by HAProxy. This is why the list of supported errors is limited to a small set.
]]> +
NOTE: It is important to understand that error messages are NOT meant to rewrite errors returned by the server, but errors detected and returned by HAProxy. This is why the list of supported errors is limited to a small set.
]]> errorfile.content textbox - Paste the content of your errorfile here. The files should not exceed the configured buffer size, which generally is 8 or 16 kB. + Paste the content of your error messages here. The message must represent the full HTTP response and include required HTTP headers. It should not exceed the configured buffer size, which generally is 8 or 16 kB. diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml index e1647255a..3078d0fb3 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogFrontend.xml @@ -3,19 +3,19 @@ frontend.enabled checkbox - Enable this frontend + Enable this Public Service. frontend.name text - Name to identify this frontend. + Name to identify this Public Service. frontend.description text - Description for this frontend. + Description for this Public Service. frontend.bind @@ -23,7 +23,7 @@ select_multiple true - + Enter address:port here. Finish with TAB. @@ -37,13 +37,13 @@ frontend.mode dropdown - + frontend.defaultBackend - + dropdown - + @@ -87,7 +87,7 @@ frontend.tuning_maxConnections text - + frontend.tuning_timeoutClient @@ -160,31 +160,31 @@ frontend.customOptions textbox -
NOTE: The syntax will not be checked, use at your own risk!
]]> +
NOTE: This is strongly discouraged! The syntax will not be checked, use at your own risk!
]]> true - + header frontend.linkedActions - + select_multiple - - Choose actions. + + Choose rules. - + header frontend.linkedErrorfiles - + select_multiple - - Choose error files. + + Choose error messages. diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml index e93267ed5..1fb2beee5 100644 --- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml +++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogHealthcheck.xml @@ -3,13 +3,13 @@ healthcheck.name text - Name to identify this ACL. + Name to identify this Health Monitor. healthcheck.description text - Description for this ACL. + Description for this Health Monitor. healthcheck.type diff --git a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt index 9bc0e11ea..ed5f3b87c 100644 --- a/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt +++ b/net/haproxy/src/opnsense/mvc/app/views/OPNsense/HAProxy/index.volt @@ -508,7 +508,7 @@ POSSIBILITY OF SUCH DAMAGE.
  • {{ lang._("%sError Messages:%s Return a custom message instead of errors generated by HAProxy. Useful to overwrite HAProxy's internal error messages. The message must represent the full HTTP response and include required HTTP headers.") | format('', '') }}
  • {{ lang._("%sLua scripts:%s Include your own Lua code/scripts to extend HAProxy's functionality. The Lua code can be used in certain %sRules%s, for example.") | format('', '', '', '') }}
    • -

    {{ lang._("For more details visit HAProxy's official documentation regarding the %sError Files%s and the %sLua Script%s features.") | format('', '', '', '') }}

    +

    {{ lang._("For more details visit HAProxy's official documentation regarding the %sError Messages%s and the %sLua Script%s features.") | format('', '', '', '') }}