Procházet zdrojové kódy

Revert "Protocol specification for prosody 0.10+"

This reverts commit 29cac8fc6a1c255e8a0dfa14cd0fa8ede796c9c6.
Bob Mottram před 8 roky
rodič
revize
fc0a20c2da
1 změnil soubory, kde provedl 5 přidání a 5 odebrání
  1. 5
    5
      src/freedombone-app-xmpp

+ 5
- 5
src/freedombone-app-xmpp Zobrazit soubor

675
     echo "    key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
675
     echo "    key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
676
     echo "    curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
676
     echo "    curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
677
     echo "    ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
677
     echo "    ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
678
-    echo '    options = { "tlsv1+" };' >> /etc/prosody/prosody.cfg.lua
678
+    echo '    options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua
679
     echo "    dhparam = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua
679
     echo "    dhparam = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua
680
     echo "}" >> /etc/prosody/prosody.cfg.lua
680
     echo "}" >> /etc/prosody/prosody.cfg.lua
681
     echo '' >> /etc/prosody/prosody.cfg.lua
681
     echo '' >> /etc/prosody/prosody.cfg.lua
689
     echo "    curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
689
     echo "    curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
690
     echo '    depth = "2";' >> /etc/prosody/prosody.cfg.lua
690
     echo '    depth = "2";' >> /etc/prosody/prosody.cfg.lua
691
     echo "    ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
691
     echo "    ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
692
-    echo '    options = { "tlsv1+" };' >> /etc/prosody/prosody.cfg.lua
692
+    echo '    options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua
693
     echo "    dhparam = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua
693
     echo "    dhparam = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua
694
     echo '}' >> /etc/prosody/prosody.cfg.lua
694
     echo '}' >> /etc/prosody/prosody.cfg.lua
695
     echo '' >> /etc/prosody/prosody.cfg.lua
695
     echo '' >> /etc/prosody/prosody.cfg.lua
724
     echo "        curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
724
     echo "        curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
725
     echo '        depth = "2";' >> /etc/prosody/prosody.cfg.lua
725
     echo '        depth = "2";' >> /etc/prosody/prosody.cfg.lua
726
     echo "        ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
726
     echo "        ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
727
-    echo '        options = { "tlsv1+" };' >> /etc/prosody/prosody.cfg.lua
727
+    echo '        options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua
728
     echo "        dhparam = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua
728
     echo "        dhparam = \"/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.dhparam\";" >> /etc/prosody/prosody.cfg.lua
729
     echo '    }' >> /etc/prosody/prosody.cfg.lua
729
     echo '    }' >> /etc/prosody/prosody.cfg.lua
730
     echo '' >> /etc/prosody/prosody.cfg.lua
730
     echo '' >> /etc/prosody/prosody.cfg.lua
890
             sed -i '/certificate =/a\        dhparam = "/etc/prosody/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua
890
             sed -i '/certificate =/a\        dhparam = "/etc/prosody/certs/xmpp.dhparam";' /etc/prosody/conf.avail/xmpp.cfg.lua
891
         fi
891
         fi
892
     fi
892
     fi
893
-    if ! grep -q 'options = { "tlsv1+" }' /etc/prosody/conf.avail/xmpp.cfg.lua; then
894
-        sed -i '/certificate =/a\        options = { "tlsv1+" };' /etc/prosody/conf.avail/xmpp.cfg.lua
893
+    if ! grep -q 'options = {"no_sslv2", "no_sslv3" }' /etc/prosody/conf.avail/xmpp.cfg.lua; then
894
+        sed -i '/certificate =/a\        options = {"no_sslv2", "no_sslv3" };' /etc/prosody/conf.avail/xmpp.cfg.lua
895
     fi
895
     fi
896
     if ! grep -q 'ciphers =' /etc/prosody/conf.avail/xmpp.cfg.lua; then
896
     if ! grep -q 'ciphers =' /etc/prosody/conf.avail/xmpp.cfg.lua; then
897
         sed -i "/certificate =/a\        ciphers = $XMPP_CIPHERS;" /etc/prosody/conf.avail/xmpp.cfg.lua
897
         sed -i "/certificate =/a\        ciphers = $XMPP_CIPHERS;" /etc/prosody/conf.avail/xmpp.cfg.lua