瀏覽代碼

Upgrade prosody certs when possible

Bob Mottram 7 年之前
父節點
當前提交
e42c276dd7
共有 1 個文件被更改,包括 27 次插入0 次删除
  1. 27
    0
      src/freedombone-app-xmpp

+ 27
- 0
src/freedombone-app-xmpp 查看文件

@@ -407,6 +407,25 @@ function upgrade_xmpp {
407 407
     update_prosody_modules
408 408
     xmpp_onion_addresses /etc/prosody/prosody.cfg.lua
409 409
 
410
+    if grep -q "/etc/ssl/certs/xmpp.dhparam" /etc/prosody/prosody.cfg.lua; then
411
+        cp /etc/ssl/certs/xmpp.dhparam /etc/prosody/xmpp.dhparam
412
+        chown prosody:prosody /etc/prosody/xmpp.dhparam
413
+        sed -i 's|/etc/ssl/certs/xmpp.dhparam|/etc/prosody/xmpp.dhparam|g' /etc/prosody/prosody.cfg.lua
414
+        sed -i 's|/etc/ssl/certs/xmpp.dhparam|/etc/prosody/xmpp.dhparam|g' /etc/prosody/conf.avail/xmpp.cfg.lua
415
+    fi
416
+
417
+    if grep -q "/etc/ssl/private/xmpp.key" /etc/prosody/prosody.cfg.lua; then
418
+        if [ -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem ]; then
419
+            sed -i "s|/etc/ssl/private/xmpp.key|/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem|g" /etc/prosody/prosody.cfg.lua
420
+        fi
421
+    fi
422
+
423
+    if grep -q "/etc/ssl/certs/xmpp.crt" /etc/prosody/prosody.cfg.lua; then
424
+        if [ -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
425
+            sed -i "s|/etc/ssl/certs/xmpp.crt|/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem|g" /etc/prosody/prosody.cfg.lua
426
+        fi
427
+    fi
428
+
410 429
     curr_prosody_filename=$(cat $COMPLETION_FILE | grep "prosody_filename" | awk -F ':' '{print $2}')
411 430
     if [[ "$curr_prosody_filename" != "$prosody_filename" ]]; then
412 431
         if [ -d ${INSTALL_DIR}/${prosody_filename} ]; then
@@ -1065,6 +1084,14 @@ function install_xmpp {
1065 1084
     if [ -d /etc/letsencrypt ]; then
1066 1085
         usermod -a -G ssl-cert prosody
1067 1086
     fi
1087
+
1088
+    if [ -f /etc/ssl/certs/xmpp.dhparam ]; then
1089
+        cp /etc/ssl/certs/xmpp.dhparam /etc/prosody/xmpp.dhparam
1090
+        chown prosody:prosody /etc/prosody/xmpp.dhparam
1091
+        sed -i 's|/etc/ssl/certs/xmpp.dhparam|/etc/prosody/xmpp.dhparam|g' /etc/prosody/prosody.cfg.lua
1092
+        sed -i 's|/etc/ssl/certs/xmpp.dhparam|/etc/prosody/xmpp.dhparam|g' /etc/prosody/conf.avail/xmpp.cfg.lua
1093
+    fi
1094
+
1068 1095
     apt-mark -q hold prosody
1069 1096
     systemctl restart prosody
1070 1097