From a3e65b0f36aafd6ab77760f7b0d856a140b2d01c Mon Sep 17 00:00:00 2001
From: usmannasir <usman@cyberpersons.com>
Date: Sat, 16 Mar 2024 01:00:58 +0500
Subject: [PATCH] bug fix: https://github.com/usmannasir/cyberpanel/issues/1228

---
 ApachController/ApacheVhosts.py |  2 ++
 plogical/vhostConfs.py          | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/ApachController/ApacheVhosts.py b/ApachController/ApacheVhosts.py
index 26c40570c..76ae8af8f 100755
--- a/ApachController/ApacheVhosts.py
+++ b/ApachController/ApacheVhosts.py
@@ -374,9 +374,11 @@ class ApacheVhost:
         # General Configurations tab
         try:
             confFile = open(vhFile, "w+")
+            virtualHostName = vhFile.split('/')[6]
 
             currentConf = vhostConfs.OLSLBConf
             currentConf = currentConf.replace('{adminEmails}', administratorEmail)
+            currentConf = currentConf.replace('{domain}', virtualHostName)
 
             confFile.write(currentConf)
             confFile.close()
diff --git a/plogical/vhostConfs.py b/plogical/vhostConfs.py
index 45eb0f8e6..d012e6bb1 100755
--- a/plogical/vhostConfs.py
+++ b/plogical/vhostConfs.py
@@ -395,6 +395,19 @@ REWRITERULE ^(.*)$ HTTP://proxyApacheBackendSSL/$1 [P,L]
   END_rules
 }
 
+vhssl  {
+  keyFile                 /etc/letsencrypt/live/{domain}/privkey.pem
+  certFile                /etc/letsencrypt/live/{domain}/fullchain.pem
+  certChain               1
+  sslProtocol             24
+  enableECDHE             1
+  renegProtection         1
+  sslSessionCache         1
+  enableSpdy              15
+  enableStapling           1
+  ocspRespMaxAge           86400
+}
+
 """
     phpFpmPool = """[{www}]
 listen = {sockPath}{Sock}.sock