From 71f6ec56b9d10ece3a2871517a66de4e336e2c7c Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Wed, 26 Nov 2025 20:34:05 +0100
Subject: [PATCH] MT#63479 Remove prosody support

Remove checks that made sure prosody was installed, and replace the ones
that are safe to keep to make sure it is no longer installed.

Change-Id: I0c9dcee11e743558522dbb62e1b651081e73f792
---
 templates/200_user-debian.yaml.tt2        | 10 ----------
 templates/310_package-ngcp.yaml.tt2       |  5 +----
 templates/410_process-ngcp.yaml.tt2       |  6 ------
 templates/510_init-daemons-ngcp.yaml.tt2  |  4 ++--
 templates/821_network-ports-ngcp.yaml.tt2 | 16 ++++++++--------
 5 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/templates/200_user-debian.yaml.tt2 b/templates/200_user-debian.yaml.tt2
index b5274b1..9eab5dd 100644
--- a/templates/200_user-debian.yaml.tt2
+++ b/templates/200_user-debian.yaml.tt2
@@ -12,9 +12,6 @@ group:
   mysql:
     exists: true
 
-  prosody:
-    exists: true
-
   redis:
     exists: true
 
@@ -73,13 +70,6 @@ user:
       - nogroup
     home: "/nonexistent"
 
-  prosody:
-    exists: true
-    groups:
-      - prosody
-      - ssl-cert
-    home: "/var/lib/prosody"
-
   proxy:
     exists: true
     groups:
diff --git a/templates/310_package-ngcp.yaml.tt2 b/templates/310_package-ngcp.yaml.tt2
index 2160f4f..63b00d9 100644
--- a/templates/310_package-ngcp.yaml.tt2
+++ b/templates/310_package-ngcp.yaml.tt2
@@ -83,7 +83,4 @@ package:
     installed: true
 
   prosody:
-    installed: true
-    versions:
-      not:
-        - "0.9.12-2+deb9u2+bpo10+1"
+    installed: false
diff --git a/templates/410_process-ngcp.yaml.tt2 b/templates/410_process-ngcp.yaml.tt2
index 6e249f0..ebc6f0a 100644
--- a/templates/410_process-ngcp.yaml.tt2
+++ b/templates/410_process-ngcp.yaml.tt2
@@ -12,14 +12,8 @@
 command:
 
   "pgrep -c -f 'lua5\\.. /usr/bin/prosody'":
-{{if and [% is_proxy && prosody.enable == 'yes' ? 1 : 0 %] .Vars.NODE_ACTIVE}}
-    exit-status: 0
-    stdout:
-      - "1"
-{{else}}
     exit-status: 1
     stdout: []
-{{end}}
     stderr: []
 
   "pgrep -c -f '[p]erl-fcgi-pm \\[NGCP::Panel\\]'":
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 09f7266..cc8078b 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -85,8 +85,8 @@ service:
     running: [% ha.crm == 'pacemaker' ? 'true' : 'false' %]
 
   prosody.service:
-    enabled: [% general.process_handler == 'none' && prosody.enable == 'yes' ? 'true' : 'false' %]
-    running: {{if and [% is_proxy && prosody.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}}
+    enabled: false
+    running: false
 
   ngcp-pushd.socket:
     enabled: [% general.process_handler == 'none' && is_lb && pushd.enable == "yes" ? 'true' : 'false' %]
diff --git a/templates/821_network-ports-ngcp.yaml.tt2 b/templates/821_network-ports-ngcp.yaml.tt2
index 153286d..52eed7d 100644
--- a/templates/821_network-ports-ngcp.yaml.tt2
+++ b/templates/821_network-ports-ngcp.yaml.tt2
@@ -138,53 +138,53 @@ port:
 [% IF is_proxy -%]
   # Prosody (xmpp-client)
   tcp:5222:
-    listening: {{.Vars.NODE_ACTIVE}}
+    listening: false
     ip: ["[% sip_proxy_ip %]"]
 
 [% ELSIF is_lb -%]
   # HAProxy: Prosody (xmpp-client)
   tcp:5222:
-    listening: [% haproxy.enable == 'yes' ? 'true' : 'false' %]
+    listening: false
     ip: ["[% sip_ext_ips.0 %]"]
 
 [% END -%]
 [% IF is_proxy -%]
   # Prosody (xmpp-server)
   tcp:5269:
-    listening: {{.Vars.NODE_ACTIVE}}
+    listening: false
     ip: ["[% sip_proxy_ip %]"]
 
 [% ELSIF is_lb -%]
   # HAProxy: Prosody (xmpp-server)
   tcp:5269:
-    listening: [% haproxy.enable == 'yes' ? 'true' : 'false' %]
+    listening: false
     ip: ["[% sip_ext_ips.0 %]"]
 
 [% END -%]
 [% IF is_proxy -%]
   # Prosody (http)
   tcp:5280:
-    listening: {{.Vars.NODE_ACTIVE}}
+    listening: false
     ip: ["[% sip_int_ips.0 %]"]
 
 [% END -%]
 [% IF is_proxy -%]
   # Prosody (https)
   tcp:5281:
-    listening: {{.Vars.NODE_ACTIVE}}
+    listening: false
     ip: ["[% sip_int_ips.0 %]"]
 
 [% ELSIF is_lb -%]
   # HAProxy: Prosody (http)
   tcp:5281:
-    listening: [% haproxy.enable == 'yes' ? 'true' : 'false' %]
+    listening: false
     ip: ["[% sip_ext_ips.0 %]"]
 
 [% END -%]
 [% IF is_proxy -%]
   # Prosody (ctrl)
   tcp:5582:
-    listening: {{.Vars.NODE_ACTIVE}}
+    listening: false
     ip: ["[% sip_int_ips.0 %]"]
 
 [% END -%]