From 3263dbecab10f5091ddee1c6e799ee9302596b22 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Sun, 3 May 2026 23:58:54 +0300 Subject: [PATCH] Fixes 7 --- bin/v-add-web-domain-alias | 1 + bin/v-change-web-domain-sslcert | 19 +++++++++++++++++++ bin/v-delete-web-domain-alias | 1 + func_ruby/ext-modules/bunkerweb_module.mod | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/bin/v-add-web-domain-alias b/bin/v-add-web-domain-alias index 7e11884..8423f26 100755 --- a/bin/v-add-web-domain-alias +++ b/bin/v-add-web-domain-alias @@ -111,6 +111,7 @@ check_result $? "Proxy restart failed" > /dev/null # Execute bunkerweb_module if it's enabled module_state=$($BIN/v-ext-modules state bunkerweb_module json | jq -r '.[0].STATE') if [ "$module_state" = "enabled" ]; then + get_domain_values 'web' $BIN/v-ext-modules-run bunkerweb_module alias "$domain" "$ALIAS" fi diff --git a/bin/v-change-web-domain-sslcert b/bin/v-change-web-domain-sslcert index 09a597e..a8dd283 100755 --- a/bin/v-change-web-domain-sslcert +++ b/bin/v-change-web-domain-sslcert @@ -88,6 +88,25 @@ check_result $? "Web restart failed" > /dev/null $BIN/v-restart-proxy "$restart" check_result $? "Proxy restart failed" > /dev/null +# Execute bunkerweb_module if it's enabled +module_state=$($BIN/v-ext-modules state bunkerweb_module json | jq -r '.[0].STATE') +if [ "$module_state" = "enabled" ] && [ "$BUNKERWEB" = "yes" ]; then + BUNKW_DIR=$HOMEDIR/$user/conf/web/$domain/ssl/bunkerweb + if [ ! -d "$BUNKW_DIR" ]; then + mkdir -p "$BUNKW_DIR" + chmod 0755 "$BUNKW_DIR" + fi + cp -f "$HOMEDIR/$user/conf/web/$domain/ssl/$domain.crt" "$BUNKW_DIR/" + cp -f "$HOMEDIR/$user/conf/web/$domain/ssl/$domain.key" "$BUNKW_DIR/" + cp -f "$HOMEDIR/$user/conf/web/$domain/ssl/$domain.pem" "$BUNKW_DIR/" + if [ -e "$HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca" ]; then + cp -f "$HOMEDIR/$user/conf/web/$domain/ssl/$domain.ca" "$BUNKW_DIR/" + fi + chown root:nginx "$BUNKW_DIR"/* + chmod 0640 "$BUNKW_DIR"/* + $BIN/v-ext-modules-run bunkerweb_module addssl "$domain" "$BUNKW_DIR/$domain.pem" "$BUNKW_DIR/$domain.key" +fi + # Logging $BIN/v-log-action "$user" "Info" "Web" "SSL certificate changed (Domain: $domain)." log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-delete-web-domain-alias b/bin/v-delete-web-domain-alias index 52b52c1..009155c 100755 --- a/bin/v-delete-web-domain-alias +++ b/bin/v-delete-web-domain-alias @@ -95,6 +95,7 @@ check_result $? "Proxy restart failed" > /dev/null # Execute bunkerweb_module if it's enabled module_state=$($BIN/v-ext-modules state bunkerweb_module json | jq -r '.[0].STATE') if [ "$module_state" = "enabled" ]; then + get_domain_values 'web' $BIN/v-ext-modules-run bunkerweb_module alias "$domain" "$ALIAS" fi diff --git a/func_ruby/ext-modules/bunkerweb_module.mod b/func_ruby/ext-modules/bunkerweb_module.mod index 7fc5f00..b21ded6 100644 --- a/func_ruby/ext-modules/bunkerweb_module.mod +++ b/func_ruby/ext-modules/bunkerweb_module.mod @@ -196,7 +196,7 @@ class BunkerwebWorker < Kernel::ModuleCoreWorker log_return("Domain should be specified. #{args}") else - log("add alias to domain to bunkerweb protection") + log("add alias #{m_alias} to domain #{m_domain} to bunkerweb protection") output = `/usr/local/hestia/bin/v-bunkerweb-module alias #{m_domain} "#{m_alias}" shell` exit_status = $?.exitstatus if exit_status != 0