bayrepo/hestiacp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added fixes for rpm based system usage

Browse Source
This commit is contained in:
Alexey Berezhok
2024-04-14 22:48:16 +03:00
parent 68a01be7c3
commit 8bcf0d1d01
46 changed files with 351 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/rpm/httpd/hestia.conf
View File

@@ -55,4 +55,4 @@ EnableSendfile on
LogFormat "%a %l %u %t \"%r\" %>s %b" common
</IfModule>
IncludeOptional conf.d/*.conf
IncludeOptional conf.h.d/*.conf

6
install/rpm/httpd/httpd.conf
View File

@@ -67,9 +67,9 @@ LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent
LogFormat "%b" bytes
Include conf.d/*.conf
IncludeOptional conf.d/domains/webmail.*.conf
IncludeOptional conf.d/domains/*.conf
Include conf.h.d/*.conf
IncludeOptional conf.h.d/domains/webmail.*.conf
IncludeOptional conf.h.d/domains/*.conf
ErrorDocument 403 /error/403.html
ErrorDocument 404 /error/404.html

2
install/rpm/templates/web/httpd/default.stpl
View File

@@ -45,5 +45,5 @@
</IfModule>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/default.tpl
View File

@@ -42,5 +42,5 @@
</IfModule>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/hosting.stpl
View File

@@ -51,5 +51,5 @@
</IfModule>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc*
IncludeOptional /etc/httpd/conf.h.d/*.inc*
</VirtualHost>

2
install/rpm/templates/web/httpd/hosting.tpl
View File

@@ -48,5 +48,5 @@
</IfModule>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/php-fpm/default.stpl
View File

@@ -37,5 +37,5 @@
SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/php-fpm/default.tpl
View File

@@ -34,5 +34,5 @@
SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/phpcgi.stpl
View File

@@ -40,5 +40,5 @@
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/phpcgi.tpl
View File

@@ -36,5 +36,5 @@
AllowOverride All
</Directory>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/phpfcgid.stpl
View File

@@ -41,5 +41,5 @@
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/phpfcgid.tpl
View File

@@ -36,5 +36,5 @@
AllowOverride All
</Directory>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/www-data.stpl
View File

@@ -37,5 +37,5 @@
%ssl_ca_str%SSLCertificateChainFile %ssl_ca%
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>

2
install/rpm/templates/web/httpd/www-data.tpl
View File

@@ -34,5 +34,5 @@
</Directory>
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
IncludeOptional /etc/httpd/conf.d/*.inc
IncludeOptional /etc/httpd/conf.h.d/*.inc
</VirtualHost>