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

Added passeneg manager. Part 12

Browse Source
This commit is contained in:
Alexey Berezhok
2024-12-30 00:16:14 +03:00
parent 5443ea44dd
commit 6bd321a1da
11 changed files with 487 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
func/domain.sh
View File

@@ -193,6 +193,7 @@ prepare_web_domain_values() {
fi
group="$user"
docroot="$HOMEDIR/$user/web/$domain/public_html"
docrtpriv="$HOMEDIR/$user/web/$domain/private"
sdocroot="$docroot"
if [ "$SSL_HOME" = 'single' ]; then
sdocroot="$HOMEDIR/$user/web/$domain/public_shtml"
@@ -290,7 +291,8 @@ add_web_config() {
if [ -n "$res" ]; then
enabled=$(echo "$res" | grep enabled)
if [ -n "$enabled" ]; then
RUBY_RES=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_user_ruby "$domain" | tail -n1 | /usr/bin/xargs)
RUBY_RES=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_user_ruby "$domain" csv | tail -n1 | /usr/bin/xargs | cut -d"," -f1)
RUBY_RES_LOG=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_user_ruby "$domain" csv | tail -n1 | /usr/bin/xargs | cut -d"," -f2)
if [ -n "$RUBY_RES" ]; then
pass_tpl_dir=$(/usr/local/hestia/bin/v-ext-modules-run passenger_manager get_tpl_path | tail -n1 | /usr/bin/xargs)
if [ -n "$pass_tpl_dir" ]; then
@@ -355,6 +357,7 @@ add_web_config() {
-e "s|%ssl_pem%|$ssl_pem|g" \
-e "s|%ssl_ca_str%|$ssl_ca_str|g" \
-e "s|%ssl_ca%|$ssl_ca|g" \
-e "s|%docrtpriv%|$docrtpriv|g" \
> $conf
if [ "$TPLNM" == "srvproxy.tpl" -o "$TPLNM" == "srvproxy.stpl" ];then
@@ -368,6 +371,7 @@ add_web_config() {
if [[ "$TPLNM" =~ ^passenger ]] && [ -n "$PASS_TPL" ]; then
cat "$conf" \
| sed -e "s|%rubypath%|$RUBY_RES|g" \
-e "s|%rubylog%|$RUBY_RES_LOG|g" \
> $conf.tmp
mv -f ${conf}.tmp $conf
fi