Merge pull request #28 from NethServer/RemoveButton

Remove the button to administration page NethServer/dev#6787

README.md

@@ -20,6 +20,11 @@ Services are available from the following port numbers:
 - `5280` For admin interface.
 - `5443` With encryption, used for admin interface, API, CAPTCHA, OAuth, Websockets and XMPP BOSH.
 
+## Admin page
+
+The ejabberd Web Admin allows to administer some parts of ejabberd using a web browser: accounts, Shared Roster Groups, manage the Mnesia database, create and restore backups, view server statistics, …
+The administration is available at https://sub.domain.com:5280/admin/
+
 ## Install
 
 Instantiate the module with:

imageroot/actions/create-module/70open-ports-Firewall

@@ -12,7 +12,6 @@ agent.add_public_service(os.environ['MODULE_ID'], [
     "5222/tcp", # Standard port for Jabber/XMPP client connections, plain or STARTTLS.
     "5223/tcp", # Standard port for Jabber client connections using the old SSL method.
     "5269/tcp", # For XMPP federation. Only needed if you want to communicate with users on other servers.
-    "5280/tcp", # For admin interface.
     "5443/tcp"  # With encryption, used for admin interface, API, CAPTCHA, OAuth, Websockets and XMPP BOSH.
 ])
 

imageroot/templates/ejabberd.yml

@@ -53,7 +53,7 @@ listen:
     port: 5280
     ip: "::"
     module: ejabberd_http
-    tls: true
+    tls: false
     request_handlers:
       "/websocket": ejabberd_http_ws
       "/api": mod_http_api
@@ -62,9 +62,6 @@ listen:
       "/admin": ejabberd_web_admin
 {% endif %}
     captcha: false
-    protocol_options: 'TLSOPTS'
-    ciphers: 'CIPHERS'
-    dhfile: "/home/ejabberd/certificates/dh.pem"
 {%if s2s %}
   - 
     port: 5269

ui/public/i18n/en/translation.json

@@ -34,13 +34,12 @@
     "enabled": "Enabled",
     "advanced": "Advanced",
     "webadmin_status": "Web Admin",
-    "open_ejabberd_webapp": "Open web admin",
     "adminList": "Web Admin administrators",
     "Write_administrator_list": "Enter one administrator per line",
     "bad_email_address": "Please enter user@domain. Invalid administrator:",
     "processing": "Processing...",
     "required": "Required",
-    "admin_login_tips": "If enabled, Web Admin page is available on port 5280. Remember to open this port on your firewall",
+    "admin_login_tips": "If enabled, Web Admin page is available at http://domain.com:5280. An HTTP route must be done manually",
     "Enable_federation_s2s": "Enable federation (S2S)",
     "Enable_message_archive_management_mod_mam": "Enable Message Archive Management (mod_mam)",
     "Enable_file_upload_mod_http_upload": "Enable file upload (mod_http_upload)",

ui/public/i18n/es/translation.json

@@ -3,7 +3,6 @@
         "Enable_purge_mnesia_database": "Mensaje de purga de la base de datos de Mnesia",
         "bad_email_address": "Por favor escribe usuario@dominio. Administrador no válido:",
         "adminList": "Administradores de la administración web",
-        "open_ejabberd_webapp": "Abrir administrador web",
         "Enable_file_upload_mod_http_upload": "Habilitar carga de archivos (mod_http_upload)",
         "configure_instance": "Configurar {instance}",
         "specify_duration": "Especificar duración",

ui/public/i18n/it/translation.json

@@ -66,7 +66,6 @@
         "choose_the_ldap_domain_to_use": "Scegliere il dominio LDAP utilizzato per l'autenticazione degli utenti.",
         "choose_ldap_domain": "Scegliere il dominio LDAP",
         "webadmin_status": "Amministratore Web",
-        "open_ejabberd_webapp": "Apri l'amministrazione web",
         "adminList": "Amministratori Web",
         "Write_administrator_list": "Inserire un amministratore per riga",
         "bad_email_address": "Inserire user@domain. Amministratore non valido:",

ui/src/views/Settings.vue

@@ -110,16 +110,6 @@
                     }}</template>
                   </NsToggle>
                   <template v-if="webadmin">
-                    <template v-if="hostname"> </template>
-                    <NsButton
-                      kind="ghost"
-                      class="mg-left"
-                      :icon="Launch20"
-                      :disabled="loading.getConfiguration"
-                      @click="goToEjabberdWebAdmin"
-                    >
-                      {{ $t("settings.open_ejabberd_webapp") }}
-                    </NsButton>
                     <cv-text-area
                       :label="$t('settings.adminList')"
                       v-model.trim="adminsList"
@@ -376,10 +366,6 @@ export default {
     this.getConfiguration();
   },
   methods: {
-    goToEjabberdWebAdmin(e) {
-      window.open(`https://${this.hostname}` + ":5280/admin/", "_blank");
-      e.preventDefault();
-    },
     async getConfiguration() {
       this.loading.getConfiguration = true;
       this.error.getConfiguration = "";