diff --git a/ApachController/ApacheVhosts.py b/ApachController/ApacheVhosts.py index f2abbf8b3..c55b52129 100755 --- a/ApachController/ApacheVhosts.py +++ b/ApachController/ApacheVhosts.py @@ -137,8 +137,8 @@ class ApacheVhost: else: os.mkdir(ApacheVhost.sslBasePath) - pathToStoreSSLPrivKey = ApacheVhost.sslBasePath + virtualHostName + ".privkey.pem" - pathToStoreSSLFullChain = ApacheVhost.sslBasePath + virtualHostName + ".fullchain.pem" + pathToStoreSSLPrivKey = ApacheVhost.sslBasePath + ".privkey.pem" + pathToStoreSSLFullChain = ApacheVhost.sslBasePath + ".fullchain.pem" command = 'openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" -keyout ' + pathToStoreSSLPrivKey + ' -out ' + pathToStoreSSLFullChain ProcessUtilities.normalExecutioner(command) diff --git a/plogical/vhostConfs.py b/plogical/vhostConfs.py index 4cd33ba43..45eb0f8e6 100755 --- a/plogical/vhostConfs.py +++ b/plogical/vhostConfs.py @@ -264,8 +264,8 @@ context /.well-known/acme-challenge { SSLEngine on SSLVerifyClient none - SSLCertificateFile {SSLBase}{virtualHostName}.fullchain.pem - SSLCertificateKeyFile {SSLBase}{virtualHostName}.privkey.pem + SSLCertificateFile {SSLBase}.fullchain.pem + SSLCertificateKeyFile {SSLBase}.privkey.pem """ @@ -318,8 +318,8 @@ context /.well-known/acme-challenge { SSLEngine on SSLVerifyClient none - SSLCertificateFile {SSLBase}{virtualHostName}.fullchain.pem - SSLCertificateKeyFile {SSLBase}{virtualHostName}.privkey.pem + SSLCertificateFile {SSLBase}.fullchain.pem + SSLCertificateKeyFile {SSLBase}.privkey.pem """