|
@@ -801,7 +801,7 @@ function install_xmpp {
|
801
|
801
|
mkdir -p /var/lib/prosody/http_uploads
|
802
|
802
|
fi
|
803
|
803
|
if [ ! -d /etc/prosody/conf.d ]; then
|
804
|
|
- mkdir /etc/prosody/conf.d
|
|
804
|
+ mkdir -p /etc/prosody/conf.d
|
805
|
805
|
fi
|
806
|
806
|
|
807
|
807
|
chmod -R 700 /etc/prosody/conf.d
|
|
@@ -845,11 +845,11 @@ function install_xmpp {
|
845
|
845
|
cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
|
846
|
846
|
|
847
|
847
|
if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
|
848
|
|
- sed -i "s|key =.*|key = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
849
|
|
- sed -i "s|certificate =.*|certificate = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
|
848
|
+ sed -i "s|key =.*|key = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
|
849
|
+ sed -i "s|certificate =.*|certificate = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
850
|
850
|
else
|
851
|
|
- sed -i "s|key =.*|key = /etc/ssl/privates/xmpp.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
852
|
|
- sed -i "s|certificate =.*|certificate = /etc/ssl/certs/xmpp.crt|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
|
851
|
+ sed -i "s|key =.*|key = /etc/ssl/privates/xmpp.key;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
|
852
|
+ sed -i "s|certificate =.*|certificate = /etc/ssl/certs/xmpp.crt;|g" /etc/prosody/conf.avail/xmpp.cfg.lua
|
853
|
853
|
fi
|
854
|
854
|
if ! grep -q "xmpp.dhparam" /etc/prosody/conf.avail/xmpp.cfg.lua; then
|
855
|
855
|
if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "1" ]]; then
|