From d75195e0094d3635e47f00e54308f904f74bee68 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 7 Feb 2018 15:37:47 +0000
Subject: [PATCH] net/relayd: use simple service naming schema

Since the GUI is rewritten from scratch visibly rename "Load Balancer" to
"Relayd" to align with our other plugins and avoid confusion about old
documentation regarding the component on the web.

Discussed with: @fbrendel
---
 net/relayd/src/etc/inc/plugins.inc.d/relayd.inc               | 4 ++--
 .../mvc/app/controllers/OPNsense/Relayd/forms/general.xml     | 4 ++--
 .../src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml   | 4 ++--
 .../src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
index 5f927f34c..415142ca2 100644
--- a/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
+++ b/net/relayd/src/etc/inc/plugins.inc.d/relayd.inc
@@ -51,7 +51,7 @@ function relayd_services()
     $services = array();
     if (relayd_enabled()) {
         $services[] = array(
-            'description' => gettext('Relayd Load Balancer'),
+            'description' => gettext('Relayd'),
             'configd' => array(
                 'restart' => array('relayd restart'),
                 'start' => array('relayd start'),
@@ -66,7 +66,7 @@ function relayd_services()
 function relayd_xmlrpc_sync()
 {
     return array(array(
-        'description' => gettext('Relayd Load Balancer'),
+        'description' => gettext('Relayd'),
         'section' => 'OPNsense.relayd',
         'id' => 'relayd',
     ));
diff --git a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/general.xml b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/general.xml
index 01e289dd2..7ef174f95 100644
--- a/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/general.xml
+++ b/net/relayd/src/opnsense/mvc/app/controllers/OPNsense/Relayd/forms/general.xml
@@ -1,9 +1,9 @@
 <form>
    <field>
       <id>relayd.general.enabled</id>
-      <label>Enable load balancer</label>
+      <label>Enable Relayd</label>
       <type>checkbox</type>
-      <help><![CDATA[Enable or disable the Relayd loadbalancer.]]></help>
+      <help><![CDATA[Enable or disable Relayd.]]></help>
    </field>
    <field>
       <id>relayd.general.interval</id>
diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
index 34778b365..e0a3de073 100644
--- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
+++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/ACL/ACL.xml
@@ -1,7 +1,7 @@
 <acl>
    <page-services-relayd>
-      <name>Services: Load Balancer</name>
-      <description>Allow access to the 'Services: Load Balancer' page.</description>
+      <name>Services: Relayd</name>
+      <description>Allow access to the 'Services: Relayd' page.</description>
       <patterns>
          <pattern>ui/relayd/*</pattern>
          <pattern>api/relayd/*</pattern>
diff --git a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
index e79bec781..7e3c36adf 100644
--- a/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
+++ b/net/relayd/src/opnsense/mvc/app/models/OPNsense/Relayd/Menu/Menu.xml
@@ -1,6 +1,6 @@
 <menu>
    <Services>
-      <Relayd VisibleName="Load Balancer" cssClass="fa fa-truck fa-fw">
+      <Relayd cssClass="fa fa-truck fa-fw">
          <Settings url="/ui/relayd/"/>
          <Status url="/ui/relayd/status/"/>
          <Log VisibleName="Log File" order="100" url="/diag_logs_relayd.php"/>