Renamed to nethserver-ejabberd-next

README.rst

@@ -1,5 +1,5 @@
 ===================
-nethserver-ejabberd
+nethserver-ejabberd-next
 ===================
 
 The chat function is implemented using ejabberd XMPP server. Enabled features are:
@@ -14,14 +14,14 @@ The ``jabberadmins`` must be created manually.
 If the system has a remote account provider also reconfigure the ejabberd service: ::
 
     sss_cache -g jabberadmins
-    signal-event nethserver-ejabberd-save
+    signal-event nethserver-ejabberd-next-save
 
 When used with AD backend, following limitations apply:
 
 * The shared roster doesn't support groups
 * The shared roster displays the list of user names (not full names)
 
-See also the Server Manager UI API documentation: https://github.com/NethServer/nethserver-ejabberd/blob/master/UI-API.md
+See also the Server Manager UI API documentation: https://github.com/NethServer/nethserver-ejabberd-next/blob/master/UI-API.md
 
 Configuration
 =============

UI-API.md

@@ -1,4 +1,4 @@
-# nethserver-ejabberd
+# nethserver-ejabberd-next
 
 NethServer configuration of ejabberd XMPP server
 
@@ -87,7 +87,7 @@ required.
 
 Invocation example:
 ```bash
-echo '{"configuration":{"props":{"status":"disabled","WebAdmin":"enabled","S2S":"enabled","ModMamStatus":"enabled","ModMamPurgeDBStatus":"enabled","ModMamPurgeDBInterval":"45","ShaperFast":"1000000","ShaperNormal":"500000"}}}' | /usr/bin/sudo /usr/libexec/nethserver/api/nethserver-ejabberd/validate | jq
+echo '{"configuration":{"props":{"status":"disabled","WebAdmin":"enabled","S2S":"enabled","ModMamStatus":"enabled","ModMamPurgeDBStatus":"enabled","ModMamPurgeDBInterval":"45","ShaperFast":"1000000","ShaperNormal":"500000"}}}' | /usr/bin/sudo /usr/libexec/nethserver/api/nethserver-ejabberd-next/validate | jq
 ```
 
 ## update

api/read

@@ -20,7 +20,7 @@
 # along with NethServer.  If not, see COPYING.
 #
 
-ejabberdctl="/opt/ejabberd-20.03/bin/ejabberdctl"
+ejabberdctl="/opt/ejabberd-*/bin/ejabberdctl"
 
 configuration="{}"
 status="{}"

api/update

