Ignore errors when restarting services.

Sometimes conflicting or wrong configuration can leave the package in broken state and users cannot even uninstall/purge the packages, and it also breaks any other package installation.

debian/jitsi-meet-prosody.docs

@@ -1,2 +1 @@
-doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example
 doc/debian/jitsi-meet-prosody/README

debian/jitsi-meet-prosody.install

@@ -1 +1,2 @@
-resources/prosody-plugins/     /usr/share/jitsi-meet/
+doc/debian/jitsi-meet-prosody/prosody.cfg.lua-jvb.example   /usr/share/jitsi-meet-prosody/
+resources/prosody-plugins/                                  /usr/share/jitsi-meet/

debian/jitsi-meet-prosody.postinst

@@ -93,7 +93,7 @@ case "$1" in
             PROSODY_CONFIG_PRESENT="false"
             mkdir -p /etc/prosody/conf.avail/
             mkdir -p /etc/prosody/conf.d/
-            cp /usr/share/doc/jitsi-meet-prosody/prosody.cfg.lua-jvb.example $PROSODY_HOST_CONFIG
+            cp /usr/share/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
             sed -i "s/focusSecret/$JICOFO_SECRET/g" $PROSODY_HOST_CONFIG
@@ -179,7 +179,7 @@ case "$1" in
         fi
 
         if [ "$PROSODY_CONFIG_PRESENT" = "false" ]; then
-            invoke-rc.d prosody restart
+            invoke-rc.d prosody restart || true
         fi
     ;;
 

debian/jitsi-meet-tokens.postinst

@@ -78,7 +78,7 @@ case "$1" in
                 fi
 
                 if [ -x "/etc/init.d/prosody" ]; then
-                    invoke-rc.d prosody restart
+                    invoke-rc.d prosody restart || true
                 fi
             fi
         else

debian/jitsi-meet-web-config.docs

@@ -1,4 +1 @@
-doc/debian/jitsi-meet/jitsi-meet.example
-doc/debian/jitsi-meet/jitsi-meet.example-apache
 doc/debian/jitsi-meet/README
-config.js

debian/jitsi-meet-web-config.install

@@ -0,0 +1,5 @@
+doc/debian/jitsi-meet/jitsi-meet.example        /usr/share/jitsi-meet-web-config/
+doc/debian/jitsi-meet/jitsi-meet.example-apache /usr/share/jitsi-meet-web-config/
+config.js                                       /usr/share/jitsi-meet-web-config/
+interface_config.js                             /etc/jitsi/meet/
+logging_config.js                               /etc/jitsi/meet/

debian/jitsi-meet-web-config.postinst

@@ -98,16 +98,17 @@ case "$1" in
         # jitsi meet
         JITSI_MEET_CONFIG="/etc/jitsi/meet/$JVB_HOSTNAME-config.js"
         if [ ! -f $JITSI_MEET_CONFIG ] ; then
-            cp /usr/share/doc/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG
+            cp /usr/share/jitsi-meet-web-config/config.js $JITSI_MEET_CONFIG
             sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" $JITSI_MEET_CONFIG
         fi
 
+        JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
+
         # this is new install let's configure jvb to serve meet
         # no-nginx, no-apache installed on machine, this is new install or reconfiguring old one which have jvb_serve set
         if [[ -z "$FORCE_NGINX" && -z "$FORCE_APACHE" && ( -z "$JVB_HOSTNAME_OLD" || ( "$JVB_SERVE" = "true" && "$RECONFIGURING" = "true" )) ]] ; then
 
             JVB_ETC_CONFIG="/etc/jitsi/videobridge/config"
-            JVB_CONFIG="/etc/jitsi/videobridge/sip-communicator.properties"
 
             # this is a reconfigure, lets just delete old links
             if [ "$RECONFIGURING" = "true" ] ; then
