|
@@ -640,10 +640,11 @@ function xmpp_create_config {
|
640
|
640
|
echo 'https_ssl = {' >> /etc/prosody/prosody.cfg.lua
|
641
|
641
|
if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
|
642
|
642
|
echo " certificate = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem\";" >> /etc/prosody/prosody.cfg.lua
|
|
643
|
+ echo " key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
|
643
|
644
|
else
|
644
|
|
- echo " certificate = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt\";" >> /etc/prosody/prosody.cfg.lua
|
|
645
|
+ echo " certificate = \"/etc/ssl/certs/xmpp.crt\";" >> /etc/prosody/prosody.cfg.lua
|
|
646
|
+ echo " key = \"/etc/ssl/private/xmpp.key\";" >> /etc/prosody/prosody.cfg.lua
|
645
|
647
|
fi
|
646
|
|
- echo " key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
|
647
|
648
|
echo " curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
|
648
|
649
|
echo " ciphers = $XMPP_CIPHERS;" >> /etc/prosody/prosody.cfg.lua
|
649
|
650
|
echo ' options = {"no_sslv2", "no_sslv3" };' >> /etc/prosody/prosody.cfg.lua
|
|
@@ -651,11 +652,12 @@ function xmpp_create_config {
|
651
|
652
|
echo "}" >> /etc/prosody/prosody.cfg.lua
|
652
|
653
|
echo '' >> /etc/prosody/prosody.cfg.lua
|
653
|
654
|
echo 'ssl = {' >> /etc/prosody/prosody.cfg.lua
|
654
|
|
- echo " key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
|
655
|
655
|
if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
|
656
|
656
|
echo " certificate = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem\";" >> /etc/prosody/prosody.cfg.lua
|
|
657
|
+ echo " key = \"/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key\";" >> /etc/prosody/prosody.cfg.lua
|
657
|
658
|
else
|
658
|
|
- echo " certificate = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt\";" >> /etc/prosody/prosody.cfg.lua
|
|
659
|
+ echo " certificate = \"/etc/ssl/certs/xmpp.crt\";" >> /etc/prosody/prosody.cfg.lua
|
|
660
|
+ echo " key = \"/etc/ssl/private/xmpp.key\";" >> /etc/prosody/prosody.cfg.lua
|
659
|
661
|
fi
|
660
|
662
|
echo " curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
|
661
|
663
|
echo ' depth = "2";' >> /etc/prosody/prosody.cfg.lua
|
|
@@ -690,7 +692,7 @@ function xmpp_create_config {
|
690
|
692
|
if [ -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
|
691
|
693
|
echo " certificate = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem\";" >> /etc/prosody/prosody.cfg.lua
|
692
|
694
|
else
|
693
|
|
- echo " certificate = \"/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt\";" >> /etc/prosody/prosody.cfg.lua
|
|
695
|
+ echo " certificate = \"/etc/ssl/certs/xmpp.crt\";" >> /etc/prosody/prosody.cfg.lua
|
694
|
696
|
fi
|
695
|
697
|
echo " curve = $XMPP_ECC_CURVE;" >> /etc/prosody/prosody.cfg.lua
|
696
|
698
|
echo ' depth = "2";' >> /etc/prosody/prosody.cfg.lua
|