Browse Source

Separate out mumble. It doesn't need to depend on prosody being installed

Bob Mottram 7 years ago
parent
commit
0ddebf4dc3
1 changed files with 15 additions and 15 deletions
  1. 15
    15
      src/freedombone-utils-web

+ 15
- 15
src/freedombone-utils-web View File

@@ -756,24 +756,24 @@ function configure_firewall_for_web_access {
756 756
 function update_default_domain {
757 757
     echo $'Updating default domain'
758 758
     if [[ $ONION_ONLY == 'no' ]]; then
759
-        if [ -d /etc/prosody ]; then
760
-            if [ -f /etc/mumble-server.ini ]; then
761
-                if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
762
-                    if ! grep -q "mumble.pem" /etc/mumble-server.ini; then
763
-                        sed -i 's|sslCert=.*|sslCert=/var/lib/mumble-server/mumble.pem|g' /etc/mumble-server.ini
764
-                        sed -i 's|sslKey=.*|sslKey=/var/lib/mumble-server/mumble.key|g' /etc/mumble-server.ini
765
-                        systemctl restart mumble
766
-                    fi
767
-                else
768
-                    if ! grep -q "${DEFAULT_DOMAIN_NAME}/fullchain.pem" /etc/mumble-server.ini; then
769
-                        usermod -a -G ssl-cert mumble-server
770
-                        sed -i "s|sslCert=.*|sslCert=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem|g" /etc/mumble-server.ini
771
-                        sed -i "s|sslKey=.*|sslKey=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem|g" /etc/mumble-server.ini
772
-                        systemctl restart mumble
773
-                    fi
759
+        if [ -f /etc/mumble-server.ini ]; then
760
+            if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
761
+                if ! grep -q "mumble.pem" /etc/mumble-server.ini; then
762
+                    sed -i 's|sslCert=.*|sslCert=/var/lib/mumble-server/mumble.pem|g' /etc/mumble-server.ini
763
+                    sed -i 's|sslKey=.*|sslKey=/var/lib/mumble-server/mumble.key|g' /etc/mumble-server.ini
764
+                    systemctl restart mumble
765
+                fi
766
+            else
767
+                if ! grep -q "${DEFAULT_DOMAIN_NAME}/fullchain.pem" /etc/mumble-server.ini; then
768
+                    usermod -a -G ssl-cert mumble-server
769
+                    sed -i "s|sslCert=.*|sslCert=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem|g" /etc/mumble-server.ini
770
+                    sed -i "s|sslKey=.*|sslKey=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem|g" /etc/mumble-server.ini
771
+                    systemctl restart mumble
774 772
                 fi
775 773
             fi
774
+        fi
776 775
 
776
+        if [ -d /etc/prosody ]; then
777 777
             if [ ! -d /etc/prosody/certs ]; then
778 778
                 mkdir /etc/prosody/certs
779 779
             fi