jina verze

This commit is contained in:
2026-08-12 10:53:04 +02:00
parent f186ec26a8
commit 93d4f24f07
43 changed files with 1686 additions and 1959 deletions
+31 -28
View File
@@ -5,7 +5,7 @@ function siteConfigGet() {
local domain
domain=$(domainPrepare "$1")
domainCheck "$domain" || return 1
shift || true
shift
configGet "$appDataPath/config/$domain.config" "$@"
}
@@ -17,7 +17,7 @@ function siteConfigSet() {
local domain
domain=$(domainPrepare "$1")
domainCheck "$domain" || return 1
shift || true
shift
configSet "$appDataPath/config/$domain.config" "$@"
}
@@ -29,7 +29,7 @@ function siteConfigGetOrSet() {
local domain
domain=$(domainPrepare "$1")
domainCheck "$domain" || return 1
shift || true
shift
configGetOrSet "$appDataPath/config/$domain.config" "$@"
}
@@ -41,7 +41,7 @@ function siteConfigGetOrCreate() {
local domain
domain=$(domainPrepare "$1")
domainCheck "$domain" || return 1
shift || true
shift
configGetOrCreate "$appDataPath/config/$domain.config" "$@"
}
@@ -65,19 +65,19 @@ function siteAdd() {
return 1
fi
local targetPath="$olsVhostsPath/$domain"
local targetPath="$vhostsPath/$domain"
[[ ! -e "$targetPath" ]] || { appError "The directory or file exists: $targetPath"; return 1; }
# OpenLiteSpeed
local vhostList aliasList error
if ! run vhostList error openlitespeedConfigVhostList; then
if ! run vhostList error openlitespeedVhostList all; then
appError "Error retrieving vhost list: $error"
return 1
elif listContains "$domain" "$vhostList"; then
appError "Domain already exists in OpenLiteSpeed config: $domain"
return 1
fi
if ! run aliasList error openlitespeedConfigAliasList; then
if ! run aliasList error openlitespeedAliasList; then
appError "Error retrieving alias list: $error"
return 1
elif listContains "$domain" "$aliasList"; then
@@ -187,7 +187,7 @@ function siteAdd() {
return 1
fi
if ! runError error openlitespeedVhostSet "$domain"; then
if ! runError error openlitespeedConfigRebuild "$domain"; then
_siteAddRollback "Failed OLS config rebuild: $error"
return 1
fi
@@ -220,14 +220,14 @@ function siteAdd() {
return 1
fi
if ! runError error postfixDomainSet "$domain"; then
if ! runError error postfixDomainAdd "$domain"; then
_siteAddRollback "Failed add domain in Postfix: $error"
return 1
fi
# if ! runError error postfixPostmapRebuild; then
# _siteAddRollback "Failed postmap rebuild: $error"
# return 1
# fi
if ! runError error postfixPostmapRebuild; then
_siteAddRollback "Failed postmap rebuild: $error"
return 1
fi
printf '%s' "$domain"
}
@@ -259,20 +259,25 @@ function siteRemove() {
fi
runSilent postfixDomainRemove "$domain"
runSilent postfixPostmapRebuild
runSilent systemHostRemove "$domain"
runSilent openlitespeedVhostConfigDel "$domain"
runSilent openlitespeedConfigRebuild "$domain" delete
runSilent openlitespeedConfigEdit vhost_up "$domain"
rm -f -- "$appDataPath/config/$domain.config" &>/dev/null
[[ -n "$domain" && "$domain" != "/" ]] && rm -rf -- "$olsVhostsPath/$domain" &>/dev/null
rm -f "$openlitespeedVhostsPath/$domain.conf" &>/dev/null
rm -f "$openlitespeedVhostsPath/$domain.conf0" &>/dev/null
rm -f "$openlitespeedVhostsPath/$domain.conf.txt" &>/dev/null
rm -f "$appDataPath/config/$domain.config" &>/dev/null
[[ -n "$domain" && "$domain" != "/" ]] && rm -rf "$vhostsPath/$domain" &>/dev/null
local ug
ug=$(domainToUser "$domain")
if [[ -n "$ug" && "$ug" != "root" ]]; then
if id "$ug" >/dev/null 2>&1; then
userdel "$ug" &>/dev/null
runSilent userdel "$ug"
fi
if getent group "$ug" >/dev/null 2>&1; then
groupdel "$ug" &>/dev/null
runSilent groupdel "$ug"
fi
fi
@@ -297,7 +302,7 @@ function siteCopy() {
fi
local vhostList
if ! run vhostList error openlitespeedConfigVhostList; then
if ! run vhostList error openlitespeedVhostList all; then
appError "Error retrieving vhost list: $error"
return 1
elif ! listContains "$domain" "$vhostList"; then
@@ -309,7 +314,7 @@ function siteCopy() {
fi
local aliasList
if ! run aliasList error openlitespeedConfigAliasList; then
if ! run aliasList error openlitespeedAliasList; then
appError "Error retrieving alias list: $error"
return 1
elif listContains "$domainNew" "$aliasList"; then
@@ -330,7 +335,7 @@ function siteCopy() {
return 1
fi
if ! runError error siteAdd "$domainNew" "$olsVhostsPath/$domain/www" "$databaseFile"; then
if ! runError error siteAdd "$domainNew" "$vhostsPath/$domain/www" "$databaseFile"; then
appError "$domainNew: Create site: $error"
return 1
fi
@@ -365,13 +370,11 @@ function siteRename() {
fi
local aliasList
if run aliasList error openlitespeedConfigVhostAliasList "$domain" && [[ -n "$aliasList" ]]; then
if run aliasList error openlitespeedVhostAlias "$domain" && [[ -n "$aliasList" ]]; then
local -a aliases
mapfile -t aliases <<< "$aliasList"
# openlitespeedVhostAliasSet "$domain"
# openlitespeedVhostAliasSet "$domainNew" "${aliases[@]}"
openlitespeedVhostSet "$domain"
openlitespeedVhostSet "$domainNew" "${aliases[@]}"
openlitespeedAliasSet "$domain"
openlitespeedAliasSet "$domainNew" "${aliases[@]}"
fi
runSilent siteRemove "$domain" || true
@@ -387,7 +390,7 @@ function sitePasswordReset() {
domainCheck "$domain" || return 1
local error vhostList
run vhostList error openlitespeedConfigVhostList || { appError "Failed get list of vhosts: $error"; return 1; }
run vhostList error openlitespeedVhostList || { appError "Failed get list of virtual hosts: $error"; return 1; }
listContains "$domain" "$vhostList" || { appError "Domain is not exists in OpenLiteSpeed config"; return 1; }
local result=0
@@ -420,7 +423,7 @@ function siteAuthReset() {
domainCheck "$domain" || return 1
local error vhostList
run vhostList error openlitespeedConfigVhostList || { appError "Failed get list of vhosts: $error"; return 1; }
run vhostList error openlitespeedVhostList || { appError "Failed get list of virtual hosts: $error"; return 1; }
listContains "$domain" "$vhostList" || { appError "Domain is not exists in OpenLiteSpeed config"; return 1; }
local result=0