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: mysql:
exists: true exists: true
prosody:
exists: true
redis: redis:
exists: true exists: true
@ -73,13 +70,6 @@ user:
- nogroup - nogroup
home: "/nonexistent" home: "/nonexistent"
prosody:
exists: true
groups:
- prosody
- ssl-cert
home: "/var/lib/prosody"
proxy: proxy:
exists: true exists: true
groups: groups:

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

@ -12,14 +12,8 @@
command: command:
"pgrep -c -f 'lua5\\.. /usr/bin/prosody'": "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 exit-status: 1
stdout: [] stdout: []
{{end}}
stderr: [] stderr: []
"pgrep -c -f '[p]erl-fcgi-pm \\[NGCP::Panel\\]'": "pgrep -c -f '[p]erl-fcgi-pm \\[NGCP::Panel\\]'":

@ -85,8 +85,8 @@ service:
running: [% ha.crm == 'pacemaker' ? 'true' : 'false' %] running: [% ha.crm == 'pacemaker' ? 'true' : 'false' %]
prosody.service: prosody.service:
enabled: [% general.process_handler == 'none' && prosody.enable == 'yes' ? 'true' : 'false' %] enabled: false
running: {{if and [% is_proxy && prosody.enable == "yes" ? 1 : 0 %] .Vars.NODE_ACTIVE}} true {{else}} false {{end}} running: false
ngcp-pushd.socket: ngcp-pushd.socket:
enabled: [% general.process_handler == 'none' && is_lb && pushd.enable == "yes" ? 'true' : 'false' %] enabled: [% general.process_handler == 'none' && is_lb && pushd.enable == "yes" ? 'true' : 'false' %]

@ -138,53 +138,53 @@ port:
[% IF is_proxy -%] [% IF is_proxy -%]
# Prosody (xmpp-client) # Prosody (xmpp-client)
tcp:5222: tcp:5222:
listening: {{.Vars.NODE_ACTIVE}} listening: false
ip: ["[% sip_proxy_ip %]"] ip: ["[% sip_proxy_ip %]"]
[% ELSIF is_lb -%] [% ELSIF is_lb -%]
# HAProxy: Prosody (xmpp-client) # HAProxy: Prosody (xmpp-client)
tcp:5222: tcp:5222:
listening: [% haproxy.enable == 'yes' ? 'true' : 'false' %] listening: false
ip: ["[% sip_ext_ips.0 %]"] ip: ["[% sip_ext_ips.0 %]"]
[% END -%] [% END -%]
[% IF is_proxy -%] [% IF is_proxy -%]
# Prosody (xmpp-server) # Prosody (xmpp-server)
tcp:5269: tcp:5269:
listening: {{.Vars.NODE_ACTIVE}} listening: false
ip: ["[% sip_proxy_ip %]"] ip: ["[% sip_proxy_ip %]"]
[% ELSIF is_lb -%] [% ELSIF is_lb -%]
# HAProxy: Prosody (xmpp-server) # HAProxy: Prosody (xmpp-server)
tcp:5269: tcp:5269:
listening: [% haproxy.enable == 'yes' ? 'true' : 'false' %] listening: false
ip: ["[% sip_ext_ips.0 %]"] ip: ["[% sip_ext_ips.0 %]"]
[% END -%] [% END -%]
[% IF is_proxy -%] [% IF is_proxy -%]
# Prosody (http) # Prosody (http)
tcp:5280: tcp:5280:
listening: {{.Vars.NODE_ACTIVE}} listening: false
ip: ["[% sip_int_ips.0 %]"] ip: ["[% sip_int_ips.0 %]"]
[% END -%] [% END -%]
[% IF is_proxy -%] [% IF is_proxy -%]
# Prosody (https) # Prosody (https)
tcp:5281: tcp:5281:
listening: {{.Vars.NODE_ACTIVE}} listening: false
ip: ["[% sip_int_ips.0 %]"] ip: ["[% sip_int_ips.0 %]"]
[% ELSIF is_lb -%] [% ELSIF is_lb -%]
# HAProxy: Prosody (http) # HAProxy: Prosody (http)
tcp:5281: tcp:5281:
listening: [% haproxy.enable == 'yes' ? 'true' : 'false' %] listening: false
ip: ["[% sip_ext_ips.0 %]"] ip: ["[% sip_ext_ips.0 %]"]
[% END -%] [% END -%]
[% IF is_proxy -%] [% IF is_proxy -%]
# Prosody (ctrl) # Prosody (ctrl)
tcp:5582: tcp:5582:
listening: {{.Vars.NODE_ACTIVE}} listening: false
ip: ["[% sip_int_ips.0 %]"] ip: ["[% sip_int_ips.0 %]"]
[% END -%] [% END -%]

Loading…
Cancel
Save