浏览代码

Use onion address in xmpp virtualhost

Bob Mottram 8 年前
父节点
当前提交
5cc277740b
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5
    2
      src/freedombone-app-xmpp

+ 5
- 2
src/freedombone-app-xmpp 查看文件

701
     echo '    { levels = { "error" }; to = "/dev/null";  };' >> /etc/prosody/prosody.cfg.lua
701
     echo '    { levels = { "error" }; to = "/dev/null";  };' >> /etc/prosody/prosody.cfg.lua
702
     echo '}' >> /etc/prosody/prosody.cfg.lua
702
     echo '}' >> /etc/prosody/prosody.cfg.lua
703
     echo '' >> /etc/prosody/prosody.cfg.lua
703
     echo '' >> /etc/prosody/prosody.cfg.lua
704
-    echo "VirtualHost \"${DEFAULT_DOMAIN_NAME}\"" >> /etc/prosody/prosody.cfg.lua
704
+    if [[ $ONION_ONLY != 'no' ]]; then
705
+        echo "VirtualHost \"${XMPP_ONION_HOSTNAME}\"" >> /etc/prosody/prosody.cfg.lua
706
+    else
707
+        echo "VirtualHost \"${DEFAULT_DOMAIN_NAME}\"" >> /etc/prosody/prosody.cfg.lua
708
+    fi
705
     echo '    ssl = {' >> /etc/prosody/prosody.cfg.lua
709
     echo '    ssl = {' >> /etc/prosody/prosody.cfg.lua
706
     echo "        key = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
710
     echo "        key = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
707
     if [ -f /etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
711
     if [ -f /etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
970
 
974
 
971
     systemctl restart prosody
975
     systemctl restart prosody
972
 
976
 
973
-    cd
974
     if [[ $ONION_ONLY != 'no' ]]; then
977
     if [[ $ONION_ONLY != 'no' ]]; then
975
         prosodyctl register $MY_USERNAME $XMPP_ONION_HOSTNAME "$XMPP_PASSWORD"
978
         prosodyctl register $MY_USERNAME $XMPP_ONION_HOSTNAME "$XMPP_PASSWORD"
976
     else
979
     else