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

29
func/rebuild.sh
View File

@@ -221,13 +221,22 @@ rebuild_user_conf() {
# WEB domain rebuild
rebuild_web_domain_conf() {
# Ensure that global domain folders are available
if [ ! -d /etc/$WEB_SYSTEM/conf.d/domains ]; then
mkdir -p /etc/$WEB_SYSTEM/conf.d/domains
if [ "$WEB_SYSTEM" = "httpd" ]; then
confd="conf.h.d"
else
confd="conf.d"
fi
if [ ! -d /etc/$PROXY_SYSTEM/conf.d/domains ]; then
mkdir -p /etc/$PROXY_SYSTEM/conf.d/domains
if [ "$PROXY_SYSTEM" = "httpd" ]; then
pconfd="conf.h.d"
else
pconfd="conf.d"
fi
# Ensure that global domain folders are available
if [ ! -d /etc/$WEB_SYSTEM/$confd/domains ]; then
mkdir -p /etc/$WEB_SYSTEM/$confd/domains
fi
if [ ! -d /etc/$PROXY_SYSTEM/$pconfd/domains ]; then
mkdir -p /etc/$PROXY_SYSTEM/$pconfd/domains
fi
syshealth_repair_web_config
@@ -236,11 +245,11 @@ rebuild_web_domain_conf() {
prepare_web_domain_values
# Remove old web configuration files
if [ -f /etc/$WEB_SYSTEM/conf.d/$domain.conf ]; then
rm -f /etc/$WEB_SYSTEM/conf.d/$domain*.conf
if [ -f /etc/$WEB_SYSTEM/$confd/$domain.conf ]; then
rm -f /etc/$WEB_SYSTEM/$confd/$domain*.conf
fi
if [ -f /etc/$PROXY_SYSTEM/conf.d/$domain.conf ]; then
rm -f /etc/$PROXY_SYSTEM/conf.d/$domain*.conf
if [ -f /etc/$PROXY_SYSTEM/$pconfd/$domain.conf ]; then
rm -f /etc/$PROXY_SYSTEM/$pconfd/$domain*.conf
fi
# Temporary allow write permissions to owner