|
@@ -125,11 +125,11 @@ case "$1" in
|
125
|
125
|
|
126
|
126
|
# Check whether prosody config has the internal muc, if not add it,
|
127
|
127
|
# as we are migrating configs
|
128
|
|
- if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.auth.$JVB_HOSTNAME" $PROSODY_HOST_CONFIG; then
|
129
|
|
- echo -e "\nComponent \"internal.auth.$JVB_HOSTNAME\" \"muc\"" >> $PROSODY_HOST_CONFIG
|
|
128
|
+ if [ -f $PROSODY_HOST_CONFIG ] && ! grep -q "internal.$JICOFO_AUTH_DOMAIN" $PROSODY_HOST_CONFIG; then
|
|
129
|
+ echo -e "\nComponent \"internal.$JICOFO_AUTH_DOMAIN\" \"muc\"" >> $PROSODY_HOST_CONFIG
|
130
|
130
|
echo -e " storage = \"memory\"" >> $PROSODY_HOST_CONFIG
|
131
|
131
|
echo -e " modules_enabled = { \"ping\"; }" >> $PROSODY_HOST_CONFIG
|
132
|
|
- echo -e " admins = { \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\", \"jvb@auth.$JVB_HOSTNAME\" }" >> $PROSODY_HOST_CONFIG
|
|
132
|
+ echo -e " admins = { \"$JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN\", \"jvb@$JICOFO_AUTH_DOMAIN\" }" >> $PROSODY_HOST_CONFIG
|
133
|
133
|
fi
|
134
|
134
|
|
135
|
135
|
# Convert the old focus component config to the new one.
|
|
@@ -140,7 +140,7 @@ case "$1" in
|
140
|
140
|
# Component "focus.jitmeet.example.com" "client_proxy"
|
141
|
141
|
# target_address = "focus@auth.jitmeet.example.com"
|
142
|
142
|
if grep -q "Component \"focus.$JVB_HOSTNAME\"" $PROSODY_HOST_CONFIG && ! grep "Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"" $PROSODY_HOST_CONFIG ;then
|
143
|
|
- sed -i "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n target_address = \"$JICOFO_AUTH_USER@auth.$JVB_HOSTNAME\"/g" $PROSODY_HOST_CONFIG
|
|
143
|
+ sed -i "s/Component \"focus.$JVB_HOSTNAME\"/Component \"focus.$JVB_HOSTNAME\" \"client_proxy\"\n target_address = \"$JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN\"/g" $PROSODY_HOST_CONFIG
|
144
|
144
|
PROSODY_CONFIG_PRESENT="false"
|
145
|
145
|
fi
|
146
|
146
|
|
|
@@ -155,10 +155,17 @@ case "$1" in
|
155
|
155
|
MAIN_MUC_PATTERN="Component \"conference.$JVB_HOSTNAME\" \"muc\""
|
156
|
156
|
if ! grep -A 2 -- "${MAIN_MUC_PATTERN}" $PROSODY_HOST_CONFIG | grep -q "restrict_room_creation" ;then
|
157
|
157
|
sed -i "s/${MAIN_MUC_PATTERN}/${MAIN_MUC_PATTERN}\n restrict_room_creation = true/g" $PROSODY_HOST_CONFIG
|
|
158
|
+ PROSODY_CONFIG_PRESENT="false"
|
|
159
|
+ fi
|
|
160
|
+
|
|
161
|
+ if ! grep -q -- 'unlimited_jids' $PROSODY_HOST_CONFIG ;then
|
|
162
|
+ sed -i "1s/^/unlimited_jids = { \"$JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN\", \"jvb@$JICOFO_AUTH_DOMAIN\" }\n/" $PROSODY_HOST_CONFIG
|
|
163
|
+ sed -i "s/VirtualHost \"$JICOFO_AUTH_DOMAIN\"/VirtualHost \"$JICOFO_AUTH_DOMAIN\"\n modules_enabled = { \"limits_exception\"; }/g" $PROSODY_HOST_CONFIG
|
|
164
|
+ PROSODY_CONFIG_PRESENT="false"
|
158
|
165
|
fi
|
159
|
166
|
|
160
|
167
|
# Make sure the focus@auth user's roster includes the proxy component (this is idempotent)
|
161
|
|
- prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@auth.$JVB_HOSTNAME
|
|
168
|
+ prosodyctl mod_roster_command subscribe focus.$JVB_HOSTNAME $JICOFO_AUTH_USER@$JICOFO_AUTH_DOMAIN
|
162
|
169
|
|
163
|
170
|
if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
|
164
|
171
|
# prosodyctl takes care for the permissions
|