diff --git a/src/server/WebServer.cpp b/src/server/WebServer.cpp index 9f76c1a..f0965a8 100644 --- a/src/server/WebServer.cpp +++ b/src/server/WebServer.cpp @@ -57,7 +57,7 @@ bool WebServer::setupWebSocket(quint16 port){ WSServer = new QWebSocketServer("sysadm-server", QWebSocketServer::SecureMode, this); //SSL Configuration QSslConfiguration config = QSslConfiguration::defaultConfiguration(); - QFile CF( QStringLiteral(SSLCERTFILE) ); + QFile CF( QStringLiteral(SSLCERTFILEWS) ); if(CF.open(QIODevice::ReadOnly) ){ QSslCertificate CERT(&CF,QSsl::Pem); config.setLocalCertificate( CERT ); @@ -65,7 +65,7 @@ bool WebServer::setupWebSocket(quint16 port){ }else{ qWarning() << "Could not read WS certificate file:" << CF.fileName(); } - QFile KF( QStringLiteral(SSLKEYFILE)); + QFile KF( QStringLiteral(SSLKEYFILEWS)); if(KF.open(QIODevice::ReadOnly) ){ QSslKey KEY(&KF, QSsl::Rsa, QSsl::Pem); config.setPrivateKey( KEY ); diff --git a/src/server/globals-qt.h b/src/server/globals-qt.h index 2e53258..1d614db 100644 --- a/src/server/globals-qt.h +++ b/src/server/globals-qt.h @@ -53,6 +53,9 @@ #define SSLCERTFILE "/usr/local/etc/sysadm/restserver.crt" #define SSLKEYFILE "/usr/local/etc/sysadm/restserver.key" +#define SSLCERTFILEWS "/usr/local/etc/sysadm/wsserver.crt" +#define SSLKEYFILEWS "/usr/local/etc/sysadm/wsserver.key" + // Server Settings defines #define DISPATCH_QUEUE "/usr/local/etc/sysadm/dispatch_queue"