@@ -54,7 +54,7 @@ foreach my $prop (qw(
 
 esmith::event::set_json_log(1);
 
-my $success = esmith::event::event_signal('nethserver-ejabberd-save');
+my $success = esmith::event::event_signal('nethserver-ejabberd-next-save');
 if($success) {
     success();
 } else {

createlinks

@@ -28,31 +28,31 @@ my @certificates = (qw(
 ));
 
 #
-# nethserver-ejabberd-update event
+# nethserver-ejabberd-next-update event
 #
 
-event_actions('nethserver-ejabberd-update', qw(
+event_actions('nethserver-ejabberd-next-update', qw(
               initialize-default-databases   00
 ));
 
-event_templates('nethserver-ejabberd-update', qw(
+event_templates('nethserver-ejabberd-next-update', qw(
                 /etc/ejabberd/ejabberd.yml
                 /etc/ejabberd/ejabberd.cfg
                 /etc/dnsmasq.conf
 ), @certificates);
 
-event_services('nethserver-ejabberd-update', qw(
+event_services('nethserver-ejabberd-next-update', qw(
                httpd reload
                ejabberd restart
                dnsmasq restart
 ));
 
 
 #--------------------------------------------------
-# actions for nethserver-ejabberd-save event
+# actions for nethserver-ejabberd-next-save event
 #--------------------------------------------------
 
-$event = "nethserver-ejabberd-save";
+$event = "nethserver-ejabberd-next-save";
 
 event_services($event, 'ejabberd' => 'restart');
 event_services($event, 'httpd' => 'reload');
@@ -86,15 +86,15 @@ templates2events("/etc/ejabberd/ejabberd.yml",  $event);
 #--------------------------------------------------
 
 foreach $event (qw (group-modify group-create group-delete)){
-event_actions($event, 'nethserver-ejabberd-update-group' => '95');
+event_actions($event, 'nethserver-ejabberd-next-update-group' => '95');
 }
 
 #--------------------------------------------------
 # actions for migration-import event
 #--------------------------------------------------
 
 $event = "migration-import";
-event_actions($event, 'nethserver-ejabberd-migrate' => 50);
+event_actions($event, 'nethserver-ejabberd-next-migrate' => 50);
 
 #
 # certificate-update event
@@ -112,13 +112,13 @@ event_services('certificate-update', qw(
 
 $event = 'pre-backup-data';
 
-event_actions($event, 'nethserver-ejabberd-backup' => 50);
+event_actions($event, 'nethserver-ejabberd-next-backup' => 50);
 
 #--------------------------------------------------
 # actions for post-restore-data event
 #--------------------------------------------------
 
 $event = 'post-restore-data';
 
-event_actions($event, 'nethserver-ejabberd-restore' => 50);
+event_actions($event, 'nethserver-ejabberd-next-restore' => 50);
 event_services($event, 'ejabberd' => 'restart');

nethserver-ejabberd.json → nethserver-ejabberd-next.json

@@ -1,11 +1,11 @@
 {
-    "id": "nethserver-ejabberd",
+    "id": "nethserver-ejabberd-next",
     "name": "ejabberd",
     "summary": "NethServer integration of ejabberd XMPP server",
     "description": "Provides ejabberd XMPP server",
     "url": "",
-    "homepage": "https://github.com/NethServer/nethserver-ejabberd",
-    "provides": ["nethserver-ejabberd"],
+    "homepage": "https://github.com/NethServer/nethserver-ejabberd-next",
+    "provides": ["nethserver-ejabberd-next"],
     "release": {
         "version": "_RELEASE_"
     },
@@ -16,7 +16,7 @@
     },
     "author": {
         "name": "The NethServer community developers",
-        "url": "https://github.com/NethServer/nethserver-ejabberd",
+        "url": "https://github.com/NethServer/nethserver-ejabberd-next",
         "email": "security@nethserver.org"
     },
     "icon": "logo.png"

nethserver-ejabberd.spec → nethserver-ejabberd-next.spec

@@ -1,5 +1,5 @@
 Summary: NethServer ejabberd XMPP server
-Name: nethserver-ejabberd
+Name: nethserver-ejabberd-next
 Version: 1.8.4
 Release: 1%{?dist}
 License: GPL
@@ -14,7 +14,7 @@ Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
 
-Requires: ejabberd = 20.03
+Requires: ejabberd
 Requires: nethserver-httpd
 
 %description

prep-sources

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-tarball=nethserver-ejabberd-ui.tar.gz
+tarball=nethserver-ejabberd-next-ui.tar.gz
 bdir=$(mktemp -d -p .)
 trap "rm -rf ${bdir}" EXIT
 

root/etc/e-smith/events/actions/nethserver-ejabberd-migrate

@@ -51,7 +51,7 @@ $new->merge_props($old->props);
 #
 # Apply configuration
 # 
-if( ! esmith::event::event_signal('nethserver-ejabberd-update')) {
+if( ! esmith::event::event_signal('nethserver-ejabberd-next-update')) {
     exit(1);
 }
 

root/etc/e-smith/events/actions/nethserver-ejabberd-update-group

@@ -32,7 +32,7 @@ if ($groupName !~ '^jabberadmins' ) {
     exit(0);
 }
 
-if( ! esmith::event::event_signal('nethserver-ejabberd-save')) {
+if( ! esmith::event::event_signal('nethserver-ejabberd-next-save')) {
     $errors++;
 }
 

root/etc/sudoers.d/50_nsapi_nethserver_ejabberd

@@ -3,8 +3,8 @@
 #
 
 Cmnd_Alias NSAPI_NETHSERVER_EJABBERD = \
-    /usr/libexec/nethserver/api/nethserver-ejabberd/read, \
-    /usr/libexec/nethserver/api/nethserver-ejabberd/update, \
-    /usr/libexec/nethserver/api/nethserver-ejabberd/validate
+    /usr/libexec/nethserver/api/nethserver-ejabberd-next/read, \
+    /usr/libexec/nethserver/api/nethserver-ejabberd-next/update, \
+    /usr/libexec/nethserver/api/nethserver-ejabberd-next/validate
 
 Defaults!NSAPI_NETHSERVER_EJABBERD !requiretty

root/usr/lib/systemd/system/ejabberd.service

@@ -13,9 +13,9 @@ Environment=LOGS_DIR=/var/log/ejabberd
 Environment=EJABBERD_CONFIG_PATH=/etc/ejabberd/ejabberd.yml 
 Environment=ETC_DIR=/etc/ejabberd
 Environment=SPOOL_DIR=/var/lib/ejabberd
-ExecStart=/bin/sh -c "/opt/ejabberd-20.03/bin/ejabberdctl start && /opt/ejabberd-20.03/bin/ejabberdctl started"
-ExecStop=/bin/sh -c "/opt/ejabberd-20.03/bin/ejabberdctl stop && /opt/ejabberd-20.03/bin/ejabberdctl stopped"
-ExecReload=/bin/sh -c "/opt/ejabberd-20.03/bin/ejabberdctl reload_config"
+ExecStart=/bin/sh -c "/opt/ejabberd-*/bin/ejabberdctl start && /opt/ejabberd-*/bin/ejabberdctl started"
+ExecStop=/bin/sh -c "/opt/ejabberd-*/bin/ejabberdctl stop && /opt/ejabberd-*/bin/ejabberdctl stopped"
+ExecReload=/bin/sh -c "/opt/ejabberd-*/bin/ejabberdctl reload_config"
 PrivateDevices=true
 
 

root/usr/share/nethesis/NethServer/Module/Ejabber.php

@@ -61,7 +61,7 @@ public function validate(\Nethgui\Controller\ValidationReportInterface $report)
 
     protected function onParametersSaved($changes)
     {
-        $this->getPlatform()->signalEvent('nethserver-ejabberd-save &');
+        $this->getPlatform()->signalEvent('nethserver-ejabberd-next-save &');
     }
 
 }

ui/js/app.js

@@ -21,7 +21,7 @@
 
         // get stats
         nethserver.exec(
-            ["nethserver-ejabberd/read"],
+            ["nethserver-ejabberd-next/read"],
             {sections:["status", "configuration"]},
             null,
             function (success) {
@@ -66,7 +66,7 @@
         function doRead() {
             $('#config-loader').hide();
             nethserver.exec(
-                ["nethserver-ejabberd/read"],
+                ["nethserver-ejabberd-next/read"],
                 {sections:["configuration"]},
                 null,
                 function (success) {
@@ -129,7 +129,7 @@
             }}};
 
             nethserver.exec(
-                ["nethserver-ejabberd/validate"],
+                ["nethserver-ejabberd-next/validate"],
                 data,
                 null,
                 function (success) {
@@ -139,10 +139,10 @@
 
                     // update values
                     nethserver.exec(
-                        ["nethserver-ejabberd/update"],
+                        ["nethserver-ejabberd-next/update"],
                         data,
                         function (stream) {
-                            console.info("nethserver-ejabberd", stream);
+                            console.info("nethserver-ejabberd-next", stream);
                         },
                         function (success) {
                             doRead();
@@ -332,7 +332,7 @@
         nethserver.exec(
             ["system-apps/read"], {
                 action: "info",
-                name: 'nethserver-ejabberd'
+                name: 'nethserver-ejabberd-next'
             },
             null,
             function (success) {

ui/views/about.html

@@ -14,7 +14,7 @@ <h3 id="app-summary"></h3>
 
     <div class="list-group-item info-item">
         <span class="fa fa-globe m-right-sm"></span>
-        <a id="app-web" target="_blank" href="https://github.com/NethServer/nethserver-ejabberd" i18n="website">Website</a>
+        <a id="app-web" target="_blank" href="https://github.com/NethServer/nethserver-ejabberd-next" i18n="website">Website</a>
     </div>
 
     <div class="list-group-item info-item">