Adds prosody config to conf.avail and enable it in conf.d so we don't wipe prosody config on installing meet.

debian/jitsi-meet-prosody.postinst

@@ -24,27 +24,17 @@ case "$1" in
         . /etc/default/jitsi-videobridge
 
         PROSODY_CONFIG_PRESENT="true"
+        PROSODY_HOST_CONFIG="/etc/prosody/conf.avail/$JVB_HOSTNAME.cfg.lua"
         # if there is no prosody config extract our template
-        if [ ! -f /etc/prosody/prosody.cfg.lua ]; then
+        # check for config in conf.avail or check whether it wasn't already configured in main config
+        if [ ! -f $PROSODY_HOST_CONFIG ] && ! grep -q "VirtualHost \"$JVB_HOSTNAME\"" /etc/prosody/prosody.cfg.lua; then
             PROSODY_CONFIG_PRESENT="false"
-            gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua
-        fi
-
-        # if there is no config for our domain, lets create it
-        if ! grep -q "VirtualHost \"$JVB_HOSTNAME\"" /etc/prosody/prosody.cfg.lua; then
-
-            # if its not our template, save the original and extract our template
-            if ! grep -q "VirtualHost \"jitmeet.example.com\"" /etc/prosody/prosody.cfg.lua; then
-                PROSODY_CONFIG_PRESENT="false"
-                cp /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig
-                gunzip -c /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example.gz > /etc/prosody/prosody.cfg.lua
-            fi
-
-            if [ "$PROSODY_CONFIG_PRESENT" = "true" ]; then
-                cp /etc/prosody/prosody.cfg.lua /etc/prosody/prosody.cfg.lua.orig
+            cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
+            sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" $PROSODY_HOST_CONFIG
+            sed -i "s/jitmeetSecret/$JVB_SECRET/g" $PROSODY_HOST_CONFIG
+            if [ ! -f /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua ]; then
+                ln -s $PROSODY_HOST_CONFIG /etc/prosody/conf.d/$JVB_HOSTNAME.cfg.lua
             fi
-            sed -i "s/jitmeet.example.com/$JVB_HOSTNAME/g" /etc/prosody/prosody.cfg.lua
-            sed -i "s/jitmeetSecret/$JVB_SECRET/g" /etc/prosody/prosody.cfg.lua
         fi
 
         if [ ! -f /var/lib/prosody/$JVB_HOSTNAME.crt ]; then
@@ -58,9 +48,7 @@ case "$1" in
         ln -sf /var/lib/prosody/$JVB_HOSTNAME.key /etc/prosody/certs/$JVB_HOSTNAME.key
         ln -sf /var/lib/prosody/$JVB_HOSTNAME.crt /etc/prosody/certs/$JVB_HOSTNAME.crt
 
-        if [ "$PROSODY_CONFIG_PRESENT" = "true" ]; then
-            invoke-rc.d prosody reload
-        else
+        if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
             invoke-rc.d prosody restart
             invoke-rc.d jitsi-videobridge restart
         fi

doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example

@@ -1,177 +1,3 @@
---
---
---
-
-
----------- Server-wide settings ----------
-
-admins = { }
-daemonize = true
-cross_domain_bosh = true;
-component_ports = { 5347 }
-
-
---use_libevent = true
-
-modules_enabled = {
-
-        -- Generally required
-                "roster"; -- Allow users to have a roster. Recommended ;)
-                "saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
-                "tls"; -- Add support for secure TLS on c2s/s2s connections
-                "dialback"; -- s2s dialback support
-                "disco"; -- Service discovery
-                "posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-
-        -- Not essential, but recommended
-                "private"; -- Private XML storage (for room bookmarks, etc.)
-                "vcard"; -- Allow users to set vCards
-
-        -- These are commented by default as they have a performance impact
-                --"privacy"; -- Support privacy lists
-                "compression"; -- Stream compression (requires the lua-zlib package installed)
-
-        -- Nice to have
-                "version"; -- Replies to server version requests
-                "uptime"; -- Report how long server has been running
-                "time"; -- Let others know the time here on this server
-                "ping"; -- Replies to XMPP pings with pongs
-                "pep"; -- Enables users to publish their mood, activity, playing music and more
-                "register"; -- Allow users to register on this server using a client and change passwords
-
-        -- Admin interfaces
-                "admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
-                --"admin_telnet"; -- Opens telnet console interface on localhost port 5582
-
-        -- HTTP modules
-                "bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
-                --"http_files"; -- Serve static files from a directory over HTTP
-
-        -- Other specific functionality
-                --"groups"; -- Shared roster support
-                --"announce"; -- Send announcement to all online users
-                --"welcome"; -- Welcome users who register accounts
-                --"watchregistrations"; -- Alert admins of registrations
-                --"motd"; -- Send a message to users when they log in
-                --"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
-        -- jitmeet
-                --"smacks";
-                --"carbons";
-                --"mam";
-                --"lastactivity";
-                --"offline";
-                "pubsub";
-                --"adhoc";
-                --"websocket";
-                --"http_altconnect";
-                "turncredentials";
-}
-
-modules_disabled = {
-        -- "offline"; -- Store offline messages
-        -- "c2s"; -- Handle client connections
-        -- "s2s"; -- Handle server-to-server connections
-}
-
-allow_registration = false
-
-ssl = {
-        key = "/etc/prosody/certs/localhost.key";
-        certificate = "/etc/prosody/certs/localhost.crt";
-}
-
-
-
-
-
-
---s2s_insecure_domains = { "gmail.com" }
-
-
---s2s_secure_domains = { "jabber.org" }
-
-pidfile = "/var/run/prosody/prosody.pid"
-
-
-authentication = "internal_hashed"
-
-
---storage = "sql" -- Default is "internal"
-
---sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
---sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
---sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
-
-storage = {archive2 = "sql2"}
-sql = { driver = "SQLite3", database = "prosody.sqlite" }
-default_archive_policy = "roster"
-
-log = {
-        info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-        error = "/var/log/prosody/prosody.err";
-        "*syslog";
-}
-
------------ Virtual hosts -----------
-
-
 VirtualHost "jitmeet.example.com"
         -- enabled = false -- Remove this line to enable this host
         authentication = "anonymous"
@@ -183,26 +9,11 @@ VirtualHost "jitmeet.example.com"
                 key = "/etc/prosody/certs/jitmeet.example.com.key";
                 certificate = "/etc/prosody/certs/jitmeet.example.com.crt";
         }
-
------- Components ------
-
----Set up a MUC (multi-user chat) room server on conference.example.com:
---Component "conference.example.com" "muc"
-
---Component "proxy.example.com" "proxy65"
-
----Set up an external component (default component port is 5347)
---
---
---Component "gateway.example.com"
+        -- we need bosh
+        modules_enabled = {
+            "bosh";
+            "pubsub";
+        }
 
 Component "conference.jitmeet.example.com" "muc"