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
master
Guillem Jover 3 weeks ago
parent 117fe3b51b
commit 71f6ec56b9

@ -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:

@ -83,7 +83,4 @@ package:
installed: true
prosody:
installed: true
versions:
not:
- "0.9.12-2+deb9u2+bpo10+1"
installed: false

@ -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\\]'":

@ -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' %]

@ -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 -%]

Loading…
Cancel
Save