mirror of
https://github.com/usmannasir/cyberpanel.git
synced 2026-01-27 01:39:03 +01:00
2b8377da7f
- Fixed perHostDomainConf() to replace {virtualHostName} placeholder in olsChildConf template
- Updated lswsChildConf template to use master domain log directory
- Updated lswsRediConfChild and lswsRediConfChildWWW templates to use master domain log directory
- Added automatic log directory and log file creation for child domains during creation
- Log files are now created at /home/{masterDomain}/logs/{childDomain}.{access|error}_log
- Ensures all newly created sub-domains automatically have separate log files from the start
This permanent fix ensures that when child domains are created:
1. VHost config uses correct log paths pointing to master domain's log directory
2. Log directory is created if it doesn't exist
3. Separate log files are created for each child domain with proper permissions
4. Works for both OpenLiteSpeed (OLS) and LiteSpeed Enterprise (LSWS) configurations
Fixes the root cause so all future child domain creations will have correct log configuration automatically.
533 lines
14 KiB
Python
533 lines
14 KiB
Python
class vhostConfs:
|
|
|
|
olsMasterMainConf = """virtualHost {virtualHostName} {
|
|
vhRoot /home/$VH_NAME
|
|
configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhost.conf
|
|
allowSymbolLink 1
|
|
enableScript 1
|
|
restrained 1
|
|
}
|
|
"""
|
|
|
|
olsMasterConf = """docRoot $VH_ROOT/public_html
|
|
vhDomain $VH_NAME
|
|
vhAliases www.$VH_NAME
|
|
adminEmails {adminEmails}
|
|
enableGzip 1
|
|
enableIpGeo 1
|
|
|
|
index {
|
|
useServer 0
|
|
indexFiles index.php, index.html
|
|
}
|
|
|
|
errorlog $VH_ROOT/logs/$VH_NAME.error_log {
|
|
useServer 0
|
|
logLevel WARN
|
|
rollingSize 10M
|
|
}
|
|
|
|
accesslog $VH_ROOT/logs/$VH_NAME.access_log {
|
|
useServer 0
|
|
logFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
|
logHeaders 5
|
|
rollingSize 10M
|
|
keepDays 10
|
|
compressArchive 1
|
|
}
|
|
|
|
scripthandler {
|
|
add lsapi:{virtualHostUser} php
|
|
}
|
|
|
|
extprocessor {virtualHostUser} {
|
|
type lsapi
|
|
address UDS://tmp/lshttpd/{virtualHostUser}.sock
|
|
maxConns 10
|
|
env LSAPI_CHILDREN=10
|
|
initTimeout 600
|
|
retryTimeout 0
|
|
persistConn 1
|
|
pcKeepAliveTimeout 1
|
|
respBuffer 0
|
|
autoStart 1
|
|
path /usr/local/lsws/lsphp{php}/bin/lsphp
|
|
extUser {virtualHostUser}
|
|
extGroup {virtualHostUser}
|
|
memSoftLimit 2047M
|
|
memHardLimit 2047M
|
|
procSoftLimit 400
|
|
procHardLimit 500
|
|
}
|
|
|
|
phpIniOverride {
|
|
{open_basedir}
|
|
}
|
|
|
|
module cache {
|
|
storagePath /usr/local/lsws/cachedata/$VH_NAME
|
|
}
|
|
|
|
rewrite {
|
|
enable 1
|
|
autoLoadHtaccess 1
|
|
}
|
|
|
|
context /.well-known/acme-challenge {
|
|
location /usr/local/lsws/Example/html/.well-known/acme-challenge
|
|
allowBrowse 1
|
|
|
|
rewrite {
|
|
enable 0
|
|
}
|
|
addDefaultCharset off
|
|
|
|
phpIniOverride {
|
|
|
|
}
|
|
}
|
|
|
|
"""
|
|
|
|
olsChildMainConf = """virtualHost {virtualHostName} {
|
|
vhRoot /home/{masterDomain}
|
|
configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhost.conf
|
|
allowSymbolLink 1
|
|
enableScript 1
|
|
restrained 1
|
|
}
|
|
"""
|
|
|
|
olsChildConf = """docRoot {path}
|
|
vhDomain $VH_NAME
|
|
vhAliases www.$VH_NAME
|
|
adminEmails {adminEmails}
|
|
enableGzip 1
|
|
enableIpGeo 1
|
|
|
|
index {
|
|
useServer 0
|
|
indexFiles index.php, index.html
|
|
}
|
|
|
|
errorlog $VH_ROOT/logs/{virtualHostName}.error_log {
|
|
useServer 0
|
|
logLevel WARN
|
|
rollingSize 10M
|
|
}
|
|
|
|
accesslog $VH_ROOT/logs/{virtualHostName}.access_log {
|
|
useServer 0
|
|
logFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
|
logHeaders 5
|
|
rollingSize 10M
|
|
keepDays 10
|
|
compressArchive 1
|
|
}
|
|
|
|
phpIniOverride {
|
|
{open_basedir}
|
|
}
|
|
|
|
module cache {
|
|
storagePath /usr/local/lsws/cachedata/$VH_NAME
|
|
}
|
|
|
|
scripthandler {
|
|
add lsapi:{externalApp} php
|
|
}
|
|
|
|
extprocessor {externalApp} {
|
|
type lsapi
|
|
address UDS://tmp/lshttpd/{externalApp}.sock
|
|
maxConns 10
|
|
env LSAPI_CHILDREN=10
|
|
initTimeout 60
|
|
retryTimeout 0
|
|
persistConn 1
|
|
pcKeepAliveTimeout 1
|
|
respBuffer 0
|
|
autoStart 1
|
|
path /usr/local/lsws/lsphp{php}/bin/lsphp
|
|
extUser {externalAppMaster}
|
|
extGroup {externalAppMaster}
|
|
memSoftLimit 2047M
|
|
memHardLimit 2047M
|
|
procSoftLimit 400
|
|
procHardLimit 500
|
|
}
|
|
|
|
rewrite {
|
|
enable 1
|
|
autoLoadHtaccess 1
|
|
}
|
|
|
|
context /.well-known/acme-challenge {
|
|
location /usr/local/lsws/Example/html/.well-known/acme-challenge
|
|
allowBrowse 1
|
|
|
|
rewrite {
|
|
enable 0
|
|
}
|
|
addDefaultCharset off
|
|
|
|
phpIniOverride {
|
|
|
|
}
|
|
}
|
|
|
|
"""
|
|
|
|
lswsMasterConf = """<VirtualHost *:80>
|
|
|
|
ServerName {virtualHostName}
|
|
ServerAlias www.{virtualHostName}
|
|
ServerAdmin {administratorEmail}
|
|
SuexecUserGroup {externalApp} {externalApp}
|
|
DocumentRoot /home/{virtualHostName}/public_html
|
|
Alias /.well-known/acme-challenge /usr/local/lsws/Example/html/.well-known/acme-challenge
|
|
CustomLog /home/{virtualHostName}/logs/{virtualHostName}.access_log combined
|
|
AddHandler application/x-httpd-php{php} .php .php7 .phtml
|
|
<IfModule LiteSpeed>
|
|
CacheRoot lscache
|
|
CacheLookup on
|
|
</IfModule>
|
|
|
|
</VirtualHost>
|
|
"""
|
|
|
|
lswsChildConf = """<VirtualHost *:80>
|
|
|
|
ServerName {virtualHostName}
|
|
ServerAlias www.{virtualHostName}
|
|
ServerAdmin {administratorEmail}
|
|
SuexecUserGroup {externalApp} {externalApp}
|
|
DocumentRoot {path}
|
|
Alias /.well-known/acme-challenge /usr/local/lsws/Example/html/.well-known/acme-challenge
|
|
CustomLog /home/{masterDomain}/logs/{virtualHostName}.access_log combined
|
|
AddHandler application/x-httpd-php{php} .php .php7 .phtml
|
|
<IfModule LiteSpeed>
|
|
CacheRoot lscache
|
|
CacheLookup on
|
|
</IfModule>
|
|
|
|
</VirtualHost>"""
|
|
|
|
apacheConf = """<VirtualHost *:8083>
|
|
|
|
ServerName {virtualHostName}
|
|
ServerAlias www.{virtualHostName}
|
|
ServerAdmin {administratorEmail}
|
|
SuexecUserGroup {externalApp} {externalApp}
|
|
DocumentRoot /home/{virtualHostName}/public_html/
|
|
Alias /.well-known/acme-challenge /home/{virtualHostName}/public_html/.well-known/acme-challenge
|
|
<Proxy "unix:{sockPath}{virtualHostName}.sock|fcgi://php-fpm-{externalApp}">
|
|
ProxySet disablereuse=off
|
|
</proxy>
|
|
<FilesMatch \.php$>
|
|
SetHandler proxy:fcgi://php-fpm-{externalApp}
|
|
</FilesMatch>
|
|
#CustomLog /home/{virtualHostName}/logs/{virtualHostName}.access_log combined
|
|
#AddHandler application/x-httpd-php{php} .php .php7 .phtml
|
|
|
|
<Directory /home/{virtualHostName}/public_html/>
|
|
Options Indexes FollowSymLinks
|
|
AllowOverride all
|
|
Require all granted
|
|
DirectoryIndex index.html index.php
|
|
</Directory>
|
|
|
|
</VirtualHost>
|
|
"""
|
|
apacheConfSSL = """<VirtualHost *:8082>
|
|
|
|
ServerName {virtualHostName}
|
|
ServerAlias www.{virtualHostName}
|
|
ServerAdmin {administratorEmail}
|
|
SuexecUserGroup {externalApp} {externalApp}
|
|
DocumentRoot /home/{virtualHostName}/public_html/
|
|
<Proxy "unix:{sockPath}{virtualHostName}.sock|fcgi://php-fpm-{externalApp}">
|
|
ProxySet disablereuse=off
|
|
</proxy>
|
|
<FilesMatch \.php$>
|
|
SetHandler proxy:fcgi://php-fpm-{externalApp}
|
|
</FilesMatch>
|
|
#CustomLog /home/{virtualHostName}/logs/{virtualHostName}.access_log combined
|
|
#AddHandler application/x-httpd-php{php} .php .php7 .phtml
|
|
|
|
<Directory /home/{virtualHostName}/public_html/>
|
|
Options Indexes FollowSymLinks
|
|
AllowOverride all
|
|
Require all granted
|
|
DirectoryIndex index.html index.php
|
|
</Directory>
|
|
|
|
SSLEngine on
|
|
SSLVerifyClient none
|
|
SSLCertificateFile {SSLBase}.fullchain.pem
|
|
SSLCertificateKeyFile {SSLBase}.privkey.pem
|
|
|
|
</VirtualHost>
|
|
"""
|
|
apacheConfChild = """<VirtualHost *:8083>
|
|
|
|
ServerName {virtualHostName}
|
|
ServerAlias www.{virtualHostName}
|
|
ServerAdmin {administratorEmail}
|
|
SuexecUserGroup {externalApp} {externalApp}
|
|
DocumentRoot {path}
|
|
<Proxy "unix:{sockPath}{virtualHostName}.sock|fcgi://php-fpm-{externalApp}">
|
|
ProxySet disablereuse=off
|
|
</proxy>
|
|
<FilesMatch \.php$>
|
|
SetHandler proxy:fcgi://php-fpm-{externalApp}
|
|
</FilesMatch>
|
|
#CustomLog /home/{virtualHostName}/logs/{virtualHostName}.access_log combined
|
|
#AddHandler application/x-httpd-php{php} .php .php7 .phtml
|
|
|
|
<Directory {path}>
|
|
Options Indexes FollowSymLinks
|
|
AllowOverride all
|
|
Require all granted
|
|
DirectoryIndex index.html index.php
|
|
</Directory>
|
|
|
|
</VirtualHost>
|
|
"""
|
|
apacheConfChildSSL = """<VirtualHost *:8082>
|
|
|
|
ServerName {virtualHostName}
|
|
ServerAlias www.{virtualHostName}
|
|
ServerAdmin {administratorEmail}
|
|
SuexecUserGroup {externalApp} {externalApp}
|
|
DocumentRoot {path}
|
|
<Proxy "unix:{sockPath}{virtualHostName}.sock|fcgi://php-fpm-{externalApp}">
|
|
ProxySet disablereuse=off
|
|
</proxy>
|
|
<FilesMatch \.php$>
|
|
SetHandler proxy:fcgi://php-fpm-{externalApp}
|
|
</FilesMatch>
|
|
#CustomLog /home/{virtualHostName}/logs/{virtualHostName}.access_log combined
|
|
#AddHandler application/x-httpd-php{php} .php .php7 .phtml
|
|
|
|
<Directory {path}>
|
|
Options Indexes FollowSymLinks
|
|
AllowOverride all
|
|
Require all granted
|
|
DirectoryIndex index.html index.php
|
|
</Directory>
|
|
SSLEngine on
|
|
SSLVerifyClient none
|
|
SSLCertificateFile {SSLBase}.fullchain.pem
|
|
SSLCertificateKeyFile {SSLBase}.privkey.pem
|
|
|
|
</VirtualHost>
|
|
"""
|
|
proxyApacheBackend = """extprocessor apachebackend {
|
|
type proxy
|
|
address http://127.0.0.1:8083
|
|
maxConns 100
|
|
pcKeepAliveTimeout 60
|
|
initTimeout 60
|
|
retryTimeout 0
|
|
respBuffer 0
|
|
}
|
|
"""
|
|
proxyApacheBackendSSL = """extprocessor proxyApacheBackendSSL {
|
|
type proxy
|
|
address https://127.0.0.1:8082
|
|
maxConns 100
|
|
pcKeepAliveTimeout 60
|
|
initTimeout 60
|
|
retryTimeout 0
|
|
respBuffer 0
|
|
}
|
|
"""
|
|
OLSLBConf = """docRoot $VH_ROOT/public_html
|
|
vhDomain $VH_NAME
|
|
vhAliases www.$VH_NAME
|
|
adminEmails {adminEmails}
|
|
enableGzip 1
|
|
enableIpGeo 1
|
|
|
|
index {
|
|
useServer 0
|
|
indexFiles index.php, index.html
|
|
}
|
|
|
|
errorlog $VH_ROOT/logs/$VH_NAME.error_log {
|
|
useServer 0
|
|
logLevel WARN
|
|
rollingSize 10M
|
|
}
|
|
|
|
accesslog $VH_ROOT/logs/$VH_NAME.access_log {
|
|
useServer 0
|
|
logFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\""
|
|
logHeaders 5
|
|
rollingSize 10M
|
|
keepDays 10
|
|
compressArchive 1
|
|
}
|
|
|
|
context /.well-known/acme-challenge {
|
|
location $VH_ROOT/public_html/.well-known/acme-challenge
|
|
allowBrowse 1
|
|
|
|
rewrite {
|
|
enable 0
|
|
}
|
|
addDefaultCharset off
|
|
|
|
phpIniOverride {
|
|
|
|
}
|
|
}
|
|
|
|
rewrite {
|
|
enable 1
|
|
rules <<<END_rules
|
|
RewriteEngine On
|
|
RewriteCond %{HTTPS} !=on
|
|
REWRITERULE ^(.*)$ HTTP://apachebackend/$1 [P,L]
|
|
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
|
|
listen.owner = nobody
|
|
listen.group = {group}
|
|
listen.mode = 0660
|
|
user = {externalApp}
|
|
group = {externalApp}
|
|
pm = dynamic
|
|
pm.max_children = 50
|
|
pm.start_servers = 1
|
|
pm.min_spare_servers = 1
|
|
pm.max_spare_servers = 1
|
|
"""
|
|
phpFpmPoolReplace = """[{www}]
|
|
listen = {sockPath}{Sock}.sock
|
|
listen.owner = nobody
|
|
listen.group = {group}
|
|
listen.mode = 0660
|
|
user = {externalApp}
|
|
group = {externalApp}
|
|
pm = dynamic
|
|
pm.max_children = {pmMaxChildren}
|
|
pm.start_servers = {pmStartServers}
|
|
pm.min_spare_servers = {pmMinSpareServers}
|
|
pm.max_spare_servers = {pmMaxSpareServers}
|
|
"""
|
|
lswsRediConfMaster = """"vhost:{virtualHostName}" '{
|
|
"username": "{externalApp}",
|
|
"documentRoot": "/home/{virtualHostName}/public_html",
|
|
"vh_root": "/home/{virtualHostName}",
|
|
"uid": {uid},
|
|
"gid": {gid},
|
|
"phpVersion": {php},
|
|
"custom_conf": {
|
|
ServerAdmin {administratorEmail}
|
|
CustomLog /home/{virtualHostName}/logs/{virtualHostName}.access_log combined
|
|
<IfModule LiteSpeed>
|
|
CacheRoot lscache
|
|
</IfModule>
|
|
}
|
|
}'"""
|
|
lswsRediConfMasterWWW = """"vhost:{virtualHostName}" '{
|
|
"username": "{externalApp}",
|
|
"documentRoot": "/home/{master}/public_html",
|
|
"vh_root": "/home/{master}",
|
|
"uid": {uid},
|
|
"gid": {gid},
|
|
"phpVersion": {php},
|
|
"custom_conf": {
|
|
ServerAdmin {administratorEmail}
|
|
CustomLog /home/{master}/logs/{master}.access_log combined
|
|
<IfModule LiteSpeed>
|
|
CacheRoot lscache
|
|
</IfModule>
|
|
}
|
|
}'"""
|
|
lswsRediConfChild = """"vhost:{virtualHostName}" '{
|
|
"username": "{externalApp}",
|
|
"documentRoot": "{path}",
|
|
"vh_root": "{path}",
|
|
"uid": {uid},
|
|
"gid": {gid},
|
|
"phpVersion": {php},
|
|
"custom_conf": {
|
|
ServerAdmin {administratorEmail}
|
|
CustomLog /home/{masterDomain}/logs/{virtualHostName}.access_log combined
|
|
<IfModule LiteSpeed>
|
|
CacheRoot /home/{masterDomain}/lscache
|
|
</IfModule>
|
|
}
|
|
}'"""
|
|
lswsRediConfChildWWW = """"vhost:{virtualHostName}" '{
|
|
"username": "{externalApp}",
|
|
"documentRoot": "{path}",
|
|
"vh_root": "{path}",
|
|
"uid": {uid},
|
|
"gid": {gid},
|
|
"phpVersion": {php},
|
|
"custom_conf": {
|
|
ServerAdmin {administratorEmail}
|
|
CustomLog /home/{masterDomain}/logs/{virtualHostName}.access_log combined
|
|
<IfModule LiteSpeed>
|
|
CacheRoot /home/{masterDomain}/lscache
|
|
</IfModule>
|
|
}
|
|
}'"""
|
|
|
|
OLSPPConf = """
|
|
### PASSWORD PROTECTION CONF STARTS {{path}}
|
|
|
|
realm {{RealM_Name}} {
|
|
|
|
userDB {
|
|
location {{PassFile}}
|
|
}
|
|
}
|
|
|
|
context / {
|
|
location {{path}}
|
|
allowBrowse 1
|
|
realm {{RealM_Name}}
|
|
|
|
rewrite {
|
|
|
|
}
|
|
addDefaultCharset off
|
|
|
|
phpIniOverride {
|
|
|
|
}
|
|
}
|
|
### PASSWORD PROTECTION CONF ENDS {{path}}
|
|
"""
|
|
LSWSPPProtection = """
|
|
### PASSWORD PROTECTION CONF STARTS {{path}}
|
|
AuthType Basic
|
|
AuthName "{{RealM_Name}}"
|
|
AuthUserFile {{PassFile}}
|
|
Require valid-user
|
|
### PASSWORD PROTECTION CONF ENDS {{path}}
|
|
"""
|