@@ -130,8 +131,8 @@ case "$1" in
             echo "org.jitsi.videobridge.rest.jetty.ProxyServlet.proxyTo=http://localhost:5280/http-bind" >> $JVB_CONFIG
             echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.resourceBase=/usr/share/jitsi-meet" >> $JVB_CONFIG
             echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./config.js=/etc/jitsi/meet/$JVB_HOSTNAME-config.js" >> $JVB_CONFIG
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./interface_config.js=/usr/share/jitsi-meet/interface_config.js" >> $JVB_CONFIG
-            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./logging_config.js=/usr/share/jitsi-meet/logging_config.js" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./interface_config.js=/etc/jitsi/meet/interface_config.js" >> $JVB_CONFIG
+            echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./logging_config.js=/etc/jitsi/meet/logging_config.js" >> $JVB_CONFIG
             echo "org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./external_api.js=/usr/share/jitsi-meet/libs/external_api.min.js" >> $JVB_CONFIG
             echo "org.jitsi.videobridge.rest.jetty.RewriteHandler.regex=^/([a-zA-Z0-9]+)$" >> $JVB_CONFIG
             echo "org.jitsi.videobridge.rest.jetty.RewriteHandler.replacement=/" >> $JVB_CONFIG
@@ -167,7 +168,7 @@ case "$1" in
 
             db_set jitsi-meet/jvb-serve "true"
 
