Try to support bunkerweb

CHANGELOG.md

@@ -2,10 +2,23 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.9.6.rpm] - Release
+
+- Fix error on all web and mail domains after Apache 2.4.64 update
+- Fix error on local php installation and extension activation
+- Added templates for nginx mod_rewrite activation
+- Added nginx with mod_rewrite
+- Fixed database size usage and disk usage output on the info pages
+- Fixed installation of panel without PHP-FPM
+- Fixed mod_php, fcgid, fcgi mode
+
 ## [1.9.5.rpm] - Release
 
 - Added support installation of alternative php not only remi
 - Fixed separate edition of php.ini in multiphp mode
+- Added usemirrorclamav for install script for uieng Russian mirror for Clamav databases
+- Added devel mode of installation for installing not from github by default. With this parameter installation will be from devel repo dev.brepo.ru
+- Fixed memory calculation in service list
 
 ## [1.9.4.rpm] - Release
 

README.de.md

@@ -0,0 +1,97 @@
+<div align="center">
+
+# [Hestia Control Panel (RPM-Edition)](https://hestiadocs.brepo.ru)
+
+![HestiaCP Web-Oberfläche](./docs/public/images/demo.png)
+
+## Leistungsstarkes und schlankes Serververwaltungspanel für moderne Hosting-Umgebungen
+
+**Stabile Version:** 1.9.5 (RPM) |
+[RPM-Edition](https://hestiadocs.brepo.ru) |
+[Originalprojekt für Ubuntu/Debian](https://hestiacp.com) |
+[Änderungsprotokoll](/CHANGELOG.md) |
+[Support-Forum](https://forum.hestiacp.com)
+<br><br>
+[![Drone Build-Status](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![Lint-Status](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![Technischer Support](https://img.shields.io/badge/Gurubase-Fragen%20auf%20Englisch-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+Die Hestia Control Panel (RPM-Edition) wird von einem unabhängigen Team für RPM-basierte Betriebssysteme entwickelt. Durch Anpassungen nach dem Fork des Originalprojekts ist eine direkte Synchronisation mit der Ubuntu/Debian-Version nicht möglich. Bitte melden Sie Probleme direkt an dieses Projekt.
+
+## **Willkommen!**
+
+Hestia bietet Administratoren eine intuitive Weboberfläche und CLI zur zentralisierten Verwaltung von Webdomains, E-Mail-Konten, DNS-Zonen und Datenbanken – ohne manuelle Konfiguration einzelner Komponenten.
+
+## Funktionen & Dienste
+
+- Apache2 & NGINX mit PHP-FPM
+- Mehrere PHP-Versionen (7.4[EOL](https://www.php.net/supported-versions.php)–8.3, Standard 8.2 aus Remi-Repo + Custom Builds)
+- DNS-Server (Bind)
+- E-Mail-Services mit Viren-/Spam-Schutz (ClamAV, SpamAssassin, Roundcube)
+- MariaDB/MySQL & PostgreSQL Datenbanken
+- Let's Encrypt SSL-Unterstützung
+- Firewall mit Brute-Force-Schutz (iptables, fail2ban, ipset)
+
+## Unterstützte Betriebssysteme
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**Hinweise:**
+
+- Keine Unterstützung für 32-Bit-Systeme!
+- Bei OpenVZ 7 oder älter können DNS/Firewall-Probleme auftreten – wir empfehlen KVM/LXC-basierte Virtualisierung.
+
+## Installation
+
+**Wichtig:** Frische OS-Installation erforderlich!
+
+### Schritt 1: Anmeldung
+
+Als **root** per SSH anmelden:
+
+```bash
+ssh root@Ihr-Server
+```
+
+### Schritt 2: Installationsskript herunterladen
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### Schritt 3: Ausführung
+
+Skript mit Berechtigungen ausführen:
+
+```bash
+bash hst-install.sh
+```
+
+### Custom Installation
+
+Optionen anzeigen:
+
+```bash
+bash hst-install.sh -h
+```
+
+## Updates
+
+Automatische Updates sind standardmäßig aktiviert (**Server-Einstellungen > Updates**). Manuelles Update:
+
+```bash
+dnf update
+```
+
+## Support
+
+- Probleme mit RPM-Edition: [GitHub Issues](https://github.com/bayrepo/hestiacp-rpm/issues)
+- Originalversion: [Hauptrepository](https://github.com/hestiacp/hestiacp)
+
+## Lizenz
+
+Hestia Control Panel ist unter der [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE)-Lizenz lizenziert und basiert auf [VestaCP](https://vestacp.com/).

README.en.md

@@ -0,0 +1,109 @@
+<div align="center">
+
+# [Hestia Control Panel (RPM Edition)](https://hestiadocs.brepo.ru)
+
+![HestiaCP Web Interface screenshot](./docs/public/images/demo.png)
+
+## A lightweight and powerful server control panel for modern web hosting environments
+
+**Stable Version:** 1.9.5 (RPM) |
+[RPM Edition](https://hestiadocs.brepo.ru) |
+[Original Ubuntu/Debian Project](https://hestiacp.com) |
+[Changelog](/CHANGELOG.md) |
+[Support Forum](https://forum.hestiacp.com)
+<br><br>
+[![Drone Status](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![Lint Status](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![Gurubase](https://img.shields.io/badge/Gurubase-Ask%20Hestia%20Guru-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+Hestia Control Panel (RPM Edition) is maintained and developed by a separate team focused on RPM-based operating systems. Since forking from the original project, this edition has incorporated changes that prevent direct syncing with upstream updates from the Ubuntu/Debian version (not all features are relevant for RPM systems). Therefore, found issues should be reported specifically to this project.
+
+Below is the general panel description.
+
+## **Welcome!**
+
+Hestia Control Panel aims to provide administrators with an easy-to-use web interface and CLI for quickly deploying and managing web domains, email accounts, DNS zones, and databases through a centralized panel - eliminating the need for manual configuration of individual components.
+
+## Features & Services
+
+- Apache2 & NGINX with PHP-FPM
+- Multiple PHP versions (7.4[EOL](https://www.php.net/supported-versions.php) - 8.3, 8.2 default via Remi repo + custom PHP builds)
+- DNS Server (Bind)
+- Email services with antivirus/spam protection & webmail (POP/IMAP/SMTP, ClamAV, SpamAssassin, Sieve, Roundcube)
+- MariaDB/MySQL & PostgreSQL databases
+- Let's Encrypt SSL support
+- Firewall with brute-force protection & IP management (iptables, fail2ban, ipset).
+
+## Supported OS
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**NOTES:**
+
+- HestiaCP does not support 32-bit OS!
+- HestiaCP combined with OpenVZ 7 or earlier may have DNS/firewall issues. For VPS, we strongly recommend KVM/LXC-based virtualization.
+
+## Installing Hestia Control Panel
+
+- **NOTE:** HestiaCP must be installed on a fresh OS for proper functionality.
+
+While we strive to make installation and usage intuitive, basic Linux server setup knowledge is assumed.
+
+### Step 1: Log in
+
+Login as **root** or a superuser via SSH:
+
+```bash
+ssh root@your.server
+```
+
+### Step 2: Download
+
+Get the latest installer script:
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### Step 3: Execute
+
+Run the script and follow on-screen instructions:
+
+```bash
+bash hst-install.sh
+```
+
+Upon completion, you'll receive a welcome email (if configured) and login details.
+
+### Custom Installation
+
+Use flags to select specific components. View options with:
+
+```bash
+bash hst-install.sh -h
+```
+
+## Updating Existing Installations
+
+Automatic updates are enabled by default (managed via **Server Settings > Updates**). Manual updates:
+
+```bash
+dnf update
+```
+
+## Issues & Support
+
+- For RPM edition issues: [Create GitHub Issue](https://github.com/bayrepo/hestiacp-rpm/issues)
+- Original Debian/Ubuntu version: [Original Repository](https://github.com/hestiacp/hestiacp)
+
+## Copyright
+
+Original copyrights belong to [HestiaCP](https://github.com/hestiacp/hestiacp)
+
+## License
+
+Hestia Control Panel is licensed under [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) and based on [VestaCP](https://vestacp.com/).

README.es.md

@@ -0,0 +1,99 @@
+<div align="center">
+
+# [Panel de Control Hestia (Edición RPM)](https://hestiadocs.brepo.ru)
+
+![Captura de la interfaz web de HestiaCP](./docs/public/images/demo.png)
+
+## Panel de servidor ligero y potente para entornos modernos de alojamiento web
+
+**Versión estable:** 1.9.5 (RPM) |
+[Edición RPM](https://hestiadocs.brepo.ru) |
+[Proyecto original para Ubuntu/Debian](https://hestiacp.com) |
+[Registro de cambios](/CHANGELOG.md) |
+[Foro de soporte](https://forum.hestiacp.com)
+<br><br>
+[![Estado de compilación Drone](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![Estado de verificación](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![Soporte técnico](https://img.shields.io/badge/Gurubase-Preguntas_en_inglés-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+El Panel de Control Hestia (Edición RPM) es mantenido por un equipo independiente especializado en sistemas basados en RPM. Debido a cambios implementados tras la bifurcación del proyecto original, esta versión no puede sincronizarse directamente con las actualizaciones de Ubuntu/Debian. Reporte los problemas directamente a este proyecto.
+
+## **¡Bienvenido!**
+
+Hestia ofrece una interfaz web intuitiva y CLI para implementar y gestionar dominios web, cuentas de correo, zonas DNS y bases de datos de forma centralizada, sin configuración manual de componentes individuales.
+
+## Características y servicios
+
+- Apache2 & NGINX con PHP-FPM
+- Múltiples versiones de PHP (7.4[EOL](https://www.php.net/supported-versions.php) - 8.3, predeterminado 8.2 desde repositorio Remi + compilaciones personalizadas)
+- Servidor DNS (Bind)
+- Servicios de correo con protección antivirus/anti-spam (ClamAV, SpamAssassin, Roundcube)
+- Bases de datos MariaDB/MySQL & PostgreSQL
+- Soporte Let's Encrypt SSL
+- Cortafuegos con protección contra fuerza bruta (iptables, fail2ban, ipset)
+
+## Sistemas compatibles
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**Notas importantes:**
+
+- ¡No compatible con sistemas de 32 bits!
+- Pueden ocurrir problemas de DNS/cortafuegos en OpenVZ 7 o anteriores. Recomendamos virtualización basada en KVM/LXC.
+
+## Instalación
+
+**Requisito:** ¡Sistema operativo recién instalado!
+
+### Paso 1: Iniciar sesión
+
+Conéctese como **root** vía SSH:
+
+```bash
+ssh root@su-servidor
+```
+
+### Paso 2: Descargar script
+
+Obtenga el instalador más reciente:
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### Paso 3: Ejecutar
+
+Ejecute el script con permisos:
+
+```bash
+bash hst-install.sh
+```
+
+### Instalación personalizada
+
+Ver opciones disponibles:
+
+```bash
+bash hst-install.sh -h
+```
+
+## Actualizaciones
+
+Las actualizaciones automáticas están activadas por defecto (**Configuración del servidor > Actualizaciones**). Actualización manual:
+
+```bash
+dnf update
+```
+
+## Soporte técnico
+
+- Problemas con la edición RPM: [Reportar en GitHub](https://github.com/bayrepo/hestiacp-rpm/issues)
+- Versión original: [Repositorio principal](https://github.com/hestiacp/hestiacp)
+
+## Licencia
+
+Hestia Control Panel se distribuye bajo licencia [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) y está basado en [VestaCP](https://vestacp.com/).

README.hi.md

@@ -0,0 +1,109 @@
+<div align="center">
+
+# [हेस्टिया कंट्रोल पैनल (RPM संस्करण)](https://hestiadocs.brepo.ru)
+
+![HestiaCP वेब इंटरफेस स्क्रीनशॉट](./docs/public/images/demo.png)
+
+## आधुनिक वेब होस्टिंग वातावरण के लिए हल्का और शक्तिशाली सर्वर नियंत्रण पैनल
+
+**स्थिर संस्करण:** 1.9.5 (RPM) |
+[RPM संस्करण](https://hestiadocs.brepo.ru) |
+[मूल Ubuntu/Debian प्रोजेक्ट](https://hestiacp.com) |
+[परिवर्तन सूची](/CHANGELOG.md) |
+[सहायता फोरम](https://forum.hestiacp.com)
+<br><br>
+[![Drone बिल्ड स्थिति](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![कोड लिंट स्थिति](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![तकनीकी प्रश्नोत्तर](https://img.shields.io/badge/Gurubase-हेस्टिया_फोरम_में_अंग्रेजी_में_पूछें-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+हेस्टिया कंट्रोल पैनल (RPM संस्करण) RHEL-आधारित वितरणों पर केंद्रित एक स्वतंत्र टीम द्वारा विकसित और बनाए रखा जाता है। मूल प्रोजेक्ट से फोर्क होने के बाद, यह संस्करण अपस्ट्रीम Ubuntu/Debian संस्करण के साथ सीधे सिंक नहीं होता (कुछ सुविधाएँ RPM सिस्टम के लिए लागू नहीं हैं)। कृपया इस संस्करण से संबंधित समस्याओं को सीधे इस प्रोजेक्ट में रिपोर्ट करें।
+
+निम्नलिखित पैनल का सामान्य विवरण है।
+
+## **आपका स्वागत है!**
+
+हेस्टिया कंट्रोल पैनल का उद्देश्य व्यवस्थापकों को वेबसाइट, ईमेल खाते, DNS ज़ोन और डेटाबेस को तेज़ी से तैनात करने और प्रबंधित करने के लिए एक केंद्रीकृत वेब इंटरफेस और कमांड-लाइन टूल्स प्रदान करना है - बिना अलग-अलग घटकों को मैन्युअल रूप से कॉन्फ़िगर किए।
+
+## सुविधाएँ और सेवाएँ
+
+- Apache2 और NGINX PHP-FPM के साथ
+- बहु-PHP संस्करण समर्थन (7.4[EOL](https://www.php.net/supported-versions.php) - 8.3, डिफ़ॉल्ट 8.2 Remi रिपॉजिटरी से + कस्टम PHP बिल्ड)
+- DNS सर्वर (Bind)
+- वायरस/स्पैम सुरक्षा के साथ ईमेल सेवाएँ और वेबमेल (POP/IMAP/SMTP, ClamAV, SpamAssassin, Sieve, Roundcube)
+- MariaDB/MySQL और PostgreSQL डेटाबेस
+- Let's Encrypt SSL समर्थन
+- ब्रूट-फोर्स सुरक्षा और IP प्रबंधन के साथ फ़ायरवॉल (iptables, fail2ban, ipset)
+
+## समर्थित सिस्टम
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**ध्यान दें:**
+
+- HestiaCP 32-बिट ऑपरेटिंग सिस्टम को समर्थन नहीं करता!
+- OpenVZ 7 या पुराने संस्करणों पर HestiaCP का उपयोग करते समय DNS/फ़ायरवॉल समस्याएँ हो सकती हैं। KVM/LXC आधारित वर्चुअलाइजेशन विकल्पों की सिफारिश की जाती है।
+
+## Hestia कंट्रोल पैनल इंस्टॉल करें
+
+- **नोट:** पूर्ण कार्यक्षमता सुनिश्चित करने के लिए कृपया एक ताज़ा सर्वर इंस्टॉलेशन पर इंस्टॉल करें।
+
+हालांकि हम इंस्टॉलेशन प्रक्रिया को सरल बनाने का प्रयास करते हैं, लेकिन उपयोगकर्ताओं को लिनक्स सर्वर प्रबंधन का बुनियादी ज्ञान होना आवश्यक है।
+
+### चरण 1: लॉगिन
+
+**root** या सुपरयूजर एक्सेस के साथ SSH के माध्यम से लॉगिन करें:
+
+```bash
+ssh root@your.server
+```
+
+### चरण 2: डाउनलोड करें
+
+नवीनतम इंस्टॉल स्क्रिप्ट प्राप्त करें:
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### चरण 3: निष्पादित करें
+
+स्क्रिप्ट चलाएँ और स्क्रीन निर्देशों का पालन करें:
+
+```bash
+bash hst-install.sh
+```
+
+इंस्टॉलेशन पूरा होने पर, आपको एक स्वागत ईमेल (यदि कॉन्फ़िगर किया गया हो) और लॉगिन विवरण प्राप्त होंगे।
+
+### कस्टम इंस्टॉलेशन
+
+घटकों को चुनने के लिए पैरामीटर का उपयोग करें, विकल्प देखें:
+
+```bash
+bash hst-install.sh -h
+```
+
+## मौजूदा इंस्टॉलेशन अपडेट करें
+
+स्वचालित अपडेट डिफ़ॉल्ट रूप से सक्षम हैं (**सर्वर सेटिंग्स > अपडेट** के माध्यम से प्रबंधित)। मैन्युअल अपडेट:
+
+```bash
+dnf update
+```
+
+## समस्याएँ और सहायता
+
+- RPM संस्करण से संबंधित मुद्दे: [GitHub इश्यू दर्ज करें](https://github.com/bayrepo/hestiacp-rpm/issues)
+- मूल Debian/Ubuntu संस्करण: [मूल प्रोजेक्ट रिपॉजिटरी](https://github.com/hestiacp/hestiacp)
+
+## कॉपीराइट
+
+मूल कॉपीराइट [HestiaCP](https://github.com/hestiacp/hestiacp) के पास है
+
+## लाइसेंस
+
+हेस्टिया कंट्रोल पैनल [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) लाइसेंस के तहत जारी किया गया है, और [VestaCP](https://vestacp.com/) पर आधारित है।

README.ja.md

@@ -0,0 +1,97 @@
+<div align="center">
+
+# [Hestia コントロールパネル (RPM版)](https://hestiadocs.brepo.ru)
+
+![HestiaCP Webインターフェーススクリーンショット](./docs/public/images/demo.png)
+
+## 現代的なWebホスティング環境向け軽量で強力なサーバー管理パネル
+
+**安定版:** 1.9.5 (RPM) |
+[RPM版](https://hestiadocs.brepo.ru) |
+[オリジナルUbuntu/Debian版](https://hestiacp.com) |
+[更新履歴](/CHANGELOG.md) |
+[サポートフォーラム](https://forum.hestiacp.com)
+<br><br>
+[![Droneビルドステータス](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![Lintステータス](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![技術Q&A](https://img.shields.io/badge/Gurubase-英語を使ってHestia開発者と議論する-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+Hestia コントロールパネル（RPM版）はRPMベースOS専用の開発チームによってメンテナンスされています。Ubuntu/Debian版との機能同期ができないため、問題報告は本プロジェクト宛てにお願いします。
+
+## **ようこそ！**
+
+Hestiaは直感的なWebインターフェースとCLIを提供し、ドメイン管理・メールアカウント・DNSゾーン・データベースの迅速なデプロイを可能にするサーバー管理パネルです。
+
+## 主な機能
+
+- Apache2 & NGINX + PHP-FPM連携
+- マルチPHPバージョン（7.4[EOL](https://www.php.net/supported-versions.php) - 8.3、Remiリポジトリ版+カスタムビルド）
+- Bind DNSサーバー
+- ウイルス/スパム対策付きメールサービス（ClamAV, SpamAssassin, Roundcube）
+- MariaDB/MySQL & PostgreSQLデータベース
+- Let's Encrypt SSL対応
+- ブルートフォース攻撃防御機能（iptables, fail2ban, ipset）
+
+## 対応OS
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**注意事項:**
+
+- 32ビットOS非対応
+- OpenVZ 7以前の環境ではDNS/ファイアウォール問題が発生する可能性あり
+
+## インストール手順
+
+### ステップ1: rootログイン
+
+SSHでrootユーザーとしてログイン:
+
+```bash
+ssh root@your.server
+```
+
+### ステップ2: インストーラ取得
+
+最新インストーラをダウンロード:
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### ステップ3: 実行
+
+スクリプトを実行し指示に従う:
+
+```bash
+bash hst-install.sh
+```
+
+### カスタムインストール
+
+オプション確認:
+
+```bash
+bash hst-install.sh -h
+```
+
+## アップデート
+
+自動更新はデフォルトで有効（**サーバー設定 > 更新**から管理）。手動更新:
+
+```bash
+dnf update
+```
+
+## サポート
+
+- RPM版問題報告: [GitHub Issues](https://github.com/bayrepo/hestiacp-rpm/issues)
+- オリジナル版: [公式リポジトリ](https://github.com/hestiacp/hestiacp)
+
+## ライセンス
+
+Hestiaコントロールパネルは[GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE)ライセンスで、[VestaCP](https://vestacp.com/)を基に開発されています。

README.md

@@ -1,102 +1,123 @@
-<h1 align="center">Hestia Control Panel (RPM Edition)</h1>
+<div align="center">
 
-<h2 align="center">Легкая и мощная панель управления для современного сервера. Организуй собственный сервер в два счета.</h2>
+# [Панель управления Hestia (RPM версия)](https://hestiadocs.brepo.ru)
 
-<p align="center"><strong>Ссылки на оригинальный проект для Ubuntu и Debian:</strong> | <a href="https://www.hestiacp.com/">HestiaCP.com</a> |
+![Скриншот веб-интерфейса HestiaCP](./docs/public/images/demo.png)
-</p>
 
-<p align="center">
+## Легкая и мощная серверная панель для современных веб-сред
-	<strong>Информация по RPM Edition сборке:</strong> |
-	<a href="https://hestiadocs.brepo.ru/">Documentation for version with RPM support</a>
-</p>
 
-Hestia Control Panel (RPM Edition) поддерживается и дорабатывается отдельной командой связанной с RPM Based операционными системаи, с момента форка от оригинального, данный проект включил изменения, которые не позволяют просто подтягивать доработки из оригинального проекта (и не все доработки Ubuntu и Debian нужны в RPM Based системах). Поэтому все изменения из оригинальной Hestia CP не подтягиваются автоматически, поэтому о найденных ошибках в текущей реализации необходимо репортить в текущий проект.
+**Стабильная версия:** 1.9.5 (RPM) |
+[RPM версия](https://hestiadocs.brepo.ru) |
+[Оригинальный проект для Ubuntu/Debian](https://hestiacp.com) |
+[История изменений](/CHANGELOG.md) |
+[Форум поддержки](https://forum.hestiacp.com)
+<br><br>
+[![Статус сборки Drone](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![Статус проверки кода](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![Техподдержка](https://img.shields.io/badge/Gurubase-Обсуждение_на_английском_в_форуме_Hestia-006BFF)](https://gurubase.io/g/hestia)
 
-Ниже общее описание панели.
+</div>
+
+## [English](README.en.md)
+
+## [Deutsch](README.de.md)
+
+## [Español](README.es.md)
+
+## [हिन्दी](README.hi.md)
+
+## [日本語](README.ja.md)
+
+## [简体中文](README.zh-Hans.md)
+
+## [繁體中文](README.zh-Hant.md)
+
+Панель управления Hestia (RPM версия) разрабатывается и поддерживается независимой командой, специализирующейся на RPM-ориентированных дистрибутивах. После ответвления от оригинального проекта данная версия включает изменения, которые не позволяют синхронизировать обновления с Ubuntu/Debian версией (некоторые функции не применимы к RPM-системам). Пожалуйста, сообщайте о проблемах непосредственно в этот проект.
+
+Ниже представлено общее описание панели.
 
 ## **Добро пожаловать!**
 
-Панель управления Hestia предназначена для предоставления администраторам простого в использовании веб-интерфейса и интерфейса командной строки, что позволяет им быстро развертывать веб-домены, почтовые аккаунты, зоны DNS и базы данных и управлять ими с единой центральной панели без необходимости вручную развертывать и настраивать отдельные компоненты или сервисы.
+Hestia Control Panel предоставляет администраторам простой веб-интерфейс и CLI-инструменты для быстрого развертывания доменов, почтовых аккаунтов, DNS-зон и баз данных через централизованную панель без ручной настройки отдельных компонентов.
 
-## Функции и сервисы
+## Функционал и сервисы
 
 - Apache2 и NGINX с PHP-FPM
-- Несколько версий PHP (7.4 — 8.2, 8.0 по умолчанию, как из Remi репозитория, так и дополнительная самостоятельная сборка PHP пакетов)
+- Поддержка нескольких версий PHP (7.4[EOL](https://www.php.net/supported-versions.php)-8.3, по умолчанию 8.2 из репозитория Remi + кастомные сборки)
 - DNS-сервер (Bind)
-- почтовые сервисы POP/IMAP/SMTP с защитой от вирусов, спама и веб-почтой (ClamAV, SpamAssassin, Sieve, Roundcube)
+- Почтовый сервис с антивирусом/антиспамом и веб-почтой (POP/IMAP/SMTP, ClamAV, SpamAssassin, Sieve, Roundcube)
-- базы данных MariaDB/MySQL и/или PostgreSQL
+- Базы данных MariaDB/MySQL и PostgreSQL
-- поддержка SSL Let's Encrypt
+- Поддержка SSL Let's Encrypt
-- брандмауэр с защитой от атак методом перебора и списками IP (iptables, fail2ban и ipset).
+- Фаервол с защитой от брутфорса и IP-менеджментом (iptables, fail2ban, ipset)
 
-## Поддерживаемые ОС
+## Поддерживаемые системы
 
 - **MSVSphere:** 9
 - **AlmaLinux:** 9
 - **RockyLinux:** 9
 
-**ПРИМЕЧАНИЯ:**
+**Важно:**
 
-- Панель управления Hestia не поддерживает 32-разрядные операционные системы!
+- HestiaCP не поддерживает 32-битные ОС!
-- Панель управления Hestia в сочетании с OpenVZ 7 или более ранними версиями может иметь проблемы с DNS и/или брандмауэром. Если вы используете виртуальный частный сервер, мы настоятельно рекомендуем использовать что-то на основе KVM или LXC!
+- На OpenVZ 7 и старых версиях возможны проблемы с DNS/фаерволом. Рекомендуем KVM/LXC-виртуализацию.
 
-## Установка панели управления Hestia
+## Установка Hestia
 
-- **ПРИМЕЧАНИЕ:** для обеспечения правильной работы необходимо установить панель управления Hestia поверх новой операционной системы.
+- **Примечание:** Для корректной работы устанавливайте на чистую ОС.
 
-Несмотря на то, что мы приложили все усилия, чтобы сделать процесс установки и интерфейс панели управления максимально удобными (даже для новых пользователей), предполагается, что вы уже обладаете некоторыми базовыми знаниями и пониманием того, как настроить сервер Linux, прежде чем продолжить.
+Требуются базовые знания администрирования Linux-серверов.
 
-### Шаг 1. Войдите в систему
+### Шаг 1: Авторизация
 
-Чтобы начать установку, вам нужно войти в систему как **root** или пользователь с правами суперпользователя. Вы можете выполнить установку непосредственно из командной строки или удалённо через SSH:
+Войдите как **root** через SSH:
 
 ```bash
-ssh root@your.server
+ssh root@ваш.сервер
 ```
 
-### Шаг 2. Загрузка
+### Шаг 2: Загрузка
 
-Загрузите установочный скрипт для последней версии:
+Получите установочный скрипт:
 
 ```bash
 wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
 ```
 
-### Шаг 3: Запустите
+### Шаг 3: Запуск
 
-Чтобы начать процесс установки, просто запустите скрипт и следуйте инструкциям на экране:
+Выполните скрипт и следуйте инструкциям:
 
 ```bash
 bash hst-install.sh
 ```
 
-После завершения установки вы получите приветственное электронное письмо на адрес, указанный во время установки (если применимо), и инструкции на экране для входа в систему и доступа к вашему серверу.
+После установки вы получите приветственное письмо и данные для входа.
 
-### Пользовательская установка
+### Кастомная установка
 
-Во время установки вы можете указать несколько различных флагов, чтобы установить только те функции, которые вам нужны. Чтобы просмотреть список доступных опций, выполните:
+Используйте параметры для выбора компонентов:
 
 ```bash
 bash hst-install.sh -h
 ```
 
-## Как обновить существующую установку
+## Обновление системы
 
-Автоматические обновления включены по умолчанию в новых установках Hestia Control Panel, и ими можно управлять из **Server Settings > Updates**. Чтобы вручную проверить наличие доступных обновлений и установить их, воспользуйтесь системным менеджером пакетов:
+Автообновления включены по умолчанию (управление: **Настройки сервера > Обновления**). Ручное обновление:
 
 ```bash
 dnf update
 ```
 
-## Проблемы и запросы в службу поддержки
+## Поддержка и отчеты
 
-- Если вы столкнулись с общей проблемой при использовании Hestia Control Panel для системы на основе RPM, воспользуйтесь [отчётом о проблеме](https://github.com/bayrepo/hestiacp-rpm/issues)
+- Проблемы с RPM-версией: [GitHub Issues](https://github.com/bayrepo/hestiacp-rpm/issues)
-
+- Оригинальная версия: [Репозиторий проекта](https://github.com/hestiacp/hestiacp)
- Для оригинальной HestiaCP для Debian и Ubuntu используйте [оригинальную версию](https://github.com/hestiacp/hestiacp):
 
 ## Авторские права
 
-Ознакомьтесь с оригинальными авторскими правами [HestiaCP](https://github.com/hestiacp/hestiacp)
+Оригинальный код: [HestiaCP](https://github.com/hestiacp/hestiacp)
 
 ## Лицензия
 
-Панель управления Hestia распространяется по лицензии [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) и основана на проекте [VestaCP](https://vestacp.com/).<br>
+Распространяется под лицензией [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE), основан на [VestaCP](https://vestacp.com/).

README.zh-Hans.md

@@ -0,0 +1,109 @@
+<div align="center">
+
+# [Hestia 控制面板 (RPM 版)](https://hestiadocs.brepo.ru)
+
+![HestiaCP 网页界面截图](./docs/public/images/demo.png)
+
+## 面向现代网络托管环境的轻量级强大服务器控制面板
+
+**稳定版本:** 1.9.5 (RPM) |
+[RPM 版](https://hestiadocs.brepo.ru) |
+[原版 Ubuntu/Debian 项目](https://hestiacp.com) |
+[更新日志](/CHANGELOG.md) |
+[支持论坛](https://forum.hestiacp.com)
+<br>
+[![Drone 构建状态](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![代码检查状态](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![技术问答](https://img.shields.io/badge/Gurubase-使用英文在Hestia论坛提问-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+Hestia 控制面板（RPM 版）由专注于RHEL系列发行版的独立团队维护开发。由于从原项目分叉后，此版本已包含与上游 Ubuntu/Debian 版本无法直接同步的变更（部分功能不适用于 RPM 系统），因此相关问题请直接报告至本项目。
+
+以下是面板的通用描述。
+
+## **欢迎使用！**
+
+Hestia 控制面板旨在通过集中式面板为管理员提供易用的网页界面和命令行工具，快速部署和管理网站域名、邮箱账户、DNS 区域和数据库，无需手动配置独立组件。
+
+## 功能与服务
+
+- Apache2 和 NGINX 搭配 PHP-FPM
+- 多版本 PHP 支持（7.4[EOL](https://www.php.net/supported-versions.php) - 8.3，默认 8.2 来自 Remi 仓库 + 自定义 PHP 构建）
+- DNS 服务器（Bind）
+- 带病毒/垃圾邮件防护的邮件服务及网页邮箱（POP/IMAP/SMTP，ClamAV，SpamAssassin，Sieve，Roundcube）
+- MariaDB/MySQL 和 PostgreSQL 数据库
+- Let's Encrypt SSL 支持
+- 防火墙含暴力破解防护和 IP 管理（iptables，fail2ban，ipset）
+
+## 支持系统
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**注意事项:**
+
+- HestiaCP 不支持 32 位操作系统！
+- 在 OpenVZ 7 或更早版本上使用 HestiaCP 可能出现 DNS/防火墙问题。建议选择基于 KVM/LXC 的虚拟化方案。
+
+## 安装 Hestia 控制面板
+
+- **注意:** 为保证功能完整性，请在新装系统上进行安装。
+
+尽管我们力求安装过程简单直观，但使用者需具备基础的 Linux 服务器配置知识。
+
+### 步骤 1：登录
+
+使用 **root** 或超级用户权限通过 SSH 登录：
+
+```bash
+ssh root@your.server
+```
+
+### 步骤 2：下载
+
+获取最新安装脚本：
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### 步骤 3：执行
+
+运行脚本并遵循屏幕指引：
+
+```bash
+bash hst-install.sh
+```
+
+安装完成后，您将收到欢迎邮件（如配置）和登录信息。
+
+### 自定义安装
+
+使用参数选择组件，查看选项：
+
+```bash
+bash hst-install.sh -h
+```
+
+## 更新现有安装
+
+默认启用自动更新（通过 **服务器设置 > 更新** 管理）。手动更新：
+
+```bash
+dnf update
+```
+
+## 问题与支持
+
+- RPM 版本问题反馈：[提交 GitHub Issue](https://github.com/bayrepo/hestiacp-rpm/issues)
+- 原版 Debian/Ubuntu 版本：[原项目仓库](https://github.com/hestiacp/hestiacp)
+
+## 版权声明
+
+原始版权归属 [HestiaCP](https://github.com/hestiacp/hestiacp)
+
+## 授权协议
+
+Hestia 控制面板遵循 [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) 协议，基于 [VestaCP](https://vestacp.com/) 开发。

README.zh-Hant.md

@@ -0,0 +1,109 @@
+<div align="center">
+
+# [Hestia 控制面板 (RPM 版)](https://hestiadocs.brepo.ru)
+
+![HestiaCP 網頁介面截圖](./docs/public/images/demo.png)
+
+## 面向現代網絡託管環境的輕量級強大伺服器控制面板
+
+**穩定版本:** 1.9.5 (RPM) |
+[RPM 版](https://hestiadocs.brepo.ru) |
+[原版 Ubuntu/Debian 專案](https://hestiacp.com) |
+[更新日誌](/CHANGELOG.md) |
+[支援論壇](https://forum.hestiacp.com)
+<br>
+[![Drone 建構狀態](https://drone.hestiacp.com/api/badges/hestiacp/hestiacp/status.svg?ref=refs/heads/main)](https://drone.hestiacp.com/hestiacp/hestiacp)
+[![程式碼檢查狀態](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml/badge.svg)](https://github.com/hestiacp/hestiacp/actions/workflows/lint.yml)
+[![技術問答](https://img.shields.io/badge/Gurubase-使用英文在Hestia論壇提問-006BFF)](https://gurubase.io/g/hestia)
+
+</div>
+
+Hestia 控制面板（RPM 版）由專注於 RPM 系統的獨立團隊維護開發。由於從原專案分叉後，此版本已包含與上游 Ubuntu/Debian 版本無法直接同步的變更（部分功能不適用於 RPM 系統），因此相關問題請直接報告至本專案。
+
+以下是面板的通用描述。
+
+## **歡迎使用！**
+
+Hestia 控制面板旨在透過集中式面板為管理員提供易用的網頁介面和命令列工具，快速部署和管理網站域名、郵箱帳戶、DNS 區域和資料庫，無需手動配置獨立元件。
+
+## 功能與服務
+
+- Apache2 和 NGINX 搭配 PHP-FPM
+- 多版本 PHP 支援（7.4[EOL](https://www.php.net/supported-versions.php) - 8.3，預設 8.2 來自 Remi 倉庫 + 自訂 PHP 構建）
+- DNS 伺服器（Bind）
+- 帶病毒/垃圾郵件防護的郵件服務及網頁郵箱（POP/IMAP/SMTP，ClamAV，SpamAssassin，Sieve，Roundcube）
+- MariaDB/MySQL 和 PostgreSQL 資料庫
+- Let's Encrypt SSL 支援
+- 防火牆含暴力破解防護和 IP 管理（iptables，fail2ban，ipset）
+
+## 支援系統
+
+- **MSVSphere:** 9
+- **AlmaLinux:** 9
+- **RockyLinux:** 9
+
+**注意事項:**
+
+- HestiaCP 不支援 32 位元作業系統！
+- 在 OpenVZ 7 或更早版本上使用 HestiaCP 可能出現 DNS/防火牆問題。建議選擇基於 KVM/LXC 的虛擬化方案。
+
+## 安裝 Hestia 控制面板
+
+- **注意:** 為保證功能完整性，請在新裝系統上進行安裝。
+
+儘管我們力求安裝過程簡單直觀，但使用者需具備基礎的 Linux 伺服器配置知識。
+
+### 步驟 1：登入
+
+使用 **root** 或超級使用者權限透過 SSH 登入：
+
+```bash
+ssh root@your.server
+```
+
+### 步驟 2：下載
+
+取得最新安裝腳本：
+
+```bash
+wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh
+```
+
+### 步驟 3：執行
+
+執行腳本並遵循螢幕指引：
+
+```bash
+bash hst-install.sh
+```
+
+安裝完成後，您將收到歡迎郵件（如配置）和登入資訊。
+
+### 自訂安裝
+
+使用參數選擇元件，檢視選項：
+
+```bash
+bash hst-install.sh -h
+```
+
+## 更新現有安裝
+
+預設啟用自動更新（透過 **伺服器設定 > 更新** 管理）。手動更新：
+
+```bash
+dnf update
+```
+
+## 問題與支援
+
+- RPM 版本問題回饋：[提交 GitHub Issue](https://github.com/bayrepo/hestiacp-rpm/issues)
+- 原版 Debian/Ubuntu 版本：[原專案倉庫](https://github.com/hestiacp/hestiacp)
+
+## 版權聲明
+
+原始版權歸屬 [HestiaCP](https://github.com/hestiacp/hestiacp)
+
+## 授權協議
+
+Hestia 控制面板遵循 [GPL v3](https://github.com/hestiacp/hestiacp/blob/release/LICENSE) 協議，基於 [VestaCP](https://vestacp.com/) 開發。

bin/v-add-fastcgi-cache

@@ -79,9 +79,9 @@ EOF
 chown root:$user $fastcgi
 chmod 640 $fastcgi
 
-str="fastcgi_cache_path /var/cache/nginx/micro/$domain levels=1:2"
+str="fastcgi_cache_path /usr/local/hestia/nginx-system/var/cache/nginx/micro/$domain levels=1:2"
 str="$str keys_zone=$domain:10m max_size=512m inactive=30m use_temp_path=off;"
-conf='/etc/nginx/conf.d/fastcgi_cache_pool.conf'
+conf='/usr/local/hestia/nginx-system/etc/nginx/conf.d/fastcgi_cache_pool.conf'
 if [ -f "$conf" ]; then
 	if [ -z "$(grep "=${domain}:" $conf)" ]; then
 		echo "$str" >> $conf
@@ -90,7 +90,7 @@ else
 	echo "$str" >> $conf
 fi
 
-mkdir -p /var/cache/nginx/micro/$domain
+mkdir -p /usr/local/hestia/nginx-system/var/cache/nginx/micro/$domain
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-add-web-php

@@ -84,10 +84,10 @@ if [ "$LOCAL_PHP" == "yes" ]; then
 	fi
 else
 	# Packages in Remi repo have names with php$version-php- prefixes
-	mph="php$version-php-fpm php$version-php-cgi php$version-php-mysqlnd php$version-php-pgsql 
+	mph="php$version-php-fpm php$version-php-cgi php$version-php-mysqlnd php$version-php-pgsql
-		php$version-php-pdo php$version-php-common php$version-php-pecl-imagick php$version-php-imap 
+		php$version-php-pdo php$version-php-common php$version-php-pecl-imagick php$version-php-imap
-		php$version-php-ldap php$version-php-pecl-apcu php$version-php-pecl-zip php$version-php-cli 
+		php$version-php-ldap php$version-php-pecl-apcu php$version-php-pecl-zip php$version-php-cli
-		php$version-php-opcache php$version-php-xml php$version-php-gd php$version-php-intl 
+		php$version-php-opcache php$version-php-xml php$version-php-gd php$version-php-intl
 		php$version-php-mbstring php$version-php-pspell php$version-php-readline"
 	if [ "$version" = "56" ]; then
 		mph=$(sed -e "s/php$version-php-pecl-apcu//")
@@ -130,10 +130,10 @@ echo
 
 if [ "$LOCAL_PHP" == "yes" ]; then
 	for mod in $php_modules_install; do
-		enable_local_php_extension "$version" "$mod"
+		fn_enable_local_php_extension "$version" "$mod"
 	done
 	for mod in $php_modules_disable; do
-		disable_local_php_extension "$version" "$mod"
+		fn_disable_local_php_extension "$version" "$mod"
 	done
 fi
 
@@ -156,23 +156,15 @@ else
 fi
 
 # Check if required modules for apache2 are enabled
-if [ "$WEB_SYSTEM" = "apache2" ]; then
+if [ "$WEB_SYSTEM" = "httpd" ]; then
-	if [ -f /etc/redhat-release ]; then
+	if ! httpd -M | grep 'proxy_fcgi_module' ; then
-		if ! httpd -M | grep 'proxy_fcgi_module' ; then
+		sed 's/#LoadModule proxy_fcgi_module/LoadModule proxy_fcgi_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
-			sed 's/#LoadModule proxy_fcgi_module/LoadModule proxy_fcgi_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
+		sed 's/#LoadModule proxy_module/LoadModule proxy_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
-			sed 's/#LoadModule proxy_module/LoadModule proxy_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
-		fi
-		if ! httpd -M | grep 'setenvif_module' ; then
-			sed 's/#LoadModule setenvif_module/LoadModule setenvif_module/' -i /etc/httpd/conf.modules.d/00-base.conf
-		fi
-	else
-		if ! a2query -q -m proxy_fcgi; then
-			a2enmod -q proxy_fcgi
-		fi
-		if ! a2query -q -m setenvif; then
-			a2enmod -q setenvif
-		fi
 	fi
+	if ! httpd -M | grep 'setenvif_module' ; then
+		sed 's/#LoadModule setenvif_module/LoadModule setenvif_module/' -i /etc/httpd/conf.modules.d/00-base.conf
+	fi
+
 	$BIN/v-restart-web "yes"
 fi
 

bin/v-change-sys-db-alias

@@ -68,13 +68,13 @@ if [ "$type" = "pma" ] || [ "$type" = "PMA" ] || [ "$type" = "phpmyadmin" ]; the
 		$BIN/v-restart-service httpd
 	fi
 
-	if [ -e "/etc/nginx/conf.d/phpmyadmin.inc" ]; then
+	if [ -e "/usr/local/hestia/nginx-system/etc/nginx/conf.d/phpmyadmin.inc" ]; then
-		rm -f /etc/nginx/conf.d/phpmyadmin.inc
+		rm -f /usr/local/hestia/nginx-system/etc/nginx/conf.d/phpmyadmin.inc
-		cp -f $HESTIA_INSTALL_DIR/nginx/phpmyadmin.inc /etc/nginx/conf.d/phpmyadmin.inc
+		cp -f $HESTIA_INSTALL_DIR/nginx/phpmyadmin.inc /usr/local/hestia/nginx-system/etc/nginx/conf.d/phpmyadmin.inc
-		sed -i "s|%pma_alias%|$alias|g" /etc/nginx/conf.d/phpmyadmin.inc
+		sed -i "s|%pma_alias%|$alias|g" /usr/local/hestia/nginx-system/etc/nginx/conf.d/phpmyadmin.inc
 
 		# Restart services
-		$BIN/v-restart-service nginx
+		$BIN/v-restart-service nginx-system
 	fi
 fi
 
@@ -105,13 +105,13 @@ if [ "$type" = "pga" ] || [ "$type" = "PGA" ] || [ "$type" = "phppgadmin" ]; the
 		$BIN/v-restart-service httpd
 	fi
 
-	if [ -e "/etc/nginx/conf.d/phppgadmin.inc" ]; then
+	if [ -e "/usr/local/hestia/nginx-system/etc/nginx/conf.d/phppgadmin.inc" ]; then
-		rm -f /etc/nginx/conf.d/phppgadmin.inc
+		rm -f /usr/local/hestia/nginx-system/etc/nginx/conf.d/phppgadmin.inc
-		cp -f $HESTIA_INSTALL_DIR/nginx/phppgadmin.inc /etc/nginx/conf.d/phppgadmin.inc
+		cp -f $HESTIA_INSTALL_DIR/nginx/phppgadmin.inc /usr/local/hestia/nginx-system/etc/nginx/conf.d/phppgadmin.inc
-		sed -i "s|%pga_alias%|$alias|g" /etc/nginx/conf.d/phppgadmin.inc
+		sed -i "s|%pga_alias%|$alias|g" /usr/local/hestia/nginx-system/etc/nginx/conf.d/phppgadmin.inc
 
 		# Restart services
-		$BIN/v-restart-service nginx
+		$BIN/v-restart-service nginx-system
 	fi
 fi
 

bin/v-change-sys-hostname

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/bash
 # info: change hostname
 # options: HOSTNAME
 #
@@ -37,18 +37,20 @@ check_hestia_demo_mode
 
 hostname "$domain"
 
-if [ -d "/etc/sysconfig" ]; then
+if command -v hostnamectl >/dev/null 2>&1; then
-	# RHEL/CentOS/Amazon
+    hostnamectl set-hostname "$domain"
-	touch /etc/sysconfig/network
+    echo "$domain" > /etc/hostname
-	if [ -z "$(grep HOSTNAME /etc/sysconfig/network)" ]; then
-		echo "HOSTNAME='$domain'" >> /etc/sysconfig/network
-	else
-		sed -i "s/HOSTNAME=.*/HOSTNAME='$domain'/" /etc/sysconfig/network
-	fi
 else
-	# Debian/Ubuntu
+    if [ -d "/etc/sysconfig" ]; then
-	hostnamectl set-hostname "$domain"
+        touch /etc/sysconfig/network
-	echo "$domain" > /etc/hostname
+        if [ -z "$(grep HOSTNAME /etc/sysconfig/network)" ]; then
+            echo "HOSTNAME='$domain'" >> /etc/sysconfig/network
+        else
+            sed -i "s/HOSTNAME=.*/HOSTNAME='$domain'/" /etc/sysconfig/network
+        fi
+    else
+        echo "$domain" > /etc/hostname
+    fi
 fi
 
 # Update Roundcube password plugin configuration

bin/v-change-sys-service-config

@@ -65,18 +65,18 @@ fi
 
 # Defining dst config path
 case $service in
-	nginx) dst='/etc/nginx/nginx.conf' ;;
+	nginx) dst='/usr/local/hestia/nginx-system/etc/nginx/nginx.conf' ;;
 	httpd) dst='/etc/httpd/conf/httpd.conf' ;;
 	apache2) dst='/etc/apache2/apache2.conf' ;;
 	exim) dst='/etc/exim/exim.conf' ;;
 	exim4) dst='/etc/exim4/exim4.conf.template' ;;
 	vsftpd) dst=$(find /etc/vsftpd* -name 'vsftpd.conf') ;;
 	proftpd) dst=$(find /etc/proftpd* -name 'proftpd.conf') ;;
-	php) 
+	php)
 		if [ "$LOCAL_PHP" == "yes" ]; then
-			dst=$(find /opt/brepo/php${php_v} -name php.ini) 
+			dst=$(find /opt/brepo/php${php_v} -name php.ini)
 		else
-			dst=$(find /etc/opt/remi/php${php_v} -name php.ini) 
+			dst=$(find /etc/opt/remi/php${php_v} -name php.ini)
 		fi
 	;;
 	mysql) dst=$(find /etc/my* -name my.cnf) ;;

bin/v-check-service-config

@@ -31,7 +31,7 @@ SERVICE_NAME="$1"
 
 case "$SERVICE_NAME" in
 nginx )
-    /usr/sbin/nginx -t >> "$DEBUG_LOG_FILE" 2>&1
+    /usr/local/hestia/nginx-system/sbin/nginx -t >> "$DEBUG_LOG_FILE" 2>&1
     V_RESULT=$?
     exit $V_RESULT
 ;;
@@ -47,5 +47,3 @@ esac
 
 # Something like error, we shouldn't be here
 exit 1
-
-

bin/v-default-domain

@@ -0,0 +1,105 @@
+#!/bin/bash
+# info: add web/dns/mail domain
+# options: USER DOMAIN COMMAND
+#
+# example: v-default-domain admin example.com set
+#          v-default-domain admin example.com delete
+#          v-default-domain admin example.com check
+#          v-default-domain admin example.com check-default
+#
+# This function set user's domain as default or reset it or get default domain or check is domain default.
+
+#----------------------------------------------------------#
+#                Variables & Functions                     #
+#----------------------------------------------------------#
+
+# Argument definition
+user=$1
+domain=$2
+command=$3
+
+# Includes
+# shellcheck source=/etc/hestiacp/hestia.conf
+source /etc/hestiacp/hestia.conf
+# shellcheck source=/usr/local/hestia/func/main.sh
+source $HESTIA/func/main.sh
+# load config file
+source_conf "$HESTIA/conf/hestia.conf"
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+check_args '3' "$#" 'USER DOMAIN COMMAND'
+is_format_valid 'user' 'domain'
+if [ -n "$ip" ]; then
+    is_format_valid 'ip'
+fi
+is_object_valid 'user' 'USER' "$user"
+is_object_unsuspended 'user' 'USER' "$user"
+
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+confd="conf.h.d"
+
+if [[ $command == check* ]]; then
+    default_conf="/etc/httpd/$confd/domains/00000000000000000_default.conf"
+    if [ -e "$default_conf" ]; then
+        file_name=$(readlink -f "$default_conf")
+        s_username=$(echo "$file_name" | cut -d"/" -f3 )
+        s_domain=$(echo "$file_name" | rev | cut -d"/" -f2 | rev )
+        if [ "$command" == "check-default" ]; then
+            echo "$s_username:$s_domain"
+        else
+            if [ "$user" == "$s_username" ] && [ "$domain" == "$s_domain" ]; then
+                echo "true"
+            else
+                echo "false"
+            fi
+        fi
+    else
+        echo "no default domain"
+    fi
+else
+    # Working on web domain
+    if [ -n "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" == "httpd" ]; then
+        domain_path="/etc/httpd/$confd/domains/$domain.conf"
+        domain_ssl_path="/etc/httpd/$confd/domains/$domain.ssl.conf"
+        if [ -e "$domain_ssl_path" ] || [ -e "$domain_path" ]; then
+            path_name="$domain_path"
+            if [ -e  "$domain_ssl_path" ]; then
+                path_name="$domain_ssl_path"
+            fi
+            if [ "$command" == "delete" ]; then
+                if [ -e "/etc/httpd/$confd/domains/00000000000000000_default.conf" ]; then
+                    mv -f "/etc/httpd/$confd/domains/00000000000000000_default.conf" "/etc/httpd/$confd/domains/00000000000000000_default.conf.trash"
+                fi
+            else
+                ln -sf "${path_name}" "/etc/httpd/$confd/domains/00000000000000000_default.conf"
+            fi
+            echo "true"
+        else
+            echo "false"
+        fi
+    fi
+    
+    # Restarting services
+    $BIN/v-restart-web "yes"
+    check_result $? "can't restart web" > /dev/null
+    
+    $BIN/v-restart-proxy "yes"
+    check_result $? "can't restart proxy" > /dev/null
+    
+    $BIN/v-restart-dns "yes"
+    check_result $? "can't restart dns" > /dev/null
+fi
+
+#----------------------------------------------------------#
+#                       Hestia                             #
+#----------------------------------------------------------#
+
+exit

bin/v-delete-fastcgi-cache

@@ -49,7 +49,7 @@ if [ -f "$HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.fastcgi_cache.conf" ]; then
 	rm -rf $HOMEDIR/$user/conf/web/$domain/$WEB_SYSTEM.fastcgi_cache.conf
 fi
 
-conf='/etc/nginx/conf.d/fastcgi_cache_pool.conf'
+conf='/usr/local/hestia/nginx-system/etc/nginx/conf.d/fastcgi_cache_pool.conf'
 if [ -f "$conf" ]; then
 	sed -i "/ keys_zone=$domain/d" $conf
 	if [ ! -s "$conf" ]; then
@@ -58,7 +58,7 @@ if [ -f "$conf" ]; then
 fi
 
 # Delete FastCGI cache folder
-if [ -d "/var/cache/nginx/micro/$domain" ]; then
+if [ -d "/usr/local/hestia/nginx-system/var/cache/nginx/micro/$domain" ]; then
 	rm -rf /var/cache/nginx/micro/$domain
 fi
 

bin/v-list-sys-nginx-config

@@ -65,7 +65,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 # Defining config path
-config_path='/etc/nginx/nginx.conf'
+config_path='/usr/local/hestia/nginx-system/etc/nginx/nginx.conf'
 
 # Defining keys
 keys="worker_processes |worker_connections |send_timeout"

bin/v-list-sys-services

@@ -34,7 +34,8 @@ json_list() {
         "STATE": "'$STATE'",
         "CPU": "'$CPU'",
         "MEM": "'$MEM'",
-        "RTIME": "'$RTIME'"
+        "RTIME": "'$RTIME'",
+        "PMEM": "'$PHM'"
     }'
 		if [ "$i" -lt "$objects" ]; then
 			echo ','
@@ -49,11 +50,11 @@ json_list() {
 # SHELL list function
 shell_list() {
 	IFS=$'\n'
-	echo "NAME   STATE   CPU   MEM   UPTIME"
+	echo "NAME   STATE   CPU   MEM   UPTIME   PMEM"
-	echo "----   -----   ---   ---   ------"
+	echo "----   -----   ---   ---   ------   ----"
 	while read str; do
 		parse_object_kv_list "$str"
-		echo "$NAME $STATE $CPU $MEM $RTIME"
+		echo "$NAME $STATE $CPU $MEM $RTIME $PHM"
 	done < <(echo -e "$data" | grep NAME)
 }
 
@@ -62,17 +63,17 @@ plain_list() {
 	IFS=$'\n'
 	while read str; do
 		parse_object_kv_list "$str"
-		echo -e "$NAME\t$SYSTEM\t$STATE\t$CPU\t$MEM\t$RTIME"
+		echo -e "$NAME\t$SYSTEM\t$STATE\t$CPU\t$MEM\t$RTIME\t$PHM"
 	done < <(echo -e "$data" | grep NAME)
 }
 
 # CSV list function
 csv_list() {
 	IFS=$'\n'
-	echo "NAME,SYSTEM,STATE,CPU,MEM,RTIME"
+	echo "NAME,SYSTEM,STATE,CPU,MEM,RTIME,PMEM"
 	while read str; do
 		parse_object_kv_list "$str"
-		echo "$NAME,\"$SYSTEM\",$STATE,$CPU,$MEM,$RTIME"
+		echo "$NAME,\"$SYSTEM\",$STATE,$CPU,$MEM,$RTIME,$PHM"
 	done < <(echo -e "$data" | grep NAME)
 }
 
@@ -84,6 +85,7 @@ get_srv_state() {
 	mem=0
 	cpu=0
 	rtime="0"
+	pmem=0
 
 	# Searching related pids
 	if [ "$name" = "php-fpm" ]; then
@@ -91,7 +93,11 @@ get_srv_state() {
 		for php_pid in $(pidof php-fpm); do
 			process_info=$(ps -p "$php_pid" -o args | tail -n1 | grep "$srv")
 			if [ -n "$process_info" ]; then
-				pids="${pids}|${php_pid}"
+				if [ -z "$pids" ];then
+					pids="${php_pid}"
+				else
+					pids="${pids}|${php_pid}"
+				fi
 			fi
 		done
 	else
@@ -123,6 +129,9 @@ get_srv_state() {
 		mem=$(echo "$pids" | awk '{sum += $3} END {print sum/1024 }')
 		mem=$(echo "${mem%%.*}")
 
+		pmem=$(echo "$pids" | awk '{sum += $4} END {print sum/1024 }')
+		pmem=$(echo "${pmem%%.*}")
+
 		# Searching pid file
 		pid_file=''
 		if [ -e "/run/$srv.pid" ]; then
@@ -151,6 +160,7 @@ get_srv_state() {
 		mem=0
 		cpu=0
 		rtime="0"
+		pmem=0
 	fi
 }
 
@@ -160,7 +170,7 @@ get_srv_state() {
 
 # Saving current proccess list
 tmp_file=$(mktemp)
-ps -eo pid,pcpu,size > $tmp_file
+ps -eo pid,pcpu,size,rss > $tmp_file
 
 # Checking current time
 ctime=$(date +%s)
@@ -169,7 +179,7 @@ ctime=$(date +%s)
 if [ -n "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'remote' ]; then
 	get_srv_state $WEB_SYSTEM
 	data="NAME='$WEB_SYSTEM' SYSTEM='web server' STATE='$state' CPU='$cpu'"
-	data="$data MEM='$mem' RTIME='$rtime'"
+	data="$data MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking PHP intepreter
@@ -179,18 +189,18 @@ if [ -n "$WEB_BACKEND" ] && [ "$WEB_BACKEND" != 'remote' ]; then
 		for version in $php_versions; do
 			proc_name="php-fpm"
 			service_name="fpm${version}"
-			get_srv_state "$proc_name"
+			get_srv_state "/opt/brepo/php${version}" "$proc_name"
 			data="$data\nNAME='brepo-php-$service_name' SYSTEM='php interpreter' STATE='$state'"
-			data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+			data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 		done
 	else
 		php_versions=$(ls /opt/remi/php*/root/sbin/php-fpm | cut -d'/' -f4 | sed 's|php||')
 		for version in $php_versions; do
 			proc_name="php-fpm"
 			service_name="php${version}"
-			get_srv_state "$proc_name"
+			get_srv_state "/opt/remi/php${version}" "$proc_name"
 			data="$data\nNAME='$service_name-php-fpm' SYSTEM='php interpreter' STATE='$state'"
-			data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+			data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 		done
 	fi
 fi
@@ -199,7 +209,7 @@ fi
 if [ -n "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" != 'remote' ]; then
 	get_srv_state "$PROXY_SYSTEM"
 	data="$data\nNAME='$PROXY_SYSTEM' SYSTEM='reverse proxy' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # DNS
@@ -208,21 +218,21 @@ if [ -n "$service" ] && [ "$service" != 'remote' ]; then
 	proc_name='named'
 	get_srv_state $service $proc_name
 	data="$data\nNAME='$service' SYSTEM='dns server' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking MAIL system
 if [ -n "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'remote' ]; then
 	get_srv_state "$MAIL_SYSTEM"
 	data="$data\nNAME='$MAIL_SYSTEM' SYSTEM='mail server' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking MAIL IMAP
 if [ -n "$IMAP_SYSTEM" ] && [ "$IMAP_SYSTEM" != 'remote' ]; then
 	get_srv_state "$IMAP_SYSTEM"
 	data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='imap/pop3 server' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking MAIL ANTIVIRUS
@@ -244,7 +254,7 @@ if [ -n "$ANTIVIRUS_SYSTEM" ] && [ "$ANTIVIRUS_SYSTEM" != 'remote' ]; then
 		get_srv_state "$ANTIVIRUS_SYSTEM" "$proc_name"
 	fi
 	data="$data\nNAME='$ANTIVIRUS_SYSTEM' SYSTEM='email anti-virus'"
-	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 	proc_name=''
 fi
 
@@ -252,7 +262,7 @@ fi
 if [ -n "$ANTISPAM_SYSTEM" ] && [ "$ANTISPAM_SYSTEM" != 'remote' ]; then
 	get_srv_state "$ANTISPAM_SYSTEM" "spamd"
 	data="$data\nNAME='$ANTISPAM_SYSTEM' SYSTEM='email spam filter'"
-	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking DB system
@@ -299,7 +309,7 @@ if [ -n "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'remote' ]; then
 		fi
 		get_srv_state "$service" "$proc_name"
 		data="$data\nNAME='$service' SYSTEM='database server' STATE='$state'"
-		data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+		data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 		proc_name=''
 	done
 fi
@@ -308,21 +318,21 @@ fi
 if [ -n "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" != 'remote' ]; then
 	get_srv_state "$FTP_SYSTEM"
 	data="$data\nNAME='$FTP_SYSTEM' SYSTEM='ftp server' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking CRON system
 if [ -n "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'remote' ]; then
 	get_srv_state "$CRON_SYSTEM"
 	data="$data\nNAME='$CRON_SYSTEM' SYSTEM='job scheduler' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking SSH daemon
 if [ -e "/etc/ssh/sshd_config" ]; then
 	get_srv_state ssh
 	data="$data\nNAME='ssh' SYSTEM='ssh server' STATE='$state'"
-	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Checking FIREWALL system
@@ -339,7 +349,7 @@ if [ -n "$FIREWALL_SYSTEM" ] && [ "$FIREWALL_SYSTEM" != 'remote' ]; then
 		fi
 	fi
 	data="$data\nNAME='$FIREWALL_SYSTEM' SYSTEM='firewall'"
-	data="$data STATE='$state' CPU='0' MEM='0' RTIME='0'"
+	data="$data STATE='$state' CPU='0' MEM='0' RTIME='0' PHM='0'"
 fi
 
 # Checking FIREWALL Fail2ban extention
@@ -354,7 +364,7 @@ if [ -n "$FIREWALL_EXTENSION" ]; then
 		get_srv_state "$FIREWALL_EXTENSION" fail2ban-server script
 	fi
 	data="$data\nNAME='$FIREWALL_EXTENSION' SYSTEM='brute-force protection'"
-	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'"
+	data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime' PHM='$pmem'"
 fi
 
 # Listing data

bin/v-purge-nginx-cache

@@ -48,13 +48,13 @@ conf=$(grep "DOMAIN='$domain'" "$USER_DATA/web.conf")
 parse_object_kv_list "$conf"
 
 # Purge nginx FastCGI cache
-if [ -d "/var/cache/nginx/micro/$domain" ]; then
+if [ -d "/usr/local/hestia/nginx-system/var/cache/nginx/micro/$domain" ]; then
-	rm -rf /var/cache/nginx/micro/$domain/*
+	rm -rf /usr/local/hestia/nginx-system/var/cache/nginx/micro/$domain/*
 fi
 
 # Purge nginx proxy cache
-if [ -d "/var/cache/nginx/$domain" ]; then
+if [ -d "/usr/local/hestia/nginx-system/var/cache/nginx/$domain" ]; then
-	rm -rf /var/cache/nginx/$domain/*
+	rm -rf /usr/local/hestia/nginx-system/var/cache/nginx/$domain/*
 fi
 
 #----------------------------------------------------------#

bin/v-restart-proxy

@@ -25,10 +25,14 @@ send_email_report() {
 	email=$(echo "$email" | cut -f 2 -d "'")
 	tmpfile=$(mktemp)
 	subj="$(hostname): $PROXY_SYSTEM restart failed"
-	nginx -t >> $tmpfile 2>&1
+	/usr/local/hestia/nginx-system/sbin/nginx -t >> $tmpfile 2>&1
 
 	if [ "$1" == "DO_RESTART" ]; then
-		service "$PROXY_SYSTEM" restart >> $tmpfile 2>&1
+	    if [ "$PROXY_SYSTEM" = "nginx" ]; then
+			service nginx-system restart >> $tmpfile 2>&1
+		else
+		    service "$PROXY_SYSTEM" restart >> $tmpfile 2>&1
+		fi
 	fi
 	cat "$tmpfile" | $SENDMAIL -s "$subj" "$email"
 	if [ "$DEBUG_MODE" = "true" ]; then

bin/v-restart-service

@@ -73,7 +73,7 @@ for service in $service_list; do
 		$BIN/v-stop-firewall
 		$BIN/v-update-firewall
 	elif [ "$restart" = "ssl" ] && [ "$service" = "nginx" ]; then
-		service $service upgrade >> $log 2>&1
+		service nginx-system upgrade >> $log 2>&1
 	elif [ -z "$restart" -o "$restart" = "no" ] && [ \
 		"$service" = "nginx" -o \
 		"$service" = "httpd" -o \
@@ -86,10 +86,19 @@ for service in $service_list; do
 		"$service" = "proftpd" -o \
 		"$service" = "ssh" -o \
 		"$service" = "fail2ban" ]; then
-		systemctl reload-or-restart "$service" >> $log 2>&1
+		if [ "$service" = "nginx" ]; then
+		    systemctl reload-or-restart nginx-system >> $log 2>&1
+		else
+		    systemctl reload-or-restart "$service" >> $log 2>&1
+		fi
 	else
-		systemctl reset-failed "$service" >> $log 2>&1
+	    if [ "$service" = "nginx" ]; then
-		systemctl restart "$service" >> $log 2>&1
+			systemctl reset-failed nginx-system >> $log 2>&1
+    		systemctl restart nginx-system >> $log 2>&1
+		else
+    		systemctl reset-failed "$service" >> $log 2>&1
+    		systemctl restart "$service" >> $log 2>&1
+		fi
 	fi
 
 	# Check the result of the service restart and report whether it failed.

bin/v-update-sys-ip

@@ -86,7 +86,11 @@ if [ -n "$old_ip" ]; then
 
 	# Updating PROXY
 	if [ -n "$PROXY_SYSTEM" ]; then
-		cd /etc/$PROXY_SYSTEM/$pconfd
+		if [ "$PROXY_SYSTEM" = "nginx" ]; then
+			cd /usr/local/hestia/nginx-system/etc/nginx/$pconfd
+		else
+			cd /etc/$PROXY_SYSTEM/$pconfd
+		fi
 		if [ -e "$old_ip.conf" ]; then
 			mv $old_ip.conf $new_ip.conf
 			sed -i "s/$old_ip/$new_ip/g" $new_ip.conf
@@ -95,7 +99,11 @@ if [ -n "$old_ip" ]; then
 
 	# Updating WEB
 	if [ -n "$WEB_SYSTEM" ]; then
-		cd /etc/$WEB_SYSTEM/$confd
+		if [ "$WEB_SYSTEM" = "nginx" ]; then
+			cd /usr/local/hestia/nginx-system/etc/nginx/$confd
+		else
+			cd /etc/$WEB_SYSTEM/$confd
+		fi
 
 		if [ -e "$old_ip.conf" ]; then
 			mv $old_ip.conf $new_ip.conf
@@ -161,8 +169,8 @@ for ip in $ips; do
 		prefixlen="$(ip -d -j addr show | jq --arg IP "$ip" -r '.[].addr_info[] | if .local == $IP then .prefixlen else empty end')"
 		netmask="$(convert_cidr "$prefixlen")"
 		$BIN/v-add-sys-ip "$ip" "$netmask" "$interface"
-	elif [ -e "/etc/nginx/conf.d/$ip.conf" ]; then
+	elif [ -e "/usr/local/hestia/nginx-system/etc/nginx/conf.d/$ip.conf" ]; then
-		process_http2_directive "/etc/nginx/conf.d/$ip.conf"
+		process_http2_directive "/usr/local/hestia/nginx-system/etc/nginx/conf.d/$ip.conf"
 	fi
 done
 

docs/.vitepress/config.js

@@ -1,158 +1,224 @@
-import { defineConfig } from 'vitepress';
+import { defineConfig } from "vitepress";
-import { version } from '../../package.json';
+import { version } from "../../package.json";
 
 export default defineConfig({
-	lang: 'en-US',
+  lang: "en-US",
-	title: 'Hestia Control Panel',
+  title: "Hestia Control Panel",
-	description: 'Open-source web server control panel.',
+  description: "Open-source web server control panel.",
 
-	lastUpdated: true,
+  lastUpdated: true,
-	cleanUrls: false,
+  cleanUrls: false,
 
-	head: [
+  head: [
-		['link', { rel: 'icon', sizes: 'any', href: '/favicon.ico' }],
+    ["link", { rel: "icon", sizes: "any", href: "/favicon.ico" }],
-		['link', { rel: 'icon', type: 'image/svg+xml', sizes: '16x16', href: '/logo.svg' }],
+    [
-		['link', { rel: 'apple-touch-icon', sizes: '180x180', href: '/apple-touch-icon.png' }],
+      "link",
-		['link', { rel: 'manifest', href: '/site.webmanifest' }],
+      { rel: "icon", type: "image/svg+xml", sizes: "16x16", href: "/logo.svg" },
-		['meta', { name: 'theme-color', content: '#b7236a' }],
+    ],
-	],
+    [
+      "link",
+      {
+        rel: "apple-touch-icon",
+        sizes: "180x180",
+        href: "/apple-touch-icon.png",
+      },
+    ],
+    ["link", { rel: "manifest", href: "/site.webmanifest" }],
+    ["meta", { name: "theme-color", content: "#b7236a" }],
+  ],
 
-	themeConfig: {
+  themeConfig: {
-		logo: '/logo.svg',
+    logo: "/logo.svg",
 
-		nav: nav(),
+    nav: nav(),
 
-		socialLinks: [
+    socialLinks: [
-			{ icon: 'github', link: 'https://dev.brepo.ru/bayrepo/hestiacp' },
+      { icon: "github", link: "https://dev.brepo.ru/bayrepo/hestiacp" },
-			{ icon: 'github', link: 'https://github.com/bayrepo/hestiacp-rpm' },
+      { icon: "github", link: "https://github.com/bayrepo/hestiacp-rpm" },
-			{ icon: 'github', link: 'https://github.com/hestiacp/hestiacp' },
+      { icon: "github", link: "https://github.com/hestiacp/hestiacp" },
-		],
+    ],
 
-		sidebar: { '/docs/': sidebarDocs() },
+    sidebar: { "/docs/": sidebarDocs() },
 
-		outline: [2, 3],
+    outline: [2, 3],
 
-		footer: {
+    footer: {
-			message: 'Выпущена под лицензией GPLv3.',
+      message: "Выпущена под лицензией GPLv3.",
-			copyright: 'Copyright © 2019-present Hestia Control Panel и некоторые RPM based компоненты принадлежат bayrepo',
+      copyright:
-		},
+        "Copyright © 2019-present Hestia Control Panel и некоторые RPM based компоненты принадлежат bayrepo",
-
+    },
-	},
+  },
 });
 
 /** @returns {import("vitepress").DefaultTheme.NavItem[]} */
 function nav() {
-	return [
+  return [
-		{ text: 'Характеристики', link: '/features.md' },
+    { text: "Характеристики", link: "/features.md" },
-		{ text: 'Установка', link: '/install.md' },
+    { text: "Установка", link: "/install.md" },
-		{ text: 'Документация', link: '/docs/introduction/getting-started.md', activeMatch: '/docs/' },
+    {
-		{
+      text: "Документация",
-			text: `v${version}`,
+      link: "/docs/introduction/getting-started.md",
-			items: [
+      activeMatch: "/docs/",
-				{
+    },
-					text: 'Changelog',
+    {
-					link: 'https://dev.brepo.ru/bayrepo/hestiacp/src/branch/master/CHANGELOG.md',
+      text: `v${version}`,
-				},
+      items: [
-				{
+        {
-					text: 'Содействие в разработке',
+          text: "Changelog",
-					link: 'https://dev.brepo.ru/bayrepo/hestiacp/src/branch/master/CONTRIBUTING.md',
+          link: "https://dev.brepo.ru/bayrepo/hestiacp/src/branch/master/CHANGELOG.md",
-				},
+        },
-				{
+        {
-					text: 'Политика безопасности',
+          text: "Содействие в разработке",
-					link: 'https://dev.brepo.ru/bayrepo/hestiacp/src/branch/master/SECURITY.md',
+          link: "https://dev.brepo.ru/bayrepo/hestiacp/src/branch/master/CONTRIBUTING.md",
-				},
+        },
-			],
+        {
-		},
+          text: "Политика безопасности",
-	];
+          link: "https://dev.brepo.ru/bayrepo/hestiacp/src/branch/master/SECURITY.md",
+        },
+      ],
+    },
+  ];
 }
 /** @returns {import("vitepress").DefaultTheme.SidebarItem[]} */
 function sidebarDocs() {
-	return [
+  return [
-		{
+    {
-			text: 'Знакомство',
+      text: "Знакомство",
-			collapsed: false,
+      collapsed: false,
-			items: [
+      items: [
-				{ text: 'С чего начать', link: '/docs/introduction/getting-started.md' },
+        {
-				{ text: 'Рекомендации', link: '/docs/introduction/best-practices.md' },
+          text: "С чего начать",
-			],
+          link: "/docs/introduction/getting-started.md",
-		},
+        },
-		{
+        { text: "Рекомендации", link: "/docs/introduction/best-practices.md" },
-			text: 'Инструкция пользователя',
+      ],
-			collapsed: false,
+    },
-			items: [
+    {
-				{ text: 'Аккаунт', link: '/docs/user-guide/account.md' },
+      text: "Инструкция пользователя",
-				{ text: 'Резервные копии', link: '/docs/user-guide/backups.md' },
+      collapsed: false,
-				{ text: 'Cron задачи', link: '/docs/user-guide/cron-jobs.md' },
+      items: [
-				{ text: 'Базы данных', link: '/docs/user-guide/databases.md' },
+        { text: "Аккаунт", link: "/docs/user-guide/account.md" },
-				{ text: 'DNS', link: '/docs/user-guide/dns.md' },
+        { text: "Резервные копии", link: "/docs/user-guide/backups.md" },
-				{ text: 'Менеджер файлов', link: '/docs/user-guide/file-manager.md' },
+        { text: "Cron задачи", link: "/docs/user-guide/cron-jobs.md" },
-				{ text: 'Почтовые домены', link: '/docs/user-guide/mail-domains.md' },
+        { text: "Базы данных", link: "/docs/user-guide/databases.md" },
-				{ text: 'Оповещения', link: '/docs/user-guide/notifications.md' },
+        { text: "DNS", link: "/docs/user-guide/dns.md" },
-				{ text: 'Пакеты', link: '/docs/user-guide/packages.md' },
+        { text: "Менеджер файлов", link: "/docs/user-guide/file-manager.md" },
-				{ text: 'Статистика', link: '/docs/user-guide/statistics.md' },
+        { text: "Почтовые домены", link: "/docs/user-guide/mail-domains.md" },
-				{ text: 'Пользователи', link: '/docs/user-guide/users.md' },
+        { text: "Оповещения", link: "/docs/user-guide/notifications.md" },
-				{ text: 'Веб домены', link: '/docs/user-guide/web-domains.md' },
+        { text: "Пакеты", link: "/docs/user-guide/packages.md" },
-			],
+        { text: "Статистика", link: "/docs/user-guide/statistics.md" },
-		},
+        { text: "Пользователи", link: "/docs/user-guide/users.md" },
-		{
+        { text: "Веб домены", link: "/docs/user-guide/web-domains.md" },
-			text: 'Администрирование сервера',
+      ],
-			collapsed: false,
+    },
-			items: [
+    {
-				{ text: 'Создание резервных копий и восстановление', link: '/docs/server-administration/backup-restore.md' },
+      text: "Администрирование сервера",
-				{ text: 'Конфигурация', link: '/docs/server-administration/configuration.md' },
+      collapsed: false,
-				{ text: 'Персональная настройка', link: '/docs/server-administration/customisation.md' },
+      items: [
-				{ text: 'Базы данных и phpMyAdmin', link: '/docs/server-administration/databases.md' },
+        {
-				{ text: 'DNS кластера & DNSSEC', link: '/docs/server-administration/dns.md' },
+          text: "Создание резервных копий и восстановление",
-				{ text: 'Email', link: '/docs/server-administration/email.md' },
+          link: "/docs/server-administration/backup-restore.md",
-				{ text: 'Менеджер файлов', link: '/docs/server-administration/file-manager.md' },
+        },
-				{ text: 'Firewall', link: '/docs/server-administration/firewall.md' },
+        {
-				{ text: 'Обновления ОС', link: '/docs/server-administration/os-upgrades.md' },
+          text: "Конфигурация",
-				{ text: 'Rest API', link: '/docs/server-administration/rest-api.md' },
+          link: "/docs/server-administration/configuration.md",
-				{ text: 'SSL сертификаты', link: '/docs/server-administration/ssl-certificates.md' },
+        },
-				{ text: 'Веб шаблоны и кэширование', link: '/docs/server-administration/web-templates.md' },
+        {
-				{ text: 'Troubleshooting', link: '/docs/server-administration/troubleshooting.md' },
+          text: "Персональная настройка",
-			],
+          link: "/docs/server-administration/customisation.md",
-		},
+        },
-		{
+        {
-			text: 'Содейтсвие в разработке',
+          text: "Базы данных и phpMyAdmin",
-			collapsed: false,
+          link: "/docs/server-administration/databases.md",
-			items: [
+        },
-				{ text: 'Сборка пакетов', link: '/docs/contributing/building.md' },
+        {
-				{ text: 'Разработка', link: '/docs/contributing/development.md' },
+          text: "DNS кластера & DNSSEC",
-				{ text: 'Документация', link: '/docs/contributing/documentation.md' },
+          link: "/docs/server-administration/dns.md",
-				{ text: 'Установка приложений', link: '/docs/contributing/quick-install-app.md' },
+        },
-				{ text: 'Тестирование', link: '/docs/contributing/testing.md' },
+        { text: "Email", link: "/docs/server-administration/email.md" },
-				{ text: 'Переводы', link: '/docs/contributing/translations.md' },
+        {
-			],
+          text: "Менеджер файлов",
-		},
+          link: "/docs/server-administration/file-manager.md",
-		{
+        },
-			text: 'Сообщество',
+        { text: "Firewall", link: "/docs/server-administration/firewall.md" },
-			collapsed: false,
+        {
-			items: [
+          text: "Обновления ОС",
-				{ text: 'Hestia Nginx Cache', link: '/docs/community/hestia-nginx-cache.md' },
+          link: "/docs/server-administration/os-upgrades.md",
-				{
+        },
-					text: 'Ioncube installer for Hestia',
+        { text: "Rest API", link: "/docs/server-administration/rest-api.md" },
-					link: '/docs/community/ioncube-hestia-installer.md',
+        {
-				},
+          text: "SSL сертификаты",
-				{ text: 'Генератор установочной команды', link: '/docs/community/install-script-generator.md' },
+          link: "/docs/server-administration/ssl-certificates.md",
-			],
+        },
-		},
+        {
-		{
+          text: "Веб шаблоны и кэширование",
-			text: 'Ссылки',
+          link: "/docs/server-administration/web-templates.md",
-			collapsed: false,
+        },
-			items: [
+        {
-				{ text: 'API', link: '/docs/reference/api.md' },
+          text: "Troubleshooting",
-				{ text: 'CLI', link: '/docs/reference/cli.md' },
+          link: "/docs/server-administration/troubleshooting.md",
-			],
+        },
-		},
+      ],
-		{
+    },
-			text: 'Дополнения',
+    {
-			collapsed: false,
+      text: "Содейтсвие в разработке",
-			items: [
+      collapsed: false,
-				{ text: 'PHP cli селектор', link: '/docs/extensions/php-cli-selector.md' },
+      items: [
-				{ text: 'Расширенные модули', link: '/docs/extensions/extended-modules.md' },
+        { text: "Сборка пакетов", link: "/docs/contributing/building.md" },
-				{ text: 'Настройка Local PHP', link: '/docs/extensions/local-php.md' },
+        { text: "Разработка", link: "/docs/contributing/development.md" },
-			],
+        { text: "Документация", link: "/docs/contributing/documentation.md" },
-		},
+        {
-	];
+          text: "Установка приложений",
+          link: "/docs/contributing/quick-install-app.md",
+        },
+        { text: "Тестирование", link: "/docs/contributing/testing.md" },
+        { text: "Переводы", link: "/docs/contributing/translations.md" },
+      ],
+    },
+    {
+      text: "Сообщество",
+      collapsed: false,
+      items: [
+        {
+          text: "Hestia Nginx Cache",
+          link: "/docs/community/hestia-nginx-cache.md",
+        },
+        {
+          text: "Ioncube installer for Hestia",
+          link: "/docs/community/ioncube-hestia-installer.md",
+        },
+        {
+          text: "Генератор установочной команды",
+          link: "/docs/community/install-script-generator.md",
+        },
+      ],
+    },
+    {
+      text: "Ссылки",
+      collapsed: false,
+      items: [
+        { text: "API", link: "/docs/reference/api.md" },
+        { text: "CLI", link: "/docs/reference/cli.md" },
+      ],
+    },
+    {
+      text: "Дополнения",
+      collapsed: false,
+      items: [
+        {
+          text: "PHP cli селектор",
+          link: "/docs/extensions/php-cli-selector.md",
+        },
+        {
+          text: "Расширенные модули",
+          link: "/docs/extensions/extended-modules.md",
+        },
+        { text: "Настройка Local PHP", link: "/docs/extensions/local-php.md" },
+        {
+          text: "nginx+mod_rewrite",
+          link: "/docs/extensions/nginx-mod-rewrite.md",
+        },
+      ],
+    },
+  ];
 }

docs/.vitepress/theme/components/InstallOptions.vue

@@ -13,6 +13,8 @@ export default {
 		return {
 			pageloader: false,
 			hestia_wget:
+				"wget https://raw.githubusercontent.com/bayrepo/hestiacp-rpm/refs/heads/rhel-version/install/hst-install.sh",
+			hestia_wget_devel:
 				"wget https://dev.brepo.ru/bayrepo/hestiacp/raw/branch/master/install/hst-install.sh",
 			hestia_install: "sudo bash hst-install.sh",
 			installStr: "",
@@ -27,10 +29,7 @@ export default {
 			if (item.selectField) {
 				return item.selected ? `${item.param} '${item.text}'` : "";
 			}
-
+			return `${item.param}${item.selected ? " yes" : " no"}`;
-			return item.param.includes("force") && item.selected
-				? item.param
-				: `${item.param}${item.selected ? " yes" : " no"}`;
 		},
 		generateString() {
 			const installStr = this.items.map(this.getOptionString).filter(Boolean);
@@ -156,6 +155,23 @@ export default {
 						Copy
 					</button>
 				</div>
+				<p class="u-mb10">For downloading devel version use:</p>
+				<div class="u-pos-relative">
+					<input
+						type="text"
+						class="form-control u-monospace u-mb10"
+						v-model="hestia_wget_devel"
+						readonly
+					/>
+					<button
+						class="button-positioned"
+						@click="copyToClipboard(hestia_wget_devel, $event.target)"
+						type="button"
+						title="Copy to Clipboard"
+					>
+						Copy
+					</button>
+				</div>
 				<p class="u-mb10">Then run the following command:</p>
 				<div class="u-pos-relative">
 					<textarea class="form-control u-min-height100" v-model="installStr" readonly />

docs/_data/features.js

@@ -22,6 +22,7 @@ export const webDomains = [
 			{ text: 'PHP 8.2' },
 			{ text: 'PHP 8.3' },
 			{ text: 'PHP 8.4' },
+			{ text: 'PHP 8.5' },
 		],
 	},
 ];

docs/_data/options.js

@@ -84,17 +84,17 @@ export const options = [
 		selected: true,
 	},
 	{
-		name: ' --mariadb',
+		name: ' --mysql',
 		id: 'mariadb',
-		param: '--mariadb',
+		param: '--mysql',
 		desc: 'Ответление MySQL с дополнительными усовершенствованиями.',
 		selected: true,
 		conflicts: 'mysql8',
 	},
 	{
-		name: ' --mysql8',
+		name: ' --mysql-classic',
 		id: 'mysql8',
-		param: '--mysql8',
+		param: '--mysql-classic',
 		desc: 'База данных с открытым исходным кодом',
 		selected: false,
 		conflicts: 'mariadb',
@@ -136,6 +136,14 @@ export const options = [
 		desc: 'Сканировать почту на вирусы.',
 		selected: true,
 		depends: 'exim',
+	},	
+	{
+		name: ' --usemirrorclamav',
+		id: 'usemirrorclamav',
+		param: '--usemirrorclamav',
+		desc: 'Использовать русское зеркало баз данных ClamaV',
+		selected: false,
+		depends: 'clamav',
 	},
 	{
 		name: ' --spamassassin',
@@ -146,12 +154,33 @@ export const options = [
 		depends: 'exim',
 	},
 	{
-		name: ' --iptables',
+		name: ' --firewall',
-		id: 'iptables',
+		id: 'firewall',
-		param: '--iptables',
+		param: '--firewall',
 		desc: 'Управлять фаерволом.',
 		selected: true,
 	},
+	{
+		name: ' --nopublicip',
+		id: 'nopublicip',
+		param: '--nopublicip',
+		desc: 'Использовать локальный IP сервера',
+		selected: false,
+	},
+	{
+		name: ' --uselocalphp',
+		id: 'uselocalphp',
+		param: '--uselocalphp',
+		desc: 'Использовать PHP из текущего репозитория HestiaCP',
+		selected: false,
+	},
+	{
+		name: ' --usemirrorclamav',
+		id: 'usemirrorclamav',
+		param: '--usemirrorclamav',
+		desc: 'Использовать clamav с базами скачанными с зеркала в России',
+		selected: false,
+	},
 	{
 		name: ' --fail2ban',
 		id: 'fail2ban',

docs/docs/extensions/extended-modules.md

@@ -148,4 +148,4 @@ bundle install
 bundle install --path=vendor
 ```
 
-для установки пользователю необходимых гемов локально.
+для установки пользователю необходимых гемов локально.

docs/docs/extensions/nginx-mod-rewrite.md

@@ -0,0 +1,15 @@
+# nginx с поддержкой mdo_rewrite
+
+HestiaCP RPM edition поддерживает установку приложений для доменов, таких как Wordpress, Joomla, Drupal и т.д.
+
+Данные приложения написаны на PHP и требуют особого режима доступа к файлам, который реализуется с помощью .htaccess файла, в котором опианы эти правила преобразования URL.
+
+Но .htaccess файл доступен только для Apache, для реализации работоспособнсти приложений в контрольной панели организованы шаблоны конфигурации nginx, которые по сути являются аналогами конфигурации из .htaccess.
+
+Эти шаблоны размещены в каталоге `/usr/local/hestia/data/templates/web/nginx/php-fpm`.
+
+# nginx + mod_rewrite
+
+Но с версии 1.28.2 nginx добавлен экспериментальный модуль mod_rewrite для nginx, который позволяет понимать конфигурации из .htaccess и для nginx.
+
+Для активации данной конфигурации, необходимо в настройках домена в `Расширенных настройках` выбрать в поле `Шаблон прокси` шаблон `nginx-php-rewrite`. Данный шаблон автоматически определит версию PHP-FPM для домена и активирует работу модуля mod_rewrite для nginx. Для данного домена Apache больше не будет принимать участие в обработке запроса, все будет обрабатываться в связке nginx-PHP-FPM.

docs/docs/index.md

@@ -61,3 +61,4 @@
 - [PHP cli селектор](/docs/extensions/php-cli-selector.md)
 - [Расширенные модули](/docs/extensions/extended-modules.md)
 - [Настройка Local PHP](/docs/extensions/local-php.md)
+- [nginx + mod_rewrite](/docs/extensions/nginx-mod-rewrite.md)

docs/docs/introduction/getting-started.md

@@ -93,15 +93,16 @@ bash hst-install.sh -h
   -Z, --sieve             Install Sieve              [yes|no]   default: no
   -c, --clamav            Install ClamAV             [yes|no]   default: no
   -t, --spamassassin      Install SpamAssassin       [yes|no]   default: yes
-  -i, --iptables          Install Iptables           [yes|no]   default: yes
+  -i, --firewall          Install firewalld          [yes|no]   default: yes
   -b, --fail2ban          Install Fail2ban           [yes|no]   default: yes
   -q, --quota             Filesystem Quota           [yes|no]   default: no
   -d, --api               Activate API               [yes|no]   default: yes
   -r, --port              Change Backend Port                   default: 8083
   -l, --lang              Default language                      default: en
   -y, --interactive       Interactive install        [yes|no]   default: yes
-  -I, --nopublicip        Use local ip               [yes|no]   default: yes
+  -I, --nopublicip        Use local ip               [yes|no]   default: no
-  -u, --uselocalphp       Use PHP from local repo    [yes|no]   default: yes
+  -u, --uselocalphp       Use PHP from local repo    [yes|no]   default: no
+  -C, --usemirrorclamav   Use mirrored clamav        [yes|no]   default: no
   -s, --hostname          Set hostname
   -e, --email             Set admin email
   -p, --password          Set admin password

docs/docs/server-administration/web-templates.md

@@ -112,11 +112,11 @@ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 try_files $uri =404;
 fastcgi_pass %backend_lsnr%;
 fastcgi_index index.php;
-include /etc/nginx/fastcgi_params;
+include /usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 }
 ```
 
-Добавьте следующие строки под `include /etc/nginx/fastcgi_params;`:
+Добавьте следующие строки под `include /usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;`:
 
 ```bash
 include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;

docs/docs/user-guide/web-domains.md

@@ -141,4 +141,14 @@
 
 Когда включено кэширование Nginx (с использованием кэша FastCGI или с шаблоном с поддержкой кэширования), вы можете очистить кэш с помощью кнопки **<i class="fas fa-fw fa-trash"></i> Очистить кэш Nginx**.
 
-При использовании только Nginx вы можете включить кэширование FastCGI с помощью поля **Включить кэш FastCGI**. Если этот флажок установлен, отображается опция, позволяющая определить, в течение какого времени кэш считается действительным.
+При использовании только Nginx вы можете включить кэширование FastCGI с помощью поля **Включить кэш FastCGI**. Если этот флажок установлен, отображается опция, позволяющая определить, в течение какого времени кэш считается действительным.
+
+### Домен по умолчанию
+
+Для вебсервера Apache при обращении по IP адресу без указания домена доменом по умолчанию является первый загруженный виртуальный хост.
+
+Для изменения домена по умолчанию необходимо выбрать среди доменов интересующий и в настройках домена необходимо установить флажок: 
+
+**Установить текущий домен как домент по умолчанию при обращении к серверу по IP**
+
+затем нажмите кнопку **<i class="fas fa-fw fa-save"></i> Сохранить** в правом верхнем углу.

func/domain.sh

@@ -102,7 +102,7 @@ prepare_web_backend() {
 	# Accept first function argument as backend template otherwise fallback to $template global variable
 	local backend_template=${1:-$template}
 	php_type=$(cat "$HESTIA/conf/hestia.conf" | grep "LOCAL_PHP" | grep "yes")
-	
+
 	if [ -n "$php_type" ]; then
 		pool=$(find -L /opt/brepo/ -name "$domain.conf" -exec dirname {} \; 2>/dev/null)
 	else
@@ -359,7 +359,7 @@ add_web_config() {
 			-e "s|%ssl_ca%|$ssl_ca|g" \
 			-e "s|%docrtpriv%|$docrtpriv|g" \
 			> $conf
-	
+
 	if [ "$TPLNM" == "srvproxy.tpl" -o "$TPLNM" == "srvproxy.stpl" ];then
 		proxy_backend_port_internal=$(convert_proxy_ngix_internal_redirect "$3")
 		cat "$conf" \
@@ -383,7 +383,11 @@ add_web_config() {
 
 	if [[ "$TPLNM" =~ stpl$ ]]; then
 		rm -f /etc/$1/$confd/domains/$domain.ssl.conf
-		ln -s $conf /etc/$1/$confd/domains/$domain.ssl.conf
+		if [ "$1" = "nginx" ]; then
+		    ln -s $conf /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$domain.ssl.conf
+		else
+		    ln -s $conf /etc/$1/$confd/domains/$domain.ssl.conf
+		fi
 
 		# Rename/Move extra SSL config files
 		find=$(find $HOMEDIR/$user/conf/web/*.$domain.org* 2> /dev/null)
@@ -399,8 +403,13 @@ add_web_config() {
 			fi
 		done
 	else
-		rm -f /etc/$1/$confd/domains/$domain.conf
+	    if [ "$1" = "nginx" ]; then
-		ln -s $conf /etc/$1/$confd/domains/$domain.conf
+			rm -f /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$domain.conf
+    		ln -s $conf /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$domain.conf
+		else
+    		rm -f /etc/$1/$confd/domains/$domain.conf
+    		ln -s $conf /etc/$1/$confd/domains/$domain.conf
+		fi
 		# Rename/Move extra config files
 		find=$(find $HOMEDIR/$user/conf/web/*.$domain.org* 2> /dev/null)
 		for f in $find; do
@@ -419,11 +428,41 @@ add_web_config() {
 		done
 	fi
 
+	#----
+
+	php_type=$(cat "$HESTIA/conf/hestia.conf" | grep "LOCAL_PHP" | grep "yes")
+
+	MOD_CONF="/etc/httpd/conf.modules.d/09-mod-php.conf"
+	PHP_DEFAULT="/usr/bin/php-cgi"
+	if [ -e $MOD_CONF ]; then
+	    php_ver=$(grep -m1 '^LoadModule php_module ' "$MOD_CONF" | grep -oP 'php\d{2}')
+	else
+        php_ver=$(find /etc/httpd/conf.modules.d -maxdepth 1 -type f -name '*-php*-php.conf' -print -quit | sed -n 's/.*-\(php[0-9]\+\)-php\.conf$/\1/p')
+	fi
+	php_cgi_path=$PHP_DEFAULT
+
+	if [ -n "$php_ver" ]; then
+    	if [ -n "$php_type" ]; then
+    		php_cgi_path="/opt/brepo/${php_ver}/bin/php-cgi"
+    	else
+    		php_cgi_path="/opt/remi/${php_ver}/root/bin/php-cgi"
+    	fi
+	fi
+
+	if [[ -x "$php_cgi_path" ]]; then
+        :
+	else
+	    php_cgi_path=$PHP_DEFAULT
+	fi
+
+	#----
+
 	trigger="${TPLNM/.*pl/.sh}"
 	if [ -x "${WEBTPL_LOCATION}/$trigger" ]; then
 		$WEBTPL_LOCATION/$trigger \
 			$user $domain $local_ip $HOMEDIR \
-			$HOMEDIR/$user/web/$domain/public_html
+			$HOMEDIR/$user/web/$domain/public_html \
+			$php_cgi_path
 	fi
 }
 
@@ -488,17 +527,29 @@ del_web_config() {
 		rm -f $legacyconf
 
 		# Remove old global includes file
-		rm -f /etc/$1/$confd/hestia.conf
+		if [ "$1" = "nginx" ]; then
+		    rm -f /usr/local/hestia/nginx-system/etc/$1/$confd/hestia.conf
+		else
+		    rm -f /etc/$1/$confd/hestia.conf
+		fi
 	fi
 
 	# Remove domain configuration files and clean up symbolic links
 	rm -f "$conf"
 
 	if [ -n "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" = "$1" ]; then
-		rm -f "/etc/$WEB_SYSTEM/$confd/domains/$confname"
+	    if [ "$WEB_SYSTEM" = "nginx" ]; then
+			rm -f "/usr/local/hestia/nginx-system/etc/$WEB_SYSTEM/$confd/domains/$confname"
+		else
+		    rm -f "/etc/$WEB_SYSTEM/$confd/domains/$confname"
+		fi
 	fi
 	if [ -n "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" = "$1" ]; then
-		rm -f "/etc/$PROXY_SYSTEM/$confd/domains/$confname"
+	    if [ "$PROXY_SYSTEM" = "nginx" ]; then
+			rm -f "/usr/local/hestia/nginx-system/etc/$PROXY_SYSTEM/$confd/domains/$confname"
+		else
+		    rm -f "/etc/$PROXY_SYSTEM/$confd/domains/$confname"
+		fi
 	fi
 }
 
@@ -887,8 +938,16 @@ del_mail_ssl_config() {
 
 	# Remove SSL vhost configuration
 	rm -f $HOMEDIR/$user/conf/mail/$domain/*.*ssl.conf
-	rm -f /etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+	if [ "$WEB_SYSTEM" = "nginx" ]; then
-	rm -f /etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+	    rm -f /usr/local/hestia/nginx-system/etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+	else
+	    rm -f /etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+	fi
+	if [ "$PROXY_SYSTEM" = "nginx" ]; then
+	    rm -f /usr/local/hestia/nginx-system/etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+	else
+	    rm -f /etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+	fi
 
 	# Remove SSL certificates
 	rm -f $HOMEDIR/$user/conf/mail/$domain/ssl/*
@@ -976,13 +1035,23 @@ add_webmail_config() {
 	if [[ "$2" =~ stpl$ ]]; then
 		if [ -n "$WEB_SYSTEM" ]; then
 			forcessl="$HOMEDIR/$user/conf/mail/$domain/$WEB_SYSTEM.forcessl.conf"
-			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			if [ "$1"  = "nginx" ]; then
-			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			    rm -f /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+    			ln -s $conf /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			else
+    			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+    			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			fi
 		fi
 		if [ -n "$PROXY_SYSTEM" ]; then
 			forcessl="$HOMEDIR/$user/conf/mail/$domain/$PROXY_SYSTEM.forcessl.conf"
-			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			if [ "$1"  = "nginx" ]; then
-			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+                rm -f /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+    			ln -s $conf /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			else
+    			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+    			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+			fi
 		fi
 
 		# Add rewrite rules to force HTTPS/SSL connections
@@ -997,12 +1066,22 @@ add_webmail_config() {
 		find $HOMEDIR/$user/conf/mail/ -maxdepth 1 -type f \( -name "$domain.*" -o -name "ssl.$domain.*" -o -name "*nginx.$domain.*" \) -exec rm {} \;
 	else
 		if [ -n "$WEB_SYSTEM" ]; then
-			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		    if [ "$1"  = "nginx" ]; then
-			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+				rm -f /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+    			ln -s $conf /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+			else
+    			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+    			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+			fi
 		fi
 		if [ -n "$PROXY_SYSTEM" ]; then
-			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		    if [ "$1"  = "nginx" ]; then
-			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+				rm -f /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+    			ln -s $conf /usr/local/hestia/nginx-system/etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		    else
+    			rm -f /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+    			ln -s $conf /etc/$1/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		    fi
 		fi
 		# Clear old configurations
 		find $HOMEDIR/$user/conf/mail/ -maxdepth 1 -type f \( -name "$domain.*" \) -exec rm {} \;
@@ -1023,12 +1102,20 @@ del_webmail_config() {
 	fi
 	if [ -n "$WEB_SYSTEM" ]; then
 		rm -f $HOMEDIR/$user/$confd/mail/$domain/$WEB_SYSTEM.conf
-		rm -f /etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		if [ "$WEB_SYSTEM" = "nginx" ]; then
+		    rm -f /usr/local/hestia/nginx-system/etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		else
+		    rm -f /etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.conf
+		fi
 	fi
 
 	if [ -n "$PROXY_SYSTEM" ]; then
 		rm -f $HOMEDIR/$user/conf/mail/$domain/$PROXY_SYSTEM.*conf
-		rm -f /etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.conf
+		if [ "$PROXY_SYSTEM" = "nginx" ]; then
+		    rm -f /usr/local/hestia/nginx-system/etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.conf
+		else
+		    rm -f /etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.conf
+		fi
 	fi
 }
 
@@ -1046,12 +1133,20 @@ del_webmail_ssl_config() {
 	fi
 	if [ -n "$WEB_SYSTEM" ]; then
 		rm -f $HOMEDIR/$user/conf/mail/$domain/$WEB_SYSTEM.*ssl.conf
-		rm -f /etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+		if [ "$WEB_SYSTEM" = "nginx" ]; then
+		    rm -f /usr/local/hestia/nginx-system/etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+		else
+		    rm -f /etc/$WEB_SYSTEM/$confd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+		fi
 	fi
 
 	if [ -n "$PROXY_SYSTEM" ]; then
 		rm -f $HOMEDIR/$user/conf/mail/$domain/$PROXY_SYSTEM.*ssl.conf
-		rm -f /etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+		if [ "$PROXY_SYSTEM" = "nginx" ]; then
+		    rm -f /usr/local/hestia/nginx-system/etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+		else
+		    rm -f /etc/$PROXY_SYSTEM/$pconfd/domains/$WEBMAIL_ALIAS.$domain.ssl.conf
+		fi
 	fi
 }
 
@@ -1157,14 +1252,14 @@ is_base_domain_owner() {
 #----------------------------------------------------------#
 
 process_http2_directive() {
-	if [ -e /etc/nginx/conf.d/http2-directive.conf ]; then
+	if [ -e /usr/local/hestia/nginx-system/etc/nginx/conf.d/http2-directive.conf ]; then
 		while IFS= read -r old_param; do
 			new_param="$(echo "$old_param" | sed 's/\shttp2//')"
 			sed -i "s/$old_param/$new_param/" "$1"
 		done < <(grep -E "listen.*(\bssl\b(\s|.+){1,}\bhttp2\b|\bhttp2\b(\s|.+){1,}\bssl\b).*;" "$1")
 	else
-		if version_ge "$(nginx -v 2>&1 | cut -d'/' -f2)" "1.25.1"; then
+		if version_ge "$(/usr/local/hestia/nginx-system/sbin/nginx -v 2>&1 | cut -d'/' -f2)" "1.25.1"; then
-			echo "http2 on;" > /etc/nginx/conf.d/http2-directive.conf
+			echo "http2 on;" > /usr/local/hestia/nginx-system/etc/nginx/conf.d/http2-directive.conf
 
 			while IFS= read -r old_param; do
 				new_param="$(echo "$old_param" | sed 's/\shttp2//')"

func/upgrade.sh

@@ -56,11 +56,12 @@ upgrade_health_check() {
 
 upgrade_welcome_message() {
 	echo
-	echo '                  _   _           _   _        ____ ____                      '
+	echo '                _   _           _   _        ____ ____                        '
-	echo '                 | | | | ___  ___| |_(_) __ _ / ___|  _ \                     '
+	echo '               | | | | ___  ___| |_(_) __ _ / ___|  _ \   _  _ .  .           '
-	echo '                 | |_| |/ _ \/ __| __| |/ _` | |   | |_) |                    '
+	echo '               | |_| |/ _ \/ __| __| |/ _` | |   | |_) | | \| \|\/|           '
-	echo '                 |  _  |  __/\__ \ |_| | (_| | |___|  __/                     '
+	echo '               |  _  |  __/\__ \ |_| | (_| | |___|  __/  |_/|_/|  |           '
-	echo '                 |_| |_|\___||___/\__|_|\__,_|\____|_|                        '
+	echo '               |_| |_|\___||___/\__|_|\__,_|\____|_|     | \|  |  |           '
+	echo "                                                                              "
 	echo "                                                                              "
 	echo "                    Hestia Control Panel Software Update                      "
 	echo "                               Version: ${DISPLAY_VER}"
@@ -535,7 +536,7 @@ upgrade_cloudflare_ip() {
 		cf_ips="$(curl -fsLm5 --retry 2 https://api.cloudflare.com/client/v4/ips)"
 
 		if [ -n "$cf_ips" ] && [ "$(echo "$cf_ips" | jq -r '.success//""')" = "true" ]; then
-			cf_inc="/etc/nginx/conf.d/cloudflare.inc"
+			cf_inc="/usr/local/hestia/nginx-system/etc/nginx/conf.d/cloudflare.inc"
 
 			echo "[ * ] Updating Cloudflare IP Ranges for NGINX..."
 			echo "# Cloudflare IP Ranges" > $cf_inc

func_ruby/ext-modules/passenger_manager.mod

@@ -20,15 +20,15 @@ class PassengerWorker < Kernel::ModuleCoreWorker
       ID: 2,
       NAME: MODULE_ID,
       DESCR: "Added passenger support for nginx",
-      REQ: "puppet_installer",
+      REQ: "",
       CONF: "yes",
     }
   end
 
   def enable
     log_file = get_log
-    f_inst_pp = get_module_paydata("passenger_installer.pp")
+    f_inst_pp = get_module_paydata("passenger_installer.yml")
-    f_uninst_pp = get_module_paydata("passenger_uninstaller.pp")
+    f_uninst_pp = get_module_paydata("passenger_uninstaller.yml")
     if !check
       inf = info
       log("Req error, needed #{inf[:REQ]}")
@@ -36,16 +36,16 @@ class PassengerWorker < Kernel::ModuleCoreWorker
     else
       begin
         prepare_default_ruby_conf
-        log("install packages for passenger + nginx support: /usr/bin/puppet apply --detailed-exitcodes #{f_inst_pp}")
+        log("install packages for passenger + nginx support: /usr/bin/ansible-playbook -vv #{f_inst_pp}")
-        result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_inst_pp}" 2>&1`
+        result_action = `LC_ALL=C.UTF-8 /usr/bin/ansible-playbook -vv "#{f_inst_pp}" 2>&1`
         ex_status = $?.exitstatus
         if ex_status.to_i == 0 || ex_status.to_i == 2
           log(result_action)
           super
         else
           log(result_action)
-          log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}")
+          log("Try to disable action: /usr/bin/ansible-playbook -vv #{f_uninst_pp}")
-          result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp}" 2>&1`
+          result_action = `LC_ALL=C.UTF-8 /usr/bin/ansible-playbook -vv "#{f_uninst_pp}" 2>&1`
           "module installation error. See log #{log_file}"
         end
       rescue => e
@@ -57,14 +57,14 @@ class PassengerWorker < Kernel::ModuleCoreWorker
 
   def disable
     log_file = get_log
-    f_uninst_pp = get_module_paydata("passenger_uninstaller.pp")
+    f_uninst_pp = get_module_paydata("passenger_uninstaller.yml")
     if !check_domains_with_passenger
       return log_return("Presents domains with passenger support disable it first")
     end
     begin
       log("uninstall packages for passenger + nginx support")
-      log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}")
+      log("Try to disable action: /usr/bin/ansible-playbook -vv #{f_uninst_pp}")
-      result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp}" 2>&1`
+      result_action = `LC_ALL=C.UTF-8 /usr/bin/ansible-playbook -vv "#{f_uninst_pp}" 2>&1`
       ex_status = $?.exitstatus
       if ex_status.to_i == 0 || ex_status.to_i == 2
         log(result_action)

func_ruby/ext-modules/payload/passenger_manager/passenger_installer.yml

@@ -0,0 +1,69 @@
+---
+- name: Install Passenger and configure Nginx on localhost
+  hosts: localhost
+  connection: local
+  become: true
+  gather_facts: false
+  environment:
+    LANG: en_US.UTF-8
+    LC_ALL: en_US.UTF-8
+  tasks:
+    # Устанавливаем Ruby и зависимости
+    - name: Install rubygems-devel
+      ansible.builtin.dnf:
+        name: rubygems-devel
+        state: present
+    - name: Install rubygem-rake
+      ansible.builtin.dnf:
+        name: rubygem-rake
+        state: present
+    - name: Install ruby-devel
+      ansible.builtin.dnf:
+        name: ruby-devel
+        state: present
+    - name: Install rubygem-rack
+      ansible.builtin.dnf:
+        name: rubygem-rack
+        state: present
+    - name: Install alt-brepo-ruby33-devel
+      ansible.builtin.dnf:
+        name: alt-brepo-ruby33-devel
+        state: present
+    - name: Install alt-brepo-ruby33-rubygem-rake
+      ansible.builtin.dnf:
+        name: alt-brepo-ruby33-rubygem-rake
+        state: present
+    # Устанавливаем Passenger и модуль Nginx
+    - name: Install passenger-devel
+      ansible.builtin.dnf:
+        name: passenger-devel
+        state: present
+    - name: Install passenger
+      ansible.builtin.dnf:
+        name: passenger
+        state: present
+    - name: Install nginx-mod-http-passenger
+      ansible.builtin.dnf:
+        name: nginx-mod-http-passenger
+        state: present
+    # Конфигурируем Nginx для Passenger
+    - name: Create passenger.conf
+      ansible.builtin.copy:
+        dest: /etc/nginx/conf.d/passenger.conf
+        content: |
+          passenger_root /usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini;
+          passenger_ruby /usr/bin/ruby;
+          passenger_instance_registry_dir /var/run/passenger-instreg;
+          passenger_user_switching on;
+          passenger_env_var PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY 0;
+          passenger_env_var PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY 0;
+    - name: Create passenger_includer.conf
+      ansible.builtin.copy:
+        dest: /etc/nginx/conf.d/main/passenger.conf
+        content: |
+          load_module modules/ngx_http_passenger_module.so;
+    # Перезапускаем Nginx
+    - name: Restart nginx service
+      ansible.builtin.service:
+        name: nginx
+        state: restarted

func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.yml

@@ -0,0 +1,38 @@
+---
+- name: Uninstall Passenger and configure Nginx on localhost
+  hosts: localhost
+  connection: local
+  become: true
+  gather_facts: false
+  environment:
+    LANG: en_US.UTF-8
+    LC_ALL: en_US.UTF-8
+  tasks:
+    # Удалаем модуль nginx-passenger
+    - name: Remove nginx-mod-http-passenger package
+      ansible.builtin.dnf:
+        name: nginx-mod-http-passenger
+        state: absent
+    # Удалаем passenger и зависимости
+    - name: Remove passenger-devel package
+      ansible.builtin.dnf:
+        name: passenger-devel
+        state: absent
+    - name: Remove passenger package
+      ansible.builtin.dnf:
+        name: passenger
+        state: absent
+    # Удаляем конфигурационные файлы Nginx
+    - name: Remove passenger.conf
+      ansible.builtin.file:
+        path: /etc/nginx/conf.d/passenger.conf
+        state: absent
+    - name: Remove passenger_includer.conf
+      ansible.builtin.file:
+        path: /etc/nginx/conf.d/main/passenger.conf
+        state: absent
+    # Перезапускаем Nginx (необязательно, но полезно)
+    - name: Restart nginx service
+      ansible.builtin.service:
+        name: nginx
+        state: restarted

install/deb/nginx/phpmyadmin.inc

@@ -13,7 +13,7 @@ location /%pma_alias% {
 
 	location ~ ^/%pma_alias%/(.*\.php)$ {
 		alias         /usr/share/phpmyadmin/$1;
-		include       /etc/nginx/fastcgi_params;
+		include       /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 		fastcgi_index index.php;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
 		fastcgi_param SCRIPT_FILENAME $request_filename;

install/deb/nginx/phppgadmin.inc

@@ -3,7 +3,7 @@ location /%pga_alias% {
 
 	location ~ ^/%pga_alias%/(.*\.php)$ {
 		alias         /usr/share/phppgadmin/$1;
-		include       /etc/nginx/fastcgi_params;
+		include       /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 		fastcgi_index index.php;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
 		fastcgi_param SCRIPT_FILENAME $request_filename;

install/deb/templates/mail/nginx/snappymail.stpl

@@ -39,7 +39,7 @@ server {
 		}
 
 		location ~ ^/(.*\.php)$ {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/mail/nginx/snappymail.tpl

@@ -32,7 +32,7 @@ server {
 		}
 
 		location ~ ^/(.*\.php)$ {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $request_filename;

install/deb/templates/mail/nginx/web_system.stpl

@@ -34,7 +34,7 @@ server {
 		}
 
 		location ~ ^/(.*\.php)$ {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/mail/nginx/web_system.tpl

@@ -27,7 +27,7 @@ server {
 		}
 
 		location ~ ^/(.*\.php)$ {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $request_filename;

install/deb/templates/web/nginx/php-fpm/chevereto.stpl

@@ -70,7 +70,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/chevereto.tpl

@@ -61,7 +61,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl

@@ -40,7 +40,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl

@@ -31,7 +31,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/codeigniter.stpl

@@ -56,7 +56,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/codeigniter.tpl

@@ -47,7 +47,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/craftcms.stpl

@@ -61,7 +61,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/craftcms.tpl

@@ -51,7 +51,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl

@@ -111,7 +111,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl

@@ -102,7 +102,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/default.stpl

@@ -38,7 +38,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/default.tpl

@@ -29,7 +29,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl

@@ -42,7 +42,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl

@@ -33,7 +33,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl

@@ -68,7 +68,7 @@ server {
 		location ~ [^/]\.php(/|$)|^/update.php {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/drupal-composer.tpl

@@ -60,7 +60,7 @@ server {
 		location ~ [^/]\.php(/|$)|^/update.php {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/drupal-social.stpl

@@ -68,7 +68,7 @@ server {
 		location ~ [^/]\.php(/|$)|^/update.php {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/drupal-social.tpl

@@ -59,7 +59,7 @@ server {
 		location ~ [^/]\.php(/|$)|^/update.php {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/drupal.stpl

@@ -78,7 +78,7 @@ server {
 		location ~ [^/]\.php(/|$)|^/update.php {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/drupal.tpl

@@ -69,7 +69,7 @@ server {
 		location ~ [^/]\.php(/|$)|^/update.php {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/flarum.stpl

@@ -32,7 +32,7 @@ server {
 	location ~ \.php$ {
 		try_files $uri =404;
 
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_index index.php;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/flarum.tpl

@@ -23,7 +23,7 @@ server {
 	location ~ \.php$ {
 		try_files $uri =404;
 
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_index index.php;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/grav.stpl

@@ -40,7 +40,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/grav.tpl

@@ -31,7 +31,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/joomla.stpl

@@ -57,7 +57,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/joomla.tpl

@@ -47,7 +47,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/laravel.stpl

@@ -51,7 +51,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/laravel.tpl

@@ -42,7 +42,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/magento.stpl

@@ -32,7 +32,7 @@ server {
 		root %sdocroot%;
 
 		location ~ ^/setup/index.php {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
@@ -57,7 +57,7 @@ server {
 		root %sdocroot%;
 
 		location ~ ^/update/index.php {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
@@ -171,7 +171,7 @@ server {
 	location ~ (index|get|static|report|404|503)\.php$ {
 		try_files $uri =404;
 
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_buffers 1024 4k;
 		fastcgi_connect_timeout 600s;

install/deb/templates/web/nginx/php-fpm/magento.tpl

@@ -28,7 +28,7 @@ server {
 
 			fastcgi_pass %backend_lsnr%;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 			include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*;
 		}
 
@@ -46,7 +46,7 @@ server {
 		root %docroot%;
 
 		location ~ ^/update/index.php {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param PATH_INFO $fastcgi_path_info;
@@ -159,7 +159,7 @@ server {
 	location ~ (index|get|static|report|404|503)\.php$ {
 		try_files $uri =404;
 
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_buffers 1024 4k;
 		fastcgi_connect_timeout 600s;

install/deb/templates/web/nginx/php-fpm/mautic.stpl

@@ -68,7 +68,7 @@ server {
 	}
 
 	location ~ [^/]\.php(/|$) {
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_index index.php;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/modx.stpl

@@ -60,7 +60,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/modx.tpl

@@ -51,7 +51,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/moodle.stpl

@@ -66,7 +66,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $fastcgi_script_name =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_intercept_errors on;

install/deb/templates/web/nginx/php-fpm/moodle.tpl

@@ -57,7 +57,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $fastcgi_script_name =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_intercept_errors on;

install/deb/templates/web/nginx/php-fpm/opencart.stpl

@@ -40,7 +40,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/opencart.tpl

@@ -31,7 +31,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/osticket.stpl

@@ -76,7 +76,7 @@ server {
 	}
 
 	location ~ \.php$ {
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_index index.php;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/osticket.tpl

@@ -67,7 +67,7 @@ server {
 	}
 
 	location ~ \.php$ {
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_index index.php;
 		fastcgi_param PATH_INFO $path_info;

install/deb/templates/web/nginx/php-fpm/owncloud.stpl

@@ -63,7 +63,7 @@ server {
 		try_files $uri $uri/ /index.php;
 
 		location ~ \.php(?:$|/) {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
 			#fastcgi_param HTTPS on;

install/deb/templates/web/nginx/php-fpm/owncloud.tpl

@@ -54,7 +54,7 @@ server {
 		try_files $uri $uri/ /index.php;
 
 		location ~ \.php(?:$|/) {
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			#fastcgi_param HTTPS on;
 			fastcgi_param PATH_INFO $fastcgi_path_info;

install/deb/templates/web/nginx/php-fpm/phpbb.stpl

@@ -50,7 +50,7 @@ server {
 
 		# Pass the php scripts to FastCGI server specified in upstream declaration.
 		location ~ \.php(/|$) {
-			include         /etc/nginx/fastcgi_params;
+			include         /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_split_path_info ^(.+\.php)(/.*)$;
@@ -81,7 +81,7 @@ server {
 
 		# Pass the php scripts to fastcgi server specified in upstream declaration.
 		location ~ \.php(/|$) {
-			include         /etc/nginx/fastcgi_params;
+			include         /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_split_path_info ^(.+\.php)(/.*)$;

install/deb/templates/web/nginx/php-fpm/phpbb.tpl

@@ -41,7 +41,7 @@ server {
 
 		# Pass the php scripts to FastCGI server specified in upstream declaration.
 		location ~ \.php(/|$) {
-			include         /etc/nginx/fastcgi_params;
+			include         /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_split_path_info ^(.+\.php)(/.*)$;
@@ -71,7 +71,7 @@ server {
 
 		# Pass the php scripts to fastcgi server specified in upstream declaration.
 		location ~ \.php(/|$) {
-			include         /etc/nginx/fastcgi_params;
+			include         /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_split_path_info ^(.+\.php)(/.*)$;

install/deb/templates/web/nginx/php-fpm/piwik.stpl

@@ -50,7 +50,7 @@ server {
 		location ~* ^/(?:index|piwik)\.php$ {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/piwik.tpl

@@ -41,7 +41,7 @@ server {
 		location ~* ^/(?:index|piwik)\.php$ {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 

install/deb/templates/web/nginx/php-fpm/prestashop.stpl

@@ -120,7 +120,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $fastcgi_script_name /index.php$uri&$args =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/prestashop.tpl

@@ -111,7 +111,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $fastcgi_script_name /index.php$uri&$args =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/projectsend.stpl

@@ -63,7 +63,7 @@ server {
 	location ~ \.php$ {
 		try_files $fastcgi_script_name =404;
 
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_intercept_errors on;
 		fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/projectsend.tpl

@@ -53,7 +53,7 @@ server {
 	location ~ \.php$ {
 		try_files $fastcgi_script_name =404;
 
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		fastcgi_intercept_errors on;
 		fastcgi_param front_controller_active true;

install/deb/templates/web/nginx/php-fpm/pyrocms.stpl

@@ -44,7 +44,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/pyrocms.tpl

@@ -35,7 +35,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/sendy.stpl

@@ -55,7 +55,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty;

install/deb/templates/web/nginx/php-fpm/sendy.tpl

@@ -46,7 +46,7 @@ server {
 		location ~ [^/]\.php(/|$) {
 			try_files $uri =404;
 
-			include /etc/nginx/fastcgi_params;
+			include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 			fastcgi_index index.php;
 			fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

install/deb/templates/web/nginx/php-fpm/symfony2-3.stpl

@@ -49,7 +49,7 @@ server {
 	# This rule should only be placed on your development environment
 	# In production, don't include this and don't deploy app_dev.php or config.php
 	location ~ ^/(app_dev|config)\.php(/|$) {
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		# When you are using symlinks to link the document root to the
 		# current version of your application, you should pass the real
@@ -70,7 +70,7 @@ server {
 
 	# PROD
 	location ~ ^/app\.php(/|$) {
-		include /etc/nginx/fastcgi_params;
+		include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params;
 
 		# When you are using symlinks to link the document root to the
 		# current version of your application, you should pass the real