-            invoke-rc.d jitsi-videobridge restart
+            invoke-rc.d jitsi-videobridge restart || true
         elif [[ "$FORCE_NGINX" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
             # this is a reconfigure, lets just delete old links
             if [ "$RECONFIGURING" = "true" ] ; then
@@ -177,7 +178,7 @@ case "$1" in
 
             # nginx conf
             if [ ! -f /etc/nginx/sites-available/$JVB_HOSTNAME.conf ] ; then
-                cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
+                cp /usr/share/jitsi-meet-web-config/jitsi-meet.example /etc/nginx/sites-available/$JVB_HOSTNAME.conf
                 if [ ! -f /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf ] ; then
                     ln -s /etc/nginx/sites-available/$JVB_HOSTNAME.conf /etc/nginx/sites-enabled/$JVB_HOSTNAME.conf
                 fi
@@ -196,7 +197,7 @@ case "$1" in
                     /etc/nginx/sites-available/$JVB_HOSTNAME.conf
             fi
 
-            invoke-rc.d nginx reload
+            invoke-rc.d nginx reload || true
         elif [[ "$FORCE_APACHE" = "true" && ( -z "$JVB_HOSTNAME_OLD" || "$RECONFIGURING" = "true" ) ]] ; then
             # this is a reconfigure, lets just delete old links
             if [ "$RECONFIGURING" = "true" ] ; then
@@ -208,7 +209,7 @@ case "$1" in
             if [ ! -f /etc/apache2/sites-available/$JVB_HOSTNAME.conf ] ; then
                 # when creating new config, make sure all needed modules are enabled
                 a2enmod rewrite ssl headers proxy_http include
-                cp /usr/share/doc/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf
+                cp /usr/share/jitsi-meet-web-config/jitsi-meet.example-apache /etc/apache2/sites-available/$JVB_HOSTNAME.conf
                 a2ensite $JVB_HOSTNAME.conf
                 sed -i "s/jitsi-meet.example.com/$JVB_HOSTNAME/g" /etc/apache2/sites-available/$JVB_HOSTNAME.conf
             fi
@@ -225,7 +226,33 @@ case "$1" in
                     /etc/apache2/sites-available/$JVB_HOSTNAME.conf
             fi
 
-            invoke-rc.d apache2 reload
+            invoke-rc.d apache2 reload || true
+        fi
+
+        # Moving interface config and logging config to /etc we need to port changes
+        # to already installed deployments so we do not break them
+        if [[ -z "$FORCE_NGINX" && -z "$FORCE_APACHE" && "$JVB_SERVE" = "true" ]] ; then
+            sed -i "s#alias./interface_config.js=/usr/share/jitsi-meet/interface_config.js#alias./interface_config.js=/etc/jitsi/meet/interface_config.js#g" $JVB_CONFIG
+            sed -i "s#alias./logging_config.js=/usr/share/jitsi-meet/logging_config.js#alias./logging_config.js=/etc/jitsi/meet/logging_config.js#g" $JVB_CONFIG
+            invoke-rc.d jitsi-videobridge restart || true
+        elif [[ "$FORCE_NGINX" = "true" ]] ; then
+            NGINX_CONFIG_FILE="/etc/nginx/sites-available/$JVB_HOSTNAME.conf"
+            if ! grep -q "location = /interface_config.js" "$NGINX_CONFIG_FILE" ;then
+                sed -i "s#location = /config.js#location = /interface_config.js { alias /etc/jitsi/meet/interface_config.js; }\n    location = /config.js#g" $NGINX_CONFIG_FILE
+            fi
+            if ! grep -q "location = /logging_config.js" "$NGINX_CONFIG_FILE" ;then
+                sed -i "s#location = /config.js#location = /logging_config.js { alias /etc/jitsi/meet/logging_config.js; }\n    location = /config.js#g" $NGINX_CONFIG_FILE
+            fi
+            invoke-rc.d nginx reload || true
+        elif [[ "$FORCE_APACHE" = "true" ]] ; then
+            APACHE_CONFIG_FILE="/etc/apache2/sites-available/$JVB_HOSTNAME.conf"
+            if ! grep -q "Alias \"/interface_config.js\"" "$APACHE_CONFIG_FILE" ;then
+                sed -i "s#Alias \"/config.js\"#Alias \"/interface_config.js\" \"/etc/jitsi/meet/interface_config.js\"\n  <Location /interface_config.js>\n    Require all granted\n  </Location>\n  Alias \"/config.js\"#g" $APACHE_CONFIG_FILE
+            fi
+            if ! grep -q "Alias \"/logging_config.js\"" "$APACHE_CONFIG_FILE" ;then
+                sed -i "s#Alias \"/config.js\"#Alias \"/logging_config.js\" \"/etc/jitsi/meet/logging_config.js\"\n  <Location /logging_config.js>\n    Require all granted\n  </Location>\n  Alias \"/config.js\"#g" $APACHE_CONFIG_FILE
+            fi
+            invoke-rc.d apache2 reload || true
         fi
 
         echo "----------------"

debian/jitsi-meet-web.install

@@ -1,5 +1,3 @@
-interface_config.js		/usr/share/jitsi-meet/
-logging_config.js		/usr/share/jitsi-meet/
 *.json					/usr/share/jitsi-meet/
 *.html					/usr/share/jitsi-meet/
 *.ico					/usr/share/jitsi-meet/

debian/rules

@@ -14,7 +14,7 @@ override_dh_auto_build:
 
 override_dh_install: $(LANGUAGES)
 	dh_installdirs
-	dh_install -X/config.js -X/package.json
+	dh_install
 
 $(LANGUAGES):
 	LOCALE=$$(echo $@ | cut -c1-2) ; \

doc/debian/jitsi-meet/jitsi-meet.example

@@ -26,6 +26,12 @@ server {
     location = /config.js {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
+    location = /interface_config.js {
+        alias /etc/jitsi/meet/interface_config.js;
+    }
+    location = /logging_config.js {
+        alias /etc/jitsi/meet/logging_config.js;
+    }
 
     location = /external_api.js {
         alias /usr/share/jitsi-meet/libs/external_api.min.js;

doc/debian/jitsi-meet/jitsi-meet.example-apache

@@ -35,6 +35,14 @@
   <Location /config.js>
     Require all granted
   </Location>
+  Alias "/interface_config.js" "/etc/jitsi/meet/interface_config.js"
+  <Location /interface_config.js>
+    Require all granted
+  </Location>
+  Alias "/logging_config.js" "/etc/jitsi/meet/logging_config.js"
+  <Location /logging_config.js>
+    Require all granted
+  </Location>
 
   Alias "/external_api.js" "/usr/share/jitsi-meet/libs/external_api.min.js"
   <Location /external_api.js>