diff --git a/.gitignore b/.gitignore index fe0574ad..6701a887 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,3 @@ *.gz .vscode .DS_Store -data -conf -log \ No newline at end of file diff --git a/Changelog.md b/Changelog.md deleted file mode 100644 index 617bc9c3..00000000 --- a/Changelog.md +++ /dev/null @@ -1,468 +0,0 @@ -Version 0.9.9-0-13 [2025-08-15] -================================================== -* Improvement: Activating FileManager licence for all users (credits to Official VestaCP) -* Introducing a malware cleaning set of tools: v-install-wordfence-cli, v-desinfect-wordpress, v-fix-wordpress-core, v-change-database-password-for-wordpress, v-change-wordpress-admin-passwords, v-delete-inactive-wordpress-plugins-and-themes, v-delete-wordpress-uploads-php-files) (credits to isscbta) -* Improvement: Added support for PHP 8.3 and 8.4 -* SRS support for Exim4 (v-add-srs-support-to-exim) (credits to HestiaCP) -* Security: Ensuring that PHP files are visible only to the account they belong to - setting chmod 600 for all .php and .env files (also added as admin cronjob - v-fix-website-permissions-for-all-websites-only-php) -* Added cronjob for disk usage snapshot (size of each folder) to see what folder is growing every day (v-df-snapshot-make, v-df-snapshot-diff [some-day-snapshot] [some-other-day-snapshot]) -* Bugfix: SSL fix for Apache 2.4.65+ (fix for '421 Misdirected Request') -* Bugfix: vst-install-debian.sh: ability to install MySQL 8 on Debian 12 -* Improvement: Update nginx block-firewall.conf when user blocks 80,443 ports for some IPv4 address in the Firewall section of the admin panel -* Improvement: v-install-wordpress: Support for IDN format domains -* Security: Adding ProFTPD jail rule to Fail2Ban -* Introducing: v-make-main-apache-log - making one log file for PHP requests for all websites -* Security: Introducing a new command: v-fix-php-ini-disable-functions -* Improvement: Introducing myVesta rules for SpamAssassin (enhancing spam filtering) -* Improvement: When deleting a domain, also delete the database if the domain has a database -* Bugfix: Removing temporary Docker container network interfaces from RRD -* Introducing v-run-wp-cli-myvesta that knows the correct terminal width -* Introducing a new command: v-cd-www alias for v-change-dir-www -* Introducing a new command: v-clear-fail2ban -* Introducing a new command: v-get-dns-config (to print zone file in bind9 format) -* Introducing a DISABLE_IP_CHECK as vesta.conf variable (if logged-in user is getting a new IPv4 address every minute) -* Security: Introducing a parse_object_kv_list_non_eval() function in main.sh, to avoid the evil eval command -* Security: Enhance package validation, in v-change-user-package 'eval' replaced with 'parse_object_kv_list_non_eval' -* Improvement: Replacing all WordPress scripts to use 'v-run-wp-cli' instead of 'wp' -* Improvement: v-install-wordpress: Almost always use https -* Improvement: Skip the prompt to continue during myVesta installation if the administrator has set all required variables in the command line -* Security: Jailing v-run-wp-cli (running WP-CLI as user, added open_basedir, disabling shell_exec() and other dangerous PHP functions) -* Security: v-commander: removing the ability to set a root password -* Bugfix: DKIM record deletion command in v-delete-mail-domain-dkim script -* Adding FTP / SFTP port for Remote Backup (credits to ikheetjeff) -* Introducing a new command: v-delete-mails - delete emails older than N days (credits to isscbta) -* Introducing new commands: v-blacklist-email-domain, v-blacklist-email-account, v-whitelist-email-domain, v-whitelist-email-account (credits to isscbta) -* Bugfix: v-move-folder-and-make-symlink: use 'mv' instead of 'rsync' -* Improvement: Calculate the size of directories on /hdd too -* Bugfix: v-move-domain-and-database-to-account: Update wordfence-waf.php -* Bugfix: v-add-letsencrypt-domain: Detecting valid status on wildcard variant -* Bugfix: db.sh and v-clone-website: mysqldump --max_allowed_packet=1024M -* Bugfix: web/index.php: Prevent recreation of token by shitty browser add-ons -* Bugfix: v-restore-user: permissions fix while restoring backup -* Bugfix: Add some loops due to 403 errors during LE request in some random cases -* Improvement: v-clone-website: adding --EXCLUDE_UPLOADS parameter -* Bugfix: vst-install-debian.sh - removing phppgadmin -* Bugfix: v-update-firewall: $FIREWALL_STATEFUL conf variable (for Infomaniak VPS servers) -* Bugfix: Awstats template for all systems does not have a closed bracket in line 27 (credits to gkirde) -* Bugfix: Update v-import-cpanel-backup - removing /*!999999\- enable the sandbox mode */ -* Bugfix: Small PHP syntax fixes in the admin panel -* Introducing nginx template 'wprocket-webp-express-force-https' (credits to Luka Paunovic) -* Improvement: Added functions to check if a domain or user is unsuspended in main.sh -* Introducing a new command: v-update-document-errors-files -* Improvement: new v-backup-user-now command does backup even if the system Load Average is above the limit, or the administrator configured backups to perform only at night -* Improvement: v-install-wp-cli and v-install-wp-cli-myvesta - automatically updates if wp-cli is 30 days old -* Bugfix: Check for SSL certificate existence before deleting web domain SSL in v-install-unsigned-ssl -* Improvement: v-install-wordpress: avoid changing nginx proxy template in apache-less variant -* Added to .gitignore excludes for 'data', 'conf', and 'log' folders -* And many other minor bugfixes and improvements... - -Version 0.9.9-0-12 [2025-02-28] -================================================== -* SpamHaus DNSBL removed from exim4 -* A lot of small bugs fixed - -Version 0.9.9-0-11 [2024-05-30] -================================================== -* Introducing v-run-wp-cli command ( @isscbta ) -* Introducing v-add-wordpress-admin command ( @isscbta ) -* Few bugs fixed - -Version 0.9.9-0-10 [2024-04-11] -================================================== -* Introducing v-edit-php-ini command ( @isscbta ) -* Introducing v-edit-domain-php-ini command ( @isscbta ) - -Version 0.9.9-0-9 [2024-04-05] -================================================== -* Get quick info about a banned IP (Host, Banlist, Location) (many thanks to @VasilisParaschos ) -* Few bugs fixed - -Version 0.9.9-0-5 to 0.9.9-0-8 -================================================== -* Few bugs fixed - -Version 0.9.9-0-4 [2023-06-27] -================================================== -* Support for Debian 12 ( in mutual cooperation with @HestiaCP ) - -Version 0.9.9-0-2 [2023-06-12] -================================================== -* Hosting panel UI perfomance fix - -Version 0.9.9-0 [2023-06-05] -================================================== -* Redesign of hosting panel -* Fix for WP_CACHE_KEY_SALTs in v-clone-website command -* Fix for "Helo name contains a ip address" in Exim4 -* Fix for Exim4 for punycode domains (in collaboration with @HestiaCP ) - -Version 0.9.8-26-62 [2023-04-05] -================================================== -* Fix for LetsEncrypt Asynchronous Order Finalization (in collaboration with @HestiaCP ) - -Version 0.9.8-26-61 [2023-04-04] -================================================== -* Many bugfixes -* Hotfix for LetsEncrypt to prevent Apache falling - -Version 0.9.8-26-60 [2023-02-12] -================================================== -* New script: v-commander (useful for maintaining the server) -* New script: v-activate-rocket-nginx (serve WP-Rocket cache directly from nginx) -* New script: v-update-myvesta (get the very latest build of myVesta) -* v-clone-website: By default cloning to database: user_domain_com (instead of cloning to database: user_old_db_migrated) -* Many minor bugfixes - -Version 0.9.8-26-59 [2023-02-01] -================================================== -* Support for PHP 8.2 -* New script: v-move-folder-and-make-symlink -* New script: v-lock-wordpress (to prevent PHP malware) and v-unlock-wordpress -* v-install-wordpress: Installing WordPress to user_domain_com database instead of installing to user_wp database -* Many minor bugfixes - -Version 0.9.8-26-58 [2022-07-12] -================================================== -* [Security] hash_equals() in /reset/mail/ (credits to @divinity76 ) -* Avoid out-of-memory while downloading large log files from panel (credits to @divinity76 ) -* Fix for an boring PHP Notice in vesta-php - -Version 0.9.8-26-57 [2022-07-06] -================================================== -* Fix for GMail SMTP timeouts on Debian11 -* [Security] Fix for Local Sed Injection Vulnerability ( credits to @cleemy-desu-wayo ) - -Version 0.9.8-26-56 [2022-05-28] -================================================== -* Adding Barracuda RBL to SpamAssassin -* Fixing insane HTML form bug in List backup items page -* Script for easy adding second IP address for SMTP authenticated users only (v-make-separated-ip-for-email) - -Version 0.9.8-26-55 [2022-04-26] -================================================== -* Support for MySQL 8 -* [Security] Preventing brute-force resetting password (thanks to HestiaCP @hestiacp for fix) -* Many minor bugfixes - -Version 0.9.8-26-54 [2021-12-17] -================================================== -* Checking if FreshClam is started after installation - -Version 0.9.8-26-53 [2021-12-12] -================================================== -* Support for PHP 8.1 -* Function to ensure that pool.d folders are not empty - -Version 0.9.8-26-52 [2021-11-23] -================================================== -* Fix for not to match wildcard "*domains" and "databases*" while restoring -* Added memcached to v-list-sys-services - -Version 0.9.8-26-51 [2021-11-14] -================================================== -* Many fixes for "List services" page (v-list-sys-services function) - -Version 0.9.8-26-50 [2021-11-07] -================================================== -* Many small bugfixes and CSRF fixes - -Version 0.9.8-26-49 [2021-07-17] -================================================== -* Support for Debian 11 - -Version 0.9.8-26-48 [2021-07-11] -================================================== -* Fixed two bugs in LetsEncrypt generating process - -Version 0.9.8-26-47 [2021-05-30] -================================================== -* Enabling TLS for ProFTPD FTPS -* More logical "Restore backup" template - -Version 0.9.8-26-46 [2021-04-17] -================================================== -* [Feature] Updating CloudFlare IP addresses - -Version 0.9.8-26-45 [2021-04-13] -================================================== -* [Feature] Logging whole LetsEncrypt process to /usr/local/vesta/log/letsencrypt.log and /usr/local/vesta/log/letsencrypt_cron.log -* [Feature] Warn admin once (by sending email) if LetsEncrypt renewing failed for server hostname -* [Bugfix] Correct truncating of CA LetsEncrypt certificate (thanks to HestiaCP @hestiacp for fix) - -Version 0.9.8-26-44 [2021-04-04] -================================================== -* [Security] Preventing denial-of-service in openssl library in vesta-nginx service (CVE-2021-3449) -* [Security] Preventing admin to install non-vesta packages from vesta admin panel user interface (Credits to: Numan Türle @numanturle) -* [Bugfix] Preventing multiple execution of v-backup-users -* [UserInterface] CSS fix for Apache status table (Credits to: Milos Spasic) - -Version 0.9.8-26-43 [2021-03-15] -================================================== -* [Security] fix for: CSRF remote code execution in UploadHandler.php - CVE-2021-28379 (Credits to: Fady Osman @fady_othman) -* [Security] fix for: Local privilege escalation from user account to admin account via v-add-web-domain (Credits to: Two independent security researchers, Marti Guasch Jiménez and Francisco Andreu Sanz, working with the SSD Secure Disclosure program) (and also thanks to HestiaCP @hestiacp for fix) -* [Security] fix for: Local privilege escalation in v-generate-ssl-cert (potential user to admin or root escalation) (Credits to: Numan Türle @numanturle, thanks to HestiaCP @hestiacp for fix) -* [Security] fix for: Local privilege escalation in /web/api/ via v-make-tmp-file (probably admin to root escalation) (Credits to: Numan Türle @numanturle, thanks to HestiaCP @hestiacp for fix) -* [Security] fix for: Cross site scripting in /web/add/ip/ (admin to other admin XSS escalation) (Credits to: Numan Türle @numanturle, thanks to HestiaCP @hestiacp for fix) -* [Security] fix for: Admin to root escalation in v-activate-vesta-license (Credits to: Numan Türle @numanturle) -* [Security] Ensure HTML will not be displayed in list log page (Credits to: Kristan Kenney @kristankenney, thanks to HestiaCP @hestiacp for fix) - -Version 0.9.8-26-42 [2021-02-26] -================================================== -* [Feature] Support for PHP 8.0, see: https://forum.myvestacp.com/viewtopic.php?f=18&t=52 -* [Bugfix] Making sure Apache is in mpm_event mode - -Version 0.9.8-26-41 [2021-02-11] -================================================== -* Few bugfixes - -Version 0.9.8-26-40 [2021-02-08] -================================================== -* Few bugfixes - -Version 0.9.8-26-39 [2020-12-12] -================================================== -* [Security] Fixing useless issue with tokens in "download backup" and "loginas" functions (thanks to HestiaCP for fixes) -* [Security] Fixing XSS in /list/rrd/?period= value - -Version 0.9.8-26-38 [2020-12-05] -================================================== -* [Security] Fixing Apache status public access (thanks to HestiaCP for letting us know) - -Version 0.9.8-26-37 [2020-10-26] -================================================== -* [Bugfix] Fixing LetsEncrypt deprecated GET method for ACME v2 (thanks to @moucho) -* [Bugfix] Fixing Roundcube to send via authenticated SMTP user instead via php - -Version 0.9.8-26-36 [2020-09-10] -================================================== -* [Bugfix] Checking necessary available disk space before doing backup -* [Security] Disabling login with 'root' - -Version 0.9.8-26-35 [2020-08-23] -================================================== -* [Feature] Limiting max recipients per email to 15, in order to prevent mass spamming -* [Bugfix] While restoring backup, only exclude logs folder from root, not in public_html - -Version 0.9.8-26-34 [2020-08-19] -================================================== -* [Bugfix] Split long DNS TXT entries into 255 chunks - -Version 0.9.8-26-33 [2020-08-16] -================================================== -* [Feature] Ability to set some domain to send emails from another IP (command: v-make-separated-ip-for-email-domain) - -Version 0.9.8-26-32 [2020-08-02] -================================================== -* [Feature] v-replace-in-file command introduced -* [Security] Making sure new myVesta commands can be called only by root - -Version 0.9.8-26-31 [2020-07-30] -================================================== -* [Feature] v-import-cpanel-backup command moved to vesta-bin folder (becoming standard myVesta command) -* Starting to log auto-update output - -Version 0.9.8-26-30 [2020-07-26] -================================================== -* New ASCII logo in installer -* Deleted favicon when user don't know secret-url of hosting panel -* [bugfix] Minor bug fixed in v-make-separated-ip-for-email -* [bugfix] Minor fix of URL for templates in v-update-dns-templates -* [bugfix] Minor fixes in installer - -Version 0.9.8-26-29 [2020-07-21] -================================================== -* [Feature] v-clone-website command moved to vesta-bin folder (becoming standard myVesta command) -* [Feature] v-migrate-site-to-https command moved to vesta-bin folder (becoming standard myVesta command) -* [Bugfix] Fix for ClamAV socket -* Changing Vesta to myVesta in title of hosting panel pages - -Version 0.9.8-26-28 [2020-07-15] -================================================== -* [Feature] v-install-wordpress command introduced -* [Feature] v-move-domain-and-database-to-account command introduced -* [Feature] v-make-separated-ip-for-email command introduced -* [Bugfix] Fix for LetsEncrypt issuing in apache-less variant (nginx + php-fpm variant) -* [Bugfix] Fix for configuring phpMyAdmin DB in apache-less variant (nginx + php-fpm variant) - -Version 0.9.8-26-27 [2020-07-05] -================================================== -* [Feature] Admins now see changelog when they open myVesta panel after myVesta get updated (changelog will dissapear on next refresh) -* [Bugfix] Better control of opened SMTP concurrent connections (preventing denial-of-service of SMTP) on fresh installed servers - https://github.com/myvesta/vesta/commit/c57b15b5daca2a0ea88ee6a89a2ff5a4ef47d2a3 -* Second tuning of php-fpm pool.d config files (perfomances and limits) - -Version 0.9.8-26-26 [2020-06-27] -================================================== -* [Feature] Self-signed SSL will be automaticaly added when you add new domain (CloudFlare is fine with that, you don't need LetsEncrypt anymore if you use CloudFlare as reverse-proxy(CDN+Firewall), just set "Full" in SSL section on CloudFlare) -* [Feature] Script for adding self-signed SSL to desired domain [v-install-unsigned-ssl] -* From now, on fresh installed server, default backup cron goes at Saturday at 01 AM (instead of everyday at 05 AM) -* New favicon for hosting panel - -Version 0.9.8-26-25 [2020-06-23] -================================================== -* [Security] Fixing unnecessary slash in nginx configs for phpmyadmin and roundcube (Credits to Bernardo Berg @bberg1984 for finding this issue!) -* [Security] Adding escapeshellarg on few more places in php code (Credits to Talha Günay and @Lupul for finding these places) - -Version 0.9.8-26-24 [2020-06-22] -================================================== -* [Bugfix] nginx + php-fpm installer variant now finally works - -Version 0.9.8-26-23 [2020-06-14] -================================================== -* Adding label that LetsEncrypt can be added when you Edit domain - -Version 0.9.8-26-22 [2020-06-13] -================================================== -* [Bugfix] Checking (in order to delete) php7.4 pool config file while deleting domain - -Version 0.9.8-26-21 [2020-06-13] -================================================== -* [Feature] Blocking executable files inside archives in received emails (ClamAV) -* [Bugfix] Removing ability to schedule LetsEncrypt issuing while adding new domain (because it can fall in infinite loop whole day) -* [Bugfix] Force acme-challenge to use Apache if myVesta is behind main nginx -* [Bugfix] Adding http2 support to nginx caching.tpl -* [Bugfix] Script that removes depricated 'ssl on;' in nginx templates -* [Security] Ensure UPDATE_SSL_SCRIPT is not set in some config files - -Version 0.9.8-26-20 [2020-06-01] -================================================== -* [Bugfix] Script that will ensure that Apache2 will always stay in mpm_event mode -* [Bugfix] Ensure config files will not be overwritten while updating vesta-nginx package -* [Bugfix] Fixing URL in v-update-web-templates script -* [Feature] Additional rates for nginx anti-denial-of-service templates - -Version 0.9.8-26-19 [2020-05-15] -================================================== -* [Bugfix] Do not match subdomains while restoring domain [v-restore-user] - -Version 0.9.8-26-18 [2020-05-15] -================================================== -* [Bugfix] Fixing NS parameters in v-add-dns-on-web-alias - -Version 0.9.8-26-17 [2020-05-15] -================================================== -* [Bugfix] Reverting default clamav socket path -* [Bugfix] Put mail_max_userip_connections = 50 in dovecot - -Version 0.9.8-26-16 [2020-05-15] -================================================== -* [Bugfix] Allow quick restarting of nginx if acme-challenge should be added many times -* [Bugfix] Enabling email notification to fresh installed servers about backup success status -* [Bugfix] Timeout 10 sec for apache2 status - -Version 0.9.8-26-15 [2020-05-09] -================================================== -* [Feature] nginx templates that can prevent denial-of-service on your server -* First tuning php-fpm pool.d config files (perfomances and limits) -* New logo - -Version 0.9.8-26-14 [2020-05-08] -================================================== -* v-clone-website script switched to parameters -* Display new version in console while updating myVesta - -Version 0.9.8-26-13 [2020-05-07] -================================================== -* [Feature] Put build date and version in right-bottom corner of control panel - -Version 0.9.8-26-12 [2020-05-07] -================================================== -* [Feature] Put build date and version while compiling myVesta -* [Feature] Office365 DNS template -* [Feature] Yandex DNS template -* ProFTPD MaxIstances = 100 for fresh installed servers - -Version 0.9.8-26-11 [2020-05-01] -================================================== -* [Feature] Skipping LE renewing after 7 failed attempts -* [Bugfix] Keep conf files during auto-update -* [Bugfix] Do not restart apache while preparing letsencrypt acme challenge -* [Bugfix] Set ALLOW_BACKUP_ANYTIME='yes' for fresh installed servers - -Version 0.9.8-26-10 [2020-04-11] -================================================== -* [Feature] Creating v-normalize-restored-user script (normalize NS1, NS2 and IP of account that is backuped on other server and restored on this server) -* Tweak for hostname FPM conf -* [Security] Forbid changing root password (Credits to Alexandre ZANNI, Orange Cyberdefense, https://cyberdefense.orange.com) -* [Security] Importing system enviroment in v-change-user-password (Credits to Alexandre ZANNI, Orange Cyberdefense, https://cyberdefense.orange.com) - -Version 0.9.8-26-9 [2020-03-23] -================================================== -* [Security] Preventing manipulation with $SERVER['HTTP_HOST'] (Credits to @mdisec - Managing Partner of PRODAFT / INVICTUS A.Ş. Master ninja at pentest.blog) - -Version 0.9.8-26-8 [2020-03-23] -================================================== -* [Security] Temporary fix for parsing backup conf (Credits to @dreiggy - https://pentest.blog/vesta-control-panel-second-order-remote-code-execution-0day-step-by-step-analysis/) - -Version 0.9.8-26-7 [2020-03-18] -================================================== -* [Bugfix] Fix that avoid LetsEncrypt domain validation timeout -* [Bugfix] Set timeout in v-list-sys-web-status script - -Version 0.9.8-26-6 [2020-02-21] -================================================== -* [Bugfix] mail-wrapper.php from now works -* [Feature] Introducing NOTIFY_ADMIN_FULL_BACKUP, email notification about backup success status -* [Feature] Introducing KEEP_N_FTP_BACKUPS, ability to limit number of remote FTP backups -* [Feature] Introducing force-https-webmail-phpmyadmin nginx template -* [Feature] Trigger for /root/update_firewall_custom.sh - -Version 0.9.8-26-5 [2020-02-10] -================================================== -* [Security] sudoers fix for Debian10 -* [Feature] [Script that will migrate your site from http to https, replacing http to https URLs in database](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/v-migrate-site-to-https) -* [Feature] [Cloning script that will copy the whole site from one domain to another (sub)domain](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/v-clone-website) -* [Feature] [Script that will install multiple PHP versions on your server](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/multi-php-install.sh) -* [Bugfix] Roundcube force https -* [Bugfix] Exim compatibility with Loopia for Debian10 - -Version 0.9.8-26-4 [2020-01-07] -================================================== -* [Feature] Allow whitelisting specific IP for /api/ -* [Feature] Allow whitelisting specific IP to avoid secret_url -* [Feature] Allow Softaculous in secure_login gateway -* [Bugfix] apparmor install fix again -* [Bugfix] Turning off MariaDB SQL strict mode - -Version 0.9.8-26-3 [2019-11-26] -================================================== -* [Bugfix] Better check if session cron already added - -Version 0.9.8-26-2 [2019-11-15] -================================================== -* [Feature] Support for sub-sub-sub-sub versions :)) -* [Bugfix] Support for longer username of email accounts -* [Bugfix] apparmor install fix -* [Bugfix] Trying to fix ClamAV broken socket -* Moving to myvestacp.com - -Version 0.9.8-26 [2019-09-28] -================================================== -* [Bugfix] Let's Encrypt HTTP/2 support (by @serghey-rodin) -* [Bugfix] Fixing broken autoreply output -* [Feature] Multi-PHP support for PHP 7.4 -* [Feature] Multi-PHP installer for Debian 8 -* [Bugfix] Cron for removing old PHP sessions files -* [Bugfix] New CloudFlare IPs -* [Security] MySQL port blocked by default from outside -* [Feature] Warning when server hostname is not pointing to server IP -* [Feature] max_length_of_MySQL_username=80 - -Older versions -================================================== -* Support for Debian 10 (previous Debian releases are also supported, but Debian 10 is recommended) -* [Support for multi-PHP versions](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/multi-php-install.sh) -* You can limit the maximum number of sent emails (per hour) [per mail account](https://github.com/myvesta/vesta/blob/master/install/debian/10/exim/exim4.conf.template#L105-L106) and [per hosting account](https://github.com/myvesta/vesta/blob/master/install/debian/10/exim/exim4.conf.template#L65-L66), preventing hijacking of email accounts and preventing PHP malware scripts to send spam. -* You can see [what PHP scripts are sending emails](https://github.com/myvesta/vesta/blob/master/install/debian/10/php/php7.3-dedi.patch#L50), when and to whom -* You can completely "lock" myVesta so it can be accessed only via **secret URL**, for example https://serverhost:8083/?MY-SECRET-URL - + Literally no PHP scripts will be alive on your hosting panel (won't be able to get executed), unless you access the hosting panel with secret URL parameter. Thus, when it happens that, let's say, some zero-day exploit pops up - attackers won't be able to access it without knowing your secret URL - PHP scripts from myVesta -* We [disabled dangerous PHP functions](https://github.com/myvesta/vesta/blob/master/install/debian/10/php/php7.3-dedi.patch#L9) in php.ini, so even if, for example, your customer's CMS gets compromised, hacker will not be able to execute shell scripts from within PHP. -* Apache is fully switched to mpm_event mode, while PHP is running in PHP-FPM mode, which is the most stable PHP-stack solution - + OPCache is turned on by default -* Auto-generating LetsEncrypt SSL for server hostname (signed SSL for Vesta 8083 port, for dovecot (IMAP & POP3) and for Exim (SMTP)) -* You can change Vesta port during installation or later using one command line: **v-change-vesta-port [number]** -* Backup will run with lowest priority (to avoid load on server), and can be configured to run only by night (and to stop on the morning and continue next night) -* You can compile Vesta binaries by yourself -* [Script that will convert Vesta to myVesta](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/convert-vesta-to-myvesta.sh) -* [Wordpress installer in one second](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/create_wp_https) -* [Script for importing cPanel backups to Vesta](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/cpanel-import.sh) -* [Official Vesta Softaculous installer](https://github.com/myvesta/vesta/blob/master/src/deb/for-download/tools/install-softaculous.sh) diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index 526e5166..a515b12e 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,19 +1,23 @@ -### Describe the problem: +### Operating System (OS/VERSION): -Type here what is the problem - -### Steps to Reproduce: - -Type here what we should do in order to see the bug on our test server - -### Debian version: - -Type here, example: Debian 10 +Type here, e.g. CentOS 6 ### VestaCP Version: -Type here, example: 0.9.8.26-29 +Type here, e.g. 3.14159 ### Installed Software (what you got with the installer): -Copy here first 22 lines of file /usr/local/vesta/conf/vesta.conf +Type here, e.g. php-fpm, apache, nginx, mysql + +### Steps to Reproduce: + +Type here, e.g. install vesta and type rm -rf / --no-preserve-root + +### Related Issues/Forum Threads: + +Found anything that might be related to this? It might help us find the cause. + +### Other Notes: + +Anything else? diff --git a/README.md b/README.md index a2e7a3de..a16fe83e 100644 --- a/README.md +++ b/README.md @@ -1,95 +1,42 @@ +[Vesta Control Panel](http://vestacp.com/) +================================================== -

myVesta

+[![Join the chat at https://gitter.im/vesta-cp/Lobby](https://badges.gitter.im/vesta-cp/Lobby.svg)](https://gitter.im/vesta-cp/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -
+* Vesta is an open source hosting control panel. +* Vesta has a clean and focused interface without the clutter. +* Vesta has the latest of very innovative technologies. -[![Screenshot of myVesta](https://www.myvestacp.com/screenshot1.png)](https://www.myvestacp.com/) +How to install (2 step) +---------------------------- +Connect to your server as root via SSH +```bash +ssh root@your.server +``` -
+Download the installation script, and run it: +```bash +curl http://vestacp.com/pub/vst-install.sh | bash +``` -

About

+How to install (3 step) +---------------------------- +If the above example does not work, try this 3 step method: +Connect to your server as root via SSH +```bash +ssh root@your.server +``` -

myVesta is a security and stability-focused fork of VestaCP, exclusively supporting Debian in order to maintain a streamlined ecosystem. Boasting a clean, clutter-free interface and the latest innovative technologies, our project is committed to staying synchronized with official VestaCP commits. We work independently to enhance security and develop new features, driven by our passion for contributing to the open-source community rather than monetary gain. As such, we will offer all features built for myVesta to the official VestaCP project through pull requests, without interfering with their development milestones.

- -

View Changelog -

- -

Links

- - -

Features of myVesta

- - -

How to install

Download the installation script: - -```shell -curl -O http://c.myvestacp.com/vst-install-debian.sh +```bash +curl -O http://vestacp.com/pub/vst-install.sh ``` - Then run it: - -```shell -bash vst-install-debian.sh +```bash +bash vst-install.sh ``` -Or use our installer generator. - -

Useful scripts

- - - -

Licence

-myVesta is licensed under GPL v3 license. - +License +---------------------------- +Vesta is licensed under [GPL v3 ](https://github.com/serghey-rodin/vesta/blob/master/LICENSE) license diff --git a/SECURITY.md b/SECURITY.md deleted file mode 100644 index 32d7405f..00000000 --- a/SECURITY.md +++ /dev/null @@ -1,5 +0,0 @@ -# Security Policy - -## Reporting a Vulnerability - -Please report security issues to info@myvestacp.com diff --git a/bin/v-activate-rocket-nginx b/bin/v-activate-rocket-nginx deleted file mode 100644 index 8b562c9b..00000000 --- a/bin/v-activate-rocket-nginx +++ /dev/null @@ -1,144 +0,0 @@ -#!/bin/bash -# info: Install rocket-nginx extension for certain domain -# options: DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Domain doesn't exist"; - exit 1; -fi - -if [ ! -f "/home/$user/web/$domain/public_html/wp-config.php" ]; then - echo 'Please install WordPress first.' - exit 1; -fi - -if [ ! -d "/etc/nginx/rocket-nginx" ]; then - echo "rocket-nginx is not installed"; - echo "Do you want to install it now (y/n)?" - read answer - if [ "$answer" == "y" ]; then - echo "Installing rocket-nginx..." - curl -sL https://c.myvestacp.com/tools/install-rocket-nginx.sh | bash - - else - echo "Exiting script" - exit 1; - fi -fi - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Changing Proxy Template -# Check if the proxy template is already set correctly -current_template=$(/usr/local/vesta/bin/v-list-web-domain $user $domain | grep 'PROXY:' | awk '{print $2}') -if [ "$current_template" == "wprocket-force-https" ] || [ "$current_template" == "wprocket-hosting" ] || [ "$current_template" == "wprocket-webp-express-force-https" ]; then - echo "Proxy Template is already set up correctly" -else - # Prompt the user to choose whether to force HTTPS or not - echo "Do you want to use wprocket-hosting template, wprocket-force-https template or wprocket-webp-express-force-https template (h/f/w):" - read answer - - # Change the proxy template based on the user's choice - if [ "$answer" == "h" ]; then - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "wprocket-hosting" - elif [ "$answer" == "f" ]; then - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "wprocket-force-https" - elif [ "$answer" == "w" ]; then - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "wprocket-webp-express-force-https" - fi - - echo "Proxy Template is ready" -fi - -# Disabling wp-cron in wp-config.php -cd /home/$user/web/$domain/public_html -checkstring_disable="define('DISABLE_WP_CRON', true)" -checkstring_enable="define('DISABLE_WP_CRON', false)" -string_disable="define( 'DISABLE_WP_CRON', true );" -line="/home/$user/web/$domain/cron.log" | grep -v "grep") - -if [ ! -z "$existing_cron" ]; then - echo "There is already a cron job added for user $user and domain $domain." -else - echo "Adding cron job..." - # Add the cron job - fpm_ver=$(/usr/local/vesta/bin/v-get-php-version-of-domain "$domain") - touch /home/$user/web/$domain/cron.log - chown $user:$user /home/$user/web/$domain/cron.log - - case $fpm_ver in - 5.6 | 7.0 | 7.1 | 7.2 | 7.3 | 7.4 | 8.0 | 8.1 | 8.2 | 8.3) - /usr/local/vesta/bin/v-add-cron-job "$user" "*/15" "*" "*" "*" "*" "cd /home/$user/web/$domain/public_html; /usr/bin/php$fpm_ver wp-cron.php >/home/$user/web/$domain/cron.log 2>&1" - ;; - esac -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# -echo "Installation is completed." -echo "Checking RESPONSE HEADERS (You should see x-rocket-nginx-serving-static if the WP Rocket plugin is activated):" -curl -I https://$domain - -exit diff --git a/bin/v-activate-vesta-license b/bin/v-activate-vesta-license index 8d9ebd20..6d5c875e 100755 --- a/bin/v-activate-vesta-license +++ b/bin/v-activate-vesta-license @@ -27,7 +27,7 @@ source $VESTA/conf/vesta.conf # Checking arg number check_args '2' "$#" 'MODULE LICENSE' -is_user_format_valid "$license" "license" + #----------------------------------------------------------# # Action # @@ -35,7 +35,7 @@ is_user_format_valid "$license" "license" # Activating license v_host='https://vestacp.com/checkout' -answer=$(curl --max-time 60 -s $v_host/activate.php?licence_key=$license&module=$module) +answer=$(curl -s $v_host/activate.php?licence_key=$license&module=$module) check_result $? "cant' connect to vestacp.com " $E_CONNECT # Checking server answer diff --git a/bin/v-add-backup-host b/bin/v-add-backup-host index bccaa03e..327703a7 100755 --- a/bin/v-add-backup-host +++ b/bin/v-add-backup-host @@ -38,7 +38,8 @@ EOF sftpc() { expect -f "-" </dev/null 2>&1 check_result $? "expect command not found" $E_NOTEXIST fi - host "$host" >/dev/null 2>&1 - check_result $? "host connection failed" "$E_CONNECT" fi diff --git a/bin/v-add-dns-on-web-alias b/bin/v-add-dns-on-web-alias index 705594f3..cc587483 100755 --- a/bin/v-add-dns-on-web-alias +++ b/bin/v-add-dns-on-web-alias @@ -50,12 +50,12 @@ domain_lvl=$(echo "$alias" |grep -o "\." |wc -l) # Adding second level domain if [ "$domain_lvl" -eq 1 ] || [ "${#top_domain}" -le '6' ]; then $BIN/v-add-dns-domain \ - $user $alias $ip '' '' '' '' '' '' '' '' $restart >> /dev/null + $user $alias $ip '' '' '' '' '' $restart >> /dev/null exit fi # Adding top-level domain and then its sub -$BIN/v-add-dns-domain $user $top_domain $ip '' '' '' '' '' '' '' '' $restart >> /dev/null +$BIN/v-add-dns-domain $user $top_domain $ip '' '' '' '' $restart >> /dev/null # Checking top-level domain if [ ! -e "$USER_DATA/dns/$top_domain.conf" ]; then diff --git a/bin/v-add-dns-record b/bin/v-add-dns-record index bbf8edd8..2b4c52ca 100755 --- a/bin/v-add-dns-record +++ b/bin/v-add-dns-record @@ -45,12 +45,10 @@ if [[ $rtype =~ NS|CNAME|MX|PTR|SRV ]]; then fi fi -if [ $rtype != "CAA" ]; then - dvalue=${dvalue//\"/} +dvalue=${dvalue//\"/} - if [[ "$dvalue" =~ [\;[:space:]] ]]; then - dvalue='"'"$dvalue"'"' - fi +if [[ "$dvalue" =~ [\;[:space:]] ]]; then + dvalue='"'"$dvalue"'"' fi # Additional argument formatting diff --git a/bin/v-add-firewall-ban b/bin/v-add-firewall-ban index 80143132..a1eed13e 100755 --- a/bin/v-add-firewall-ban +++ b/bin/v-add-firewall-ban @@ -72,13 +72,6 @@ $iptables -I fail2ban-$chain 1 -s $ip \ # Changing permissions chmod 660 $conf -# nginx deny rules conf -if [ "$chain" = "WEB" ] && [ -f "/etc/nginx/conf.d/block.conf" ]; then - if ! grep -q "deny $ip;" /etc/nginx/conf.d/block.conf; then - echo "deny $ip;" >> /etc/nginx/conf.d/block.conf - systemctl reload nginx - fi -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-add-firewall-chain b/bin/v-add-firewall-chain index 0bac12da..f963dade 100755 --- a/bin/v-add-firewall-chain +++ b/bin/v-add-firewall-chain @@ -21,12 +21,6 @@ protocol=$(echo $protocol|tr '[:lower:]' '[:upper:]') # Defining absolute path to iptables iptables="/sbin/iptables" -# Get vesta port by reading nginx.conf -vestaport=$(grep 'listen' $VESTA/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||") -if [ -z "$vestaport" ]; then - vestaport=8083 -fi - # Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf @@ -47,19 +41,13 @@ is_system_enabled "$FIREWALL_SYSTEM" 'FIREWALL_SYSTEM' # Checking known chains case $chain in - SSH) # Get ssh port by reading ssh config file. - sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2) - if [ -z "$sshport" ]; then - sshport=22 - fi - port=$sshport; - protocol=TCP ;; + SSH) port=22; protocol=TCP ;; FTP) port=21; protocol=TCP ;; MAIL) port='25,465,587,2525,110,995,143,993'; protocol=TCP ;; DNS) port=53; protocol=UDP ;; WEB) port='80,443'; protocol=TCP ;; DB) port='3306,5432'; protocol=TCP ;; - VESTA) port=$vestaport; protocol=TCP ;; + VESTA) port=8083; protocol=TCP ;; *) check_args '2' "$#" 'CHAIN PORT' ;; esac diff --git a/bin/v-add-firewall-rule b/bin/v-add-firewall-rule index b815778b..6fb867d3 100755 --- a/bin/v-add-firewall-rule +++ b/bin/v-add-firewall-rule @@ -83,16 +83,6 @@ sort_fw_rules # Updating system firewall $BIN/v-update-firewall -if [ "$WEB_SYSTEM" == 'nginx' ] || [ "$PROXY_SYSTEM" == 'nginx' ]; then - if [ "$port_ext" == "80,443" ] && [ "$action" == "DROP" ]; then - touch /etc/nginx/conf.d/block-firewall.conf - if ! grep -q "deny $ip;" /etc/nginx/conf.d/block-firewall.conf; then - echo "deny $ip;" >> /etc/nginx/conf.d/block-firewall.conf - systemctl restart nginx - fi - fi -fi - #----------------------------------------------------------# # Vesta # diff --git a/bin/v-add-letsencrypt-domain b/bin/v-add-letsencrypt-domain index a7c7fbb8..c69a21f1 100755 --- a/bin/v-add-letsencrypt-domain +++ b/bin/v-add-letsencrypt-domain @@ -1,8 +1,13 @@ #!/bin/bash -# info: check letsencrypt domain -# options: USER DOMAIN [ALIASES] +# info: adding letsencrypt ssl cetificate for domain +# options: USER DOMAIN [ALIASES] [RESTART] [NOTIFY] # -# The function check and validates domain with Let's Encript +# The function turns on SSL support for a domain. Parameter ssl_dir is a path +# to directory where 2 or 3 ssl files can be found. Certificate file +# domain.tld.crt and its key domain.tld.key are mandatory. Certificate +# authority domain.tld.ca file is optional. If home directory parameter +# (ssl_home) is not set, https domain uses public_shtml as separate +# documentroot directory. #----------------------------------------------------------# @@ -13,15 +18,8 @@ user=$1 domain=$2 aliases=$3 - -# LE API -API='https://acme-v02.api.letsencrypt.org' - -if [[ "$LE_STAGING" = 'yes' ]]; then - API='https://acme-staging-v02.api.letsencrypt.org' -fi - -deb_release=$(cat /etc/debian_version | tr "." "\n" | head -n1) +restart=$4 +notify=$5 # Includes source $VESTA/func/main.sh @@ -29,421 +27,98 @@ source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf # Additional argument formatting -format_identifier_idn() { - identifier_idn=$identifier - if [[ "$identifier_idn" = *[![:ascii:]]* ]]; then - identifier_idn=$(idn -t --quiet -a $identifier_idn) - fi -} - -# encode base64 -encode_base64() { - cat |base64 |tr '+/' '-_' |tr -d '\r\n=' -} - -# Let's Encrypt v2 curl function -query_le_v2() { - - protected='{"nonce": "'$3'",' - protected=''$protected' "url": "'$1'",' - protected=''$protected' "alg": "RS256", "kid": "'$KID'"}' - content="Content-Type: application/jose+json" - - payload_=$(echo -n "$2" |encode_base64) - protected_=$(echo -n "$protected" |encode_base64) - signature_=$(printf "%s" "$protected_.$payload_" |\ - openssl dgst -sha256 -binary -sign $USER_DATA/ssl/user.key |\ - encode_base64) - - post_data='{"protected":"'"$protected_"'",' - post_data=$post_data'"payload":"'"$payload_"'",' - post_data=$post_data'"signature":"'"$signature_"'"}' - - # Save http response to file passed as "$4" arg or print to stdout if not provided - # http response headers are always sent to stdout - local save_to_file=${4:-"/dev/stdout"} - if [ "$deb_release" -gt 8 ]; then - curl --location --user-agent "myVesta" --insecure --retry 5 --retry-connrefused --silent --dump-header /dev/stdout --data "$post_data" "$1" --header "$content" --output "$save_to_file" - else - curl --location --user-agent "myVesta" --insecure --retry 5 --silent --dump-header /dev/stdout --data "$post_data" "$1" --header "$content" --output "$save_to_file" - fi - } - +format_domain_idn #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# -check_args '2' "$#" 'USER DOMAIN [ALIASES]' -is_format_valid 'user' 'domain' 'aliases' +check_args '2' "$#" 'USER DOMAIN [ALIASES] [RESTART] [NOTIFY]' +is_format_valid 'user' 'domain' is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' +is_system_enabled "$WEB_SSL" 'SSL_SUPPORT' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" is_object_unsuspended 'web' 'DOMAIN' "$domain" -get_domain_values 'web' -echo "-----------------------------------------------------------------------------------" >> /usr/local/vesta/log/letsencrypt.log -echo "[$(date)] : v-add-letsencrypt-domain $domain [$aliases]" >> /usr/local/vesta/log/letsencrypt.log - -# check if alias is the letsencrypt wildcard domain, if not, make the normal checks -if [[ "$aliases" != "*.$domain" ]]; then - for alias in $(echo "$aliases" |tr ',' '\n' |sort -u); do - check_alias="$(echo $ALIAS |tr ',' '\n' |grep ^$alias$)" - if [ -z "$check_alias" ]; then - echo "[$(date)] : EXIT=domain alias $alias doesn't exist" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_NOTEXIST "domain alias $alias doesn't exist" - fi - done -fi; #----------------------------------------------------------# # Action # #----------------------------------------------------------# +# Parsing domain data +get_domain_values 'web' + # Registering LetsEncrypt user account -echo "[$(date)] : v-add-letsencrypt-user $user" >> /usr/local/vesta/log/letsencrypt.log $BIN/v-add-letsencrypt-user $user -echo "[$(date)] : result: $?" >> /usr/local/vesta/log/letsencrypt.log if [ "$?" -ne 0 ]; then touch $VESTA/data/queue/letsencrypt.pipe sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe send_notice "LETSENCRYPT" "Account registration failed" - echo "[$(date)] : EXIT=LE account registration" >> /usr/local/vesta/log/letsencrypt.log check_result $E_CONNECT "LE account registration" >/dev/null fi # Parsing LetsEncrypt account data source $USER_DATA/ssl/le.conf +email=$EMAIL -# Checking wildcard alias -if [ "$aliases" = "*.$domain" ]; then - echo "[$(date)] : Checking wildcard alias" >> /usr/local/vesta/log/letsencrypt.log - wildcard='yes' - proto="dns-01" - if [ ! -e "$VESTA/data/users/$user/dns/$domain.conf" ]; then - echo "[$(date)] : EXIT=DNS domain $domain doesn't exist" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_NOTEXIST "DNS domain $domain doesn't exist" - fi -else - proto="http-01" -fi - -# Requesting nonce / STEP 1 -echo "[$(date)] : --- Requesting nonce / STEP 1 ---" >> /usr/local/vesta/log/letsencrypt.log -echo "[$(date)] : curl -s -I \"$API/directory\"" >> /usr/local/vesta/log/letsencrypt.log -answer=$(curl --user-agent "myVesta" -s -I "$API/directory") -echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log -nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') -echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log -status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') -echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log -if [[ "$status" -ne 200 ]]; then - echo "[$(date)] : EXIT=Let's Encrypt nonce request status $status" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt nonce request status $status" -fi - -# Placing new order / STEP 2 -echo "[$(date)] : --- Placing new order / STEP 2 ---" >> /usr/local/vesta/log/letsencrypt.log -url="$API/acme/new-order" -payload='{"identifiers":[' -for identifier in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do - format_identifier_idn - payload=$payload'{"type":"dns","value":"'$identifier_idn'"},' -done -payload=$(echo "$payload"|sed "s/,$//") -payload=$payload']}' -# validation='pending' -# # Start counter to avoid infinite loop -# i=0 -# while [ "$validation" = 'pending' ]; do -# echo "[$(date)] : ----------------------- step 2 loop, counter \$i=$i -----------------------" >> /usr/local/vesta/log/letsencrypt.log -echo "[$(date)] : payload=$payload" >> /usr/local/vesta/log/letsencrypt.log -echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log -answer=$(query_le_v2 "$url" "$payload" "$nonce") -echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log -nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') -echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log -authz=$(echo "$answer" |grep "acme/authz" |cut -f2 -d '"') -echo "[$(date)] : authz=$authz" >> /usr/local/vesta/log/letsencrypt.log -finalize=$(echo "$answer" |grep 'finalize":' |cut -f4 -d '"') -echo "[$(date)] : finalize=$finalize" >> /usr/local/vesta/log/letsencrypt.log -order=$(echo -e "$answer" | grep -i location | cut -f2 -d \ | tr -d '\r\n') -echo "[$(date)] : order=$order" >> /usr/local/vesta/log/letsencrypt.log -status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ') -echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log -validation=$(echo "$answer" | grep 'status":' | cut -f4 -d '"') -echo "[$(date)] : validation=$validation" >> /usr/local/vesta/log/letsencrypt.log -if [[ "$status" -ne 201 ]]; then - echo "[$(date)] : EXIT=Let's Encrypt new auth status $status" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt new auth status $status" -fi -# # Exit the loop after 5 attempts -# i=$((i + 1)) -# if [ $i -gt 5 ]; then -# break -# fi -# sleep 2 -# done - -# Requesting authorization token / STEP 3 -echo "[$(date)] : --- Requesting authorization token / STEP 3 ---" >> /usr/local/vesta/log/letsencrypt.log -for auth in $authz; do - payload='' - echo "[$(date)] : for auth=$auth" >> /usr/local/vesta/log/letsencrypt.log - echo "[$(date)] : query_le_v2 \"$auth\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log - answer=$(query_le_v2 "$auth" "$payload" "$nonce") - echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log - url=$(echo "$answer" |grep -A3 $proto |grep url |cut -f 4 -d \") - echo "[$(date)] : url=$url" >> /usr/local/vesta/log/letsencrypt.log - token=$(echo "$answer" |grep -A3 $proto |grep token |cut -f 4 -d \") - echo "[$(date)] : token=$token" >> /usr/local/vesta/log/letsencrypt.log - nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') - echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log - status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') - echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log - if [[ "$status" -ne 200 ]]; then - echo "[$(date)] : EXIT=Let's Encrypt acme/authz bad status $status" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt acme/authz bad status $status" +# Validating domain and aliases +i=1 +for alias in $(echo $domain,$aliases |tr ',' '\n' |sort -u); do + $BIN/v-check-letsencrypt-domain $user $alias + if [ "$?" -ne 0 ]; then + touch $VESTA/data/queue/letsencrypt.pipe + sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe + send_notice "LETSENCRYPT" "$alias validation failed" + check_result $E_INVALID "LE domain validation" >/dev/null fi - # Configuring challenge / STEP 4 - echo "[$(date)] : --- Configuring challenge / STEP 4 ---" >> /usr/local/vesta/log/letsencrypt.log - echo "[$(date)] : wildcard=$wildcard" >> /usr/local/vesta/log/letsencrypt.log - if [ "$wildcard" = 'yes' ]; then - record=$(printf "%s" "$token.$THUMB" |\ - openssl dgst -sha256 -binary |encode_base64) - old_records=$($BIN/v-list-dns-records $user $domain plain|grep 'TXT') - old_records=$(echo "$old_records" |grep _acme-challenge |cut -f 1) - for old_record in $old_records; do - $BIN/v-delete-dns-record "$user" "$domain" "$old_record" - done - $BIN/v-add-dns-record "$user" "$domain" "_acme-challenge" "TXT" "$record" - exitstatus=$? - echo "[$(date)] : v-add-dns-record \"$user\" \"$domain\" \"_acme-challenge\" \"TXT\" \"$record\"" >> /usr/local/vesta/log/letsencrypt.log - if [ "$exitstatus" -ne 0 ]; then - echo "[$(date)] : EXIT=DNS _acme-challenge record wasn't created" >> /usr/local/vesta/log/letsencrypt.log - fi - check_result $exitstatus "DNS _acme-challenge record wasn't created" - systemctl restart bind9 - else - if [ "$WEB_SYSTEM" = 'nginx' ] || [ ! -z "$PROXY_SYSTEM" ]; then - if [ -f "/usr/local/vesta/web/inc/nginx_proxy" ]; then - # if vesta is behind main nginx - well_known="$HOMEDIR/$user/web/$domain/public_html/.well-known" - acme_challenge="$well_known/acme-challenge" - mkdir -p $acme_challenge - echo "$token.$THUMB" > $acme_challenge/$token - echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/vesta/log/letsencrypt.log - chown -R $user:$user $well_known - else - # default nginx method - conf="$HOMEDIR/$user/conf/web/nginx.$domain.conf_letsencrypt" - sconf="$HOMEDIR/$user/conf/web/snginx.$domain.conf_letsencrypt" - # if [ ! -e "$conf" ]; then - echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' \ - > $conf - echo ' default_type text/plain;' >> $conf - echo ' return 200 "$1.'$THUMB'";' >> $conf - echo '}' >> $conf - # fi - echo "[$(date)] : in $conf we put: $THUMB" >> /usr/local/vesta/log/letsencrypt.log - if [ ! -e "$sconf" ]; then - ln -s "$conf" "$sconf" - fi - echo "[$(date)] : v-restart-proxy" >> /usr/local/vesta/log/letsencrypt.log - $BIN/v-restart-proxy - if [ -z "$PROXY_SYSTEM" ]; then - # apache-less variant - echo "[$(date)] : v-restart-web" >> /usr/local/vesta/log/letsencrypt.log - $BIN/v-restart-web - fi - exitstatus=$? - if [ "$exitstatus" -ne 0 ]; then - echo "[$(date)] : EXIT=Proxy restart failed = $exitstatus" >> /usr/local/vesta/log/letsencrypt.log - fi - check_result $exitstatus "Proxy restart failed" >/dev/null - fi - else - well_known="$HOMEDIR/$user/web/$domain/public_html/.well-known" - acme_challenge="$well_known/acme-challenge" - mkdir -p $acme_challenge - echo "$token.$THUMB" > $acme_challenge/$token - chown -R $user:$user $well_known - echo "[$(date)] : in $acme_challenge/$token we put: $token.$THUMB" >> /usr/local/vesta/log/letsencrypt.log - # $BIN/v-restart-web - # check_result $? "Web restart failed" >/dev/null - fi - fi - - # Requesting ACME validation / STEP 5 - echo "[$(date)] : --- Requesting ACME validation / STEP 5 ---" >> /usr/local/vesta/log/letsencrypt.log - validation_check=$(echo "$answer" |grep '"valid"') - echo "[$(date)] : validation_check=$validation_check" >> /usr/local/vesta/log/letsencrypt.log - if [[ ! -z "$validation_check" ]]; then - validation='valid' - else - validation='pending' - fi - - # Doing pol check on status - i=1 - while [ "$validation" = 'pending' ]; do - i=0 - while true; do - echo "[$(date)] : ----------------------- Doing pol check on status, counter \$i=$i -----------------------" >> /usr/local/vesta/log/letsencrypt.log - payload='{}' - echo "[$(date)] : query_le_v2 \"$url\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log - answer=$(query_le_v2 "$url" "$payload" "$nonce") - echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log - url2=$(echo "$answer" |grep -A3 $proto |grep url |cut -f 4 -d \") - echo "[$(date)] : url2=$url2" >> /usr/local/vesta/log/letsencrypt.log - validation=$(echo "$answer"|grep -A1 $proto |tail -n1|cut -f4 -d \") - echo "[$(date)] : validation=$validation" >> /usr/local/vesta/log/letsencrypt.log - nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') - echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log - status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') - echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log - if [[ $(echo "$answer" | grep 'addressesResolved') != "" ]]; then - break - fi - if [ "$wildcard" = 'yes' ]; then - if [[ $(echo "$answer" | grep '"status": "valid"') != "" ]]; then - break - fi - fi - i=$((i + 1)) - if ((i > 30)); then - break - fi - sleep 2 - done - if [[ "$status" -ne 200 ]]; then - echo "[$(date)] : EXIT=Let's Encrypt validation status $status" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt validation status $status" - fi - - i=$((i + 1)) - if [ "$i" -gt 10 ]; then - echo "[$(date)] : EXIT=Let's Encrypt domain validation timeout" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt domain validation timeout" - fi - echo "[$(date)] : curl: $url2 :" >> /usr/local/vesta/log/letsencrypt.log - get_answer=$(curl --user-agent "myVesta" --silent -S "$url2") - echo "[$(date)] : get_answer=$get_answer" >> /usr/local/vesta/log/letsencrypt.log - sleeping=$((i*2)) - echo "[$(date)] : sleep $sleeping (i=$i)" >> /usr/local/vesta/log/letsencrypt.log - sleep $sleeping - done - if [ "$validation" = 'invalid' ]; then - echo "[$(date)] : EXIT=Let's Encrypt domain verification failed" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt domain verification failed" + # Checking LE limits per account + if [ "$i" -gt 100 ]; then + touch $VESTA/data/queue/letsencrypt.pipe + sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe + send_notice 'LETSENCRYPT' 'Limit of domains per account is reached' + check_result $E_LIMIT "LE can't sign more than 100 domains" fi + i=$((i++)) done - -# Generating new ssl certificate -ssl_dir=$($BIN/v-generate-ssl-cert "$domain" "info@$domain" "US" "California"\ +# Generating CSR +ssl_dir=$($BIN/v-generate-ssl-cert "$domain" "$email" "US" "California" \ "San Francisco" "Vesta" "IT" "$aliases" |tail -n1 |awk '{print $2}') -# Sending CSR to finalize order / STEP 6 -echo "[$(date)] : --- Sending CSR to finalize order / STEP 6 ---" >> /usr/local/vesta/log/letsencrypt.log - -csr=$(openssl req -in $ssl_dir/$domain.csr -outform DER |encode_base64) -payload='{"csr":"'$csr'"}' -echo "[$(date)] : query_le_v2 \"$finalize\" \"$payload\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log -answer=$(query_le_v2 "$finalize" "$payload" "$nonce") -echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log -nonce=$(echo "$answer" |grep -i nonce |cut -f2 -d \ |tr -d '\r\n') -echo "[$(date)] : nonce=$nonce" >> /usr/local/vesta/log/letsencrypt.log -status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') -echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log -certificate=$(echo "$answer"|grep 'certificate":' |cut -f4 -d '"') -echo "[$(date)] : certificate=$certificate" >> /usr/local/vesta/log/letsencrypt.log -if [[ "$status" -ne 200 ]]; then - echo "[$(date)] : EXIT=Let's Encrypt finalize bad status $status" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt finalize bad status $status" +# Signing CSR +crt=$($BIN/v-sign-letsencrypt-csr $user $domain $ssl_dir) +if [ "$?" -ne 0 ]; then + touch $VESTA/data/queue/letsencrypt.pipe + sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe + send_notice "LETSENCRYPT" "$alias validation failed" + check_result "$E_INVALID" "LE $domain validation" fi +echo "$crt" > $ssl_dir/$domain.crt -if [ "$nonce" = "" ]; then - echo "[$(date)] : EXIT=Let's Encrypt 'nonce' is empty after step 6" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt 'nonce' is empty after step 6" -fi - -if [ "$certificate" = "" ]; then - validation="processing" - i=1 - while [ "$validation" = "processing" ]; do - echo "[$(date)] : --- Polling server waiting for Certificate / STEP 7 ---" >> /usr/local/vesta/log/letsencrypt.log - answer=$(query_le_v2 "$order" "" "$nonce") - i=$((i + 1)) - - nonce=$(echo "$answer" | grep -i nonce | cut -f2 -d \ | tr -d '\r\n') - echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log - status=$(echo "$answer" | grep HTTP/ | tail -n1 | cut -f 2 -d ' ') - echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log - validation=$(echo "$answer" | grep 'status":' | cut -f4 -d '"') - echo "[$(date)] : validation=$validation" >> /usr/local/vesta/log/letsencrypt.log - certificate=$(echo "$answer" | grep 'certificate":' | cut -f4 -d '"') - echo "[$(date)] : certificate=$certificate" >> /usr/local/vesta/log/letsencrypt.log - sleep $((i * 2)) # Sleep for 2s, 4s, 6s, 8s - if [ $i -gt 10 ]; then - check_result "$E_CONNECT" "Certificate processing timeout ($domain)" - fi - done -fi - -if [ "$certificate" = "" ]; then - echo "[$(date)] : EXIT=Let's Encrypt 'certificate' is empty after step 7" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_CONNECT "Let's Encrypt 'certificate' is empty after step 7" -fi - -# Downloading signed certificate / STEP 8 -echo "[$(date)] : --- Downloading signed certificate / STEP 8 ---" >> /usr/local/vesta/log/letsencrypt.log -echo "[$(date)] : query_le_v2 \"$certificate\" \"\" \"$nonce\"" >> /usr/local/vesta/log/letsencrypt.log -answer=$(query_le_v2 "$certificate" "" "$nonce" "$ssl_dir/$domain.pem") -echo "[$(date)] : answer=$answer" >> /usr/local/vesta/log/letsencrypt.log -status=$(echo "$answer"|grep HTTP/ |tail -n1 |cut -f 2 -d ' ') -echo "[$(date)] : status=$status" >> /usr/local/vesta/log/letsencrypt.log -if [[ "$status" -ne 200 ]]; then - [ -d "$ssl_dir" ] && rm -rf "$ssl_dir" - echo "[$(date)] : EXIT=Let's Encrypt downloading signed cert failed status: $status" >> /usr/local/vesta/log/letsencrypt.log - check_result $E_NOTEXIST "Let's Encrypt downloading signed cert failed status: $status" -fi - -# Splitting up downloaded pem -# echo "[$(date)] : - Splitting up downloaded pem" >> /usr/local/vesta/log/letsencrypt.log -crt_end=$(grep -n 'END CERTIFICATE' $ssl_dir/$domain.pem |head -n1 |cut -f1 -d:) -# echo "[$(date)] : crt_end=$crt_end" >> /usr/local/vesta/log/letsencrypt.log -head -n $crt_end $ssl_dir/$domain.pem > $ssl_dir/$domain.crt - -pem_lines=$(wc -l $ssl_dir/$domain.pem |cut -f 1 -d ' ') -# echo "[$(date)] : pem_lines=$pem_lines" >> /usr/local/vesta/log/letsencrypt.log -ca_end=$(grep -n 'BEGIN CERTIFICATE' $ssl_dir/$domain.pem |tail -n1 |cut -f 1 -d :) -# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/vesta/log/letsencrypt.log -ca_end=$(( pem_lines - crt_end + 1 )) -# echo "[$(date)] : ca_end=$ca_end" >> /usr/local/vesta/log/letsencrypt.log -tail -n $ca_end $ssl_dir/$domain.pem > $ssl_dir/$domain.ca - -# Temporary fix for double "END CERTIFICATE" -if [[ $(head -n 1 $ssl_dir/$domain.ca) = "-----END CERTIFICATE-----" ]]; then - sed -i '1,2d' $ssl_dir/$domain.ca +# Dowloading CA certificate +le_certs='https://letsencrypt.org/certs' +x1='lets-encrypt-x1-cross-signed.pem.txt' +x3='lets-encrypt-x3-cross-signed.pem.txt' +issuer=$(openssl x509 -text -in $ssl_dir/$domain.crt |grep "Issuer:") +if [ -z "$(echo $issuer|grep X3)" ]; then + curl -s $le_certs/$x1 > $ssl_dir/$domain.ca +else + curl -s $le_certs/$x3 > $ssl_dir/$domain.ca fi # Adding SSL ssl_home=$(search_objects 'web' 'LETSENCRYPT' 'yes' 'SSL_HOME') $BIN/v-delete-web-domain-ssl $user $domain >/dev/null 2>&1 -echo "[$(date)] : v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home" >> /usr/local/vesta/log/letsencrypt.log $BIN/v-add-web-domain-ssl $user $domain $ssl_dir $ssl_home -exitstatus=$? -echo "[$(date)] : v-add-web-domain-ssl status: $exitstatus" >> /usr/local/vesta/log/letsencrypt.log -if [ "$exitstatus" -ne '0' ]; then +if [ "$?" -ne '0' ]; then touch $VESTA/data/queue/letsencrypt.pipe sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe - echo "[$(date)] : EXIT=$domain certificate installation failed" >> /usr/local/vesta/log/letsencrypt.log send_notice 'LETSENCRYPT' "$domain certificate installation failed" - check_result $exitstatus "SSL install" >/dev/null + check_result $? "SSL install" >/dev/null fi # Adding LE autorenew cronjob @@ -460,19 +135,23 @@ if [ -z "$LETSENCRYPT" ]; then fi update_object_value 'web' 'DOMAIN' "$domain" '$LETSENCRYPT' 'yes' -reset_web_counter "$user" "$domain" 'LETSENCRYPT_FAIL_COUNT' #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# -# Deleteing task from queue -touch $VESTA/data/queue/letsencrypt.pipe -sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe +# Restarting web +$BIN/v-restart-web $restart +if [ "$?" -ne 0 ]; then + send_notice 'LETSENCRYPT' "web server needs to be restarted manually" +fi # Notifying user send_notice 'LETSENCRYPT' "$domain SSL has been installed successfully" -echo "[$(date)] : EXIT=***** $domain SSL has been installed successfully *****" >> /usr/local/vesta/log/letsencrypt.log + +# Deleteing task from queue +touch $VESTA/data/queue/letsencrypt.pipe +sed -i "/ $domain /d" $VESTA/data/queue/letsencrypt.pipe # Logging log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-add-letsencrypt-user b/bin/v-add-letsencrypt-user index d2338e82..3b14cd69 100755 --- a/bin/v-add-letsencrypt-user +++ b/bin/v-add-letsencrypt-user @@ -1,8 +1,8 @@ #!/bin/bash # info: register letsencrypt user account -# options: USER +# options: USER [EMAIL] # -# The function creates and register LetsEncript account +# The function creates and register LetsEncript account key #----------------------------------------------------------# @@ -11,13 +11,8 @@ # Argument definition user=$1 - -# LE API -API='https://acme-v02.api.letsencrypt.org' - -if [[ "$LE_STAGING" = 'yes' ]]; then - API='https://acme-staging-v02.api.letsencrypt.org' -fi +email=$2 +key_size=4096 # Includes source $VESTA/func/main.sh @@ -28,38 +23,15 @@ encode_base64() { cat |base64 |tr '+/' '-_' |tr -d '\r\n=' } -# Let's Encrypt v2 curl function -query_le_v2() { - protected='{"nonce": "'$3'",' - protected=''$protected' "url": "'$1'",' - protected=''$protected' "alg": "RS256", "jwk": '$jwk'}' - content="Content-Type: application/jose+json" - - payload_=$(echo -n "$2" |encode_base64) - protected_=$(echo -n "$protected" |encode_base64) - signature_=$(printf "%s" "$protected_.$payload_" |\ - openssl dgst -sha256 -binary -sign $USER_DATA/ssl/user.key |\ - encode_base64) - - post_data='{"protected":"'"$protected_"'",' - post_data=$post_data'"payload":"'"$payload_"'",' - post_data=$post_data'"signature":"'"$signature_"'"}' - - curl --user-agent "myVesta" -s -i -d "$post_data" "$1" -H "$content" -} - #----------------------------------------------------------# # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'USER' +check_args '1' "$#" 'USER [EMAIL]' is_format_valid 'user' is_object_valid 'user' 'USER' "$user" if [ -e "$USER_DATA/ssl/le.conf" ]; then - source "$USER_DATA/ssl/le.conf" -fi -if [ ! -z "$KID" ]; then exit fi @@ -68,57 +40,57 @@ fi # Action # #----------------------------------------------------------# - -# Defining user email -if [[ -z "$EMAIL" ]]; then - EMAIL=$(get_user_value '$CONTACT') +api='https://acme-v01.api.letsencrypt.org' +if [ -z "$email" ]; then + email=$(get_user_value '$CONTACT') fi -# Defining user agreement -agreement='' +agreement=$(curl -s -I "$api/terms" |grep Location |cut -f 2 -d \ |tr -d '\r\n') -# Generating user key -KEY="$USER_DATA/ssl/user.key" -if [ ! -e "$KEY" ]; then - openssl genrsa -out $KEY 4096 >/dev/null 2>&1 - chmod 600 $KEY +# Generating key +key="$USER_DATA/ssl/user.key" +if [ ! -e "$key" ]; then + openssl genrsa -out $key $key_size >/dev/null 2>&1 + chmod 600 $key fi # Defining key exponent -if [ -z "$EXPONENT" ]; then - EXPONENT=$(openssl pkey -inform pem -in "$KEY" -noout -text_pub |\ - grep Exponent: |cut -f 2 -d '(' |cut -f 1 -d ')' |sed -e 's/x//' |\ - xxd -r -p |encode_base64) -fi +exponent=$(openssl pkey -inform pem -in "$key" -noout -text_pub |\ + grep Exponent: |cut -f 2 -d '(' |cut -f 1 -d ')' |sed -e 's/x//' |\ + xxd -r -p |encode_base64) # Defining key modulus -if [ -z "$MODULUS" ]; then - MODULUS=$(openssl rsa -in "$KEY" -modulus -noout |\ - sed -e 's/^Modulus=//' |xxd -r -p |encode_base64) -fi +modulus=$(openssl rsa -in "$key" -modulus -noout |\ + sed -e 's/^Modulus=//' |xxd -r -p |encode_base64) -# Defining JWK -jwk='{"e":"'$EXPONENT'","kty":"RSA","n":"'"$MODULUS"'"}' +# Defining key thumb +thumb='{"e":"'$exponent'","kty":"RSA","n":"'"$modulus"'"}' +thumb="$(echo -n "$thumb" |openssl dgst -sha256 -binary |encode_base64)" -# Defining key thumbnail -if [ -z "$THUMB" ]; then - THUMB="$(echo -n "$jwk" |openssl dgst -sha256 -binary |encode_base64)" -fi +# Defining JWK header +header='{"e":"'$exponent'","kty":"RSA","n":"'"$modulus"'"}' +header='{"alg":"RS256","jwk":'"$header"'}' +# Requesting nonce +nonce=$(curl -s -I "$api/directory" |grep Nonce |cut -f 2 -d \ |tr -d '\r\n') +protected=$(echo -n '{"nonce":"'"$nonce"'"}' |encode_base64) -# Requesting ACME nonce -nonce=$(curl -s -I "$API/directory" |grep -i nonce |cut -f2 -d\ |tr -d '\r\n') +# Defining registration query +query='{"resource":"new-reg","contact":["mailto:'"$email"'"],' +query=$query'"agreement":"'$agreement'"}' +payload=$(echo -n "$query" |encode_base64) +signature=$(printf "%s" "$protected.$payload" |\ + openssl dgst -sha256 -binary -sign "$key" |encode_base64) +data='{"header":'"$header"',"protected":"'"$protected"'",' +data=$data'"payload":"'"$payload"'","signature":"'"$signature"'"}' -# Creating ACME account -url="$API/acme/new-acct" -payload='{"termsOfServiceAgreed": true}' -answer=$(query_le_v2 "$url" "$payload" "$nonce") -kid=$(echo "$answer" |grep -i location: |cut -f2 -d ' '|tr -d '\r') +# Sending request to LetsEncrypt API +answer=$(curl -s -i -d "$data" "$api/acme/new-reg") +status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ') -# Checking answer status -status=$(echo "$answer" |grep HTTP/ |tail -n1 |cut -f2 -d ' ') -if [[ "${status:0:2}" -ne "20" ]]; then - check_result $E_CONNECT "Let's Encrypt acc registration failed $status" +# Checking http answer status +if [[ "$status" -ne "201" ]] && [[ "$status" -ne "409" ]]; then + check_result $E_CONNECT "LetsEncrypt account registration $status" fi @@ -127,17 +99,12 @@ fi #----------------------------------------------------------# # Adding le.conf -if [ ! -e "$USER_DATA/ssl/le.conf" ]; then - echo "EXPONENT='$EXPONENT'" > $USER_DATA/ssl/le.conf - echo "MODULUS='$MODULUS'" >> $USER_DATA/ssl/le.conf - echo "THUMB='$THUMB'" >> $USER_DATA/ssl/le.conf - echo "EMAIL='$EMAIL'" >> $USER_DATA/ssl/le.conf - echo "KID='$kid'" >> $USER_DATA/ssl/le.conf - chmod 660 $USER_DATA/ssl/le.conf -else - sed -i '/^KID=/d' $USER_DATA/ssl/le.conf - echo "KID='$kid'" >> $USER_DATA/ssl/le.conf -fi +echo "EMAIL='$email'" > $USER_DATA/ssl/le.conf +echo "EXPONENT='$exponent'" >> $USER_DATA/ssl/le.conf +echo "MODULUS='$modulus'" >> $USER_DATA/ssl/le.conf +echo "THUMB='$thumb'" >> $USER_DATA/ssl/le.conf +chmod 660 $USER_DATA/ssl/le.conf + # Logging log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 81da9e71..44925680 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -61,14 +61,8 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then fi str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota" echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd - userstr="$account:$account:$user:mail:$HOMEDIR/$user" - echo $userstr >> $HOMEDIR/$user/conf/mail/$domain/accounts fi -# Create mail account folder (mailbox) -mkdir $HOMEDIR/$user/mail/$domain/$account -chown $user:mail $HOMEDIR/$user/mail/$domain/$account -chmod 700 $HOMEDIR/$user/mail/$domain/$account #----------------------------------------------------------# # Vesta # diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index c26dadb2..2676e750 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -45,16 +45,6 @@ is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" is_domain_new 'mail' "$domain" is_package_full 'MAIL_DOMAINS' -# Allow mail symlink to HDD -check_symlink=1 -symlink=$(readlink $HOMEDIR/$user/mail) -if [ "$symlink" = "/hdd/home/$user/mail" ]; then - check_symlink=0 -fi - -if [ $check_symlink -eq 1 ]; then - is_dir_symlink $HOMEDIR/$user/mail -fi #----------------------------------------------------------# @@ -91,7 +81,6 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then touch $HOMEDIR/$user/conf/mail/$domain/aliases touch $HOMEDIR/$user/conf/mail/$domain/passwd touch $HOMEDIR/$user/conf/mail/$domain/fwd_only - touch $HOMEDIR/$user/conf/mail/$domain/accounts ln -s $HOMEDIR/$user/conf/mail/$domain \ /etc/$MAIL_SYSTEM/domains/$domain_idn @@ -120,7 +109,6 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then # Set ownership chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd - chown $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain/accounts chown $user:mail $HOMEDIR/$user/mail/$domain_idn fi diff --git a/bin/v-add-srs-support-to-exim b/bin/v-add-srs-support-to-exim deleted file mode 100644 index 4b7789ea..00000000 --- a/bin/v-add-srs-support-to-exim +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -gen_pass() { - MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' - if [ -z "$1" ]; then - LENGTH=32 - else - LENGTH=$1 - fi - while [ ${n:=1} -le $LENGTH ]; do - PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}" - let n+=1 - done - echo "$PASS" -} - -eximversion=$(exim4 --version | grep '^Exim version ' | awk '{print $3}') -if (( $(echo "$eximversion < 4.96" | bc -l) )); then - echo "= ERROR: Exim SRS support requires Exim 4.96 or higher." - echo "You have Exim $eximversion" - exit 1; -fi - -echo "=== Addind SRS support to Exim4 ===" -# SRS support is taken from HestiaCP - -if [ ! -f "/etc/exim4/srs.conf" ]; then - echo "= Generating SRS KEY" - srs=$(gen_pass 16) - echo $srs > /etc/exim4/srs.conf - chmod 640 /etc/exim4/srs.conf - chown root:Debian-exim /etc/exim4/srs.conf -fi - -if [ ! -f "/etc/exim4/exim4.conf.template.backup-without-srs" ]; then - echo "= Backing up /etc/exim4/exim4.conf.template" - cp /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf.template.backup-without-srs -fi - -if ! /usr/local/vesta/bin/v-grep 'SRS_SECRET = ' '/etc/exim4/exim4.conf.template' '-q'; then - echo "= Adding: SRS_SECRET = readfile /etc/exim4/srs.conf" - v-sed 'smtputf8_advertise_hosts =' 'smtputf8_advertise_hosts =\n\nSRS_SECRET = ${readfile{/etc/exim4/srs.conf}}' '/etc/exim4/exim4.conf.template' -fi - -if ! /usr/local/vesta/bin/v-grep 'if outbound, and forwarding has been done, use an alternate transport' '/etc/exim4/exim4.conf.template' '-q'; then - echo "= Patching \"dnslookup:\" block" - /usr/local/vesta/bin/v-php-func "replace_in_file_once_between_including_borders" "/etc/exim4/exim4.conf.template" 'dnslookup:' ' no_more' 'dnslookup:\n driver = dnslookup\n # if outbound, and forwarding has been done, use an alternate transport\n domains = ! +local_domains\n transport = ${if eq {$local_part@$domain} \\n {$original_local_part@$original_domain} \\n {remote_smtp} {remote_forwarded_smtp}}\n no_more' -fi - -if ! /usr/local/vesta/bin/v-grep 'inbound_srs:' '/etc/exim4/exim4.conf.template' '-q'; then - echo "= Adding \"inbound_srs\" and \"inbound_srs_failure\" blocks" - v-sed 'aliases:' 'inbound_srs:\n driver = redirect\n senders = :\n domains = +local_domains\n # detect inbound bounces which are converted to SRS, and decode them\n condition = ${if inbound_srs {$local_part} {SRS_SECRET}}\n data = $srs_recipient\n\ninbound_srs_failure:\n driver = redirect\n senders = :\n domains = +local_domains\n # detect inbound bounces which look converted to SRS but are invalid\n condition = ${if inbound_srs {$local_part} {}}\n allow_fail\n data = :fail: Invalid SRS recipient address\n\naliases:' '/etc/exim4/exim4.conf.template' -fi - -if ! /usr/local/vesta/bin/v-grep 'remote_forwarded_smtp:' '/etc/exim4/exim4.conf.template' '-q'; then - echo "= Adding \"remote_forwarded_smtp:\" block" - v-sed 'procmail:\n driver = pipe' 'remote_forwarded_smtp:\n driver = smtp\n dkim_domain = DKIM_DOMAIN\n dkim_selector = mail\n dkim_private_key = DKIM_PRIVATE_KEY\n dkim_canon = relaxed\n dkim_strict = 0\n hosts_try_fastopen = \n hosts_try_chunking = !93.188.3.0/24\n message_linelength_limit = 1G\n # modify the envelope from, for mails that we forward\n max_rcpt = 1\n return_path = ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}}\n\nprocmail:\n driver = pipe' '/etc/exim4/exim4.conf.template' -fi - -touch /etc/exim4/limit_per_email_account_max_sent_emails_per_hour -touch /etc/exim4/limit_per_email_account_max_recipients -touch /etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour -touch /etc/exim4/limit_per_hosting_account_max_recipients - -echo "= Restarting exim4 service" -systemctl restart exim4 - -if [ $? -ne 0 ]; then - systemctl status exim4 - cp /etc/exim4/exim4.conf.template.backup-without-srs /etc/exim4/exim4.conf.template - systemctl restart exim4 - echo "=== Patching failed, old exim conf returned, exim4 restarted again." - exit 1 -fi -echo "=== SRS support was added successfully. ===" - -exit 0 diff --git a/bin/v-add-sys-ip b/bin/v-add-sys-ip index 54245bcc..f278763b 100755 --- a/bin/v-add-sys-ip +++ b/bin/v-add-sys-ip @@ -60,8 +60,8 @@ if [ -z "$sys_ip_check" ]; then /sbin/ip addr add $ip/$cidr dev $interface \ broadcast $broadcast label $iface - # Adding RHEL/CentOS/Fedora/Amazon startup script - if [ -d "/etc/sysconfig" ]; then + # Adding RHEL/CentOS/Fedora startup script + if [ -e "/etc/redhat-release" ]; then sys_ip="# Added by vesta" sys_ip="$sys_ip\nDEVICE=$iface" sys_ip="$sys_ip\nBOOTPROTO=static" diff --git a/bin/v-add-sys-mail-ssl b/bin/v-add-sys-mail-ssl deleted file mode 100755 index 1ebffdc3..00000000 --- a/bin/v-add-sys-mail-ssl +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash -# info: copy mail ssl certificate -# options: USER DOMAIN [RESTART] -# -# The function copies user domain SSL to mail SSL directory - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -user=$1 -domain=$2 -restart=$3 - -# Includes -source $VESTA/func/main.sh -source $VESTA/func/domain.sh -source $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '2' "$#" 'USER DOMAIN [RESTART]' -is_format_valid 'user' 'domain' -is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM' -is_object_valid 'user' 'USER' "$user" -is_object_valid 'web' 'DOMAIN' "$domain" -is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL' - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Defining certificate location -dom_crt="/home/$user/conf/web/ssl.$domain.pem" -dom_key="/home/$user/conf/web/ssl.$domain.key" -vst_crt="$VESTA/ssl/mail.crt" -vst_key="$VESTA/ssl/mail.key" - -# Checking certificate -if [ ! -e "$dom_crt" ] || [ ! -e "$dom_key" ]; then - check_result $E_NOTEXIST "$domain certificate doesn't exist" -fi - -# Checking difference -diff $dom_crt $vst_crt >/dev/null 2>&1 -if [ $? -ne 0 ]; then - rm -f $vst_crt.old $vst_key.old - mv $vst_crt $vst_crt.old >/dev/null 2>&1 - mv $vst_key $vst_key.old >/dev/null 2>&1 - cp $dom_crt $vst_crt 2>/dev/null - cp $dom_key $vst_key 2>/dev/null - chown root:mail $vst_crt $vst_key -else - restart=no -fi - -# Updating mail certificate -case $MAIL_SYSTEM in - exim) conf='/etc/exim/exim.conf';; - exim4) conf='/etc/exim4/exim4.conf.template';; -esac -if [ -e "$conf" ]; then - sed -e "s|^tls_certificate.*|tls_certificate = $vst_crt|" \ - -e "s|^tls_privatekey.*|tls_privatekey = $vst_key|" -i $conf -fi - -# Updating imap certificate -conf="/etc/dovecot/conf.d/10-ssl.conf" -if [ ! -z "$IMAP_SYSTEM" ] && [ -e "$conf" ]; then - sed -e "s|ssl_cert.*|ssl_cert = <$vst_crt|" \ - -e "s|ssl_key.*|ssl_key = <$vst_key|" -i $conf -fi - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Restarting services -if [ "$restart" != 'no' ]; then - if [ ! -z "$MAIL_SYSTEM" ]; then - $BIN/v-restart-service $MAIL_SYSTEM - fi - if [ ! -z "$IMAP_SYSTEM" ]; then - $BIN/v-restart-service $IMAP_SYSTEM - fi -fi - -# Updating vesta.conf -if [ -z "$(grep MAIL_CERTIFICATE $VESTA/conf/vesta.conf)" ]; then - echo "MAIL_CERTIFICATE='$user:$domain'" >> $VESTA/conf/vesta.conf -else - sed -i "s/MAIL_CERTIFICATE.*/MAIL_CERTIFICATE='$user:$domain'/g" \ - $VESTA/conf/vesta.conf -fi - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-add-sys-quota b/bin/v-add-sys-quota index 93687e9c..35423a5d 100755 --- a/bin/v-add-sys-quota +++ b/bin/v-add-sys-quota @@ -21,7 +21,7 @@ source $VESTA/conf/vesta.conf # Checking quota package quota=$(which --skip-alias --skip-functions quota 2>/dev/null) if [ $? -ne 0 ]; then - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then yum -y install quota >/dev/null 2>&1 check_result $? "quota package installation failed" $E_UPDATE else diff --git a/bin/v-add-sys-vesta-ssl b/bin/v-add-sys-vesta-ssl deleted file mode 100755 index 32cd6c14..00000000 --- a/bin/v-add-sys-vesta-ssl +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# info: add vesta ssl certificate -# options: USER DOMAIN [RESTART] -# -# The function copies user domain SSL to vesta SSL directory - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -user=$1 -domain=$2 -restart=$3 - -# Includes -source $VESTA/func/main.sh -source $VESTA/func/domain.sh -source $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '2' "$#" 'USER DOMAIN [RESTART]' -is_format_valid 'user' 'domain' -is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' -is_object_valid 'user' 'USER' "$user" -is_object_valid 'web' 'DOMAIN' "$domain" -is_object_value_exist 'web' 'DOMAIN' "$domain" '$SSL' - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Defining certificate location -dom_crt="/home/$user/conf/web/ssl.$domain.pem" -dom_key="/home/$user/conf/web/ssl.$domain.key" -vst_crt="$VESTA/ssl/certificate.crt" -vst_key="$VESTA/ssl/certificate.key" - -# Checking certificate -if [ ! -e "$dom_crt" ] || [ ! -e "$dom_key" ]; then - check_result $E_NOTEXIST "$domain certificate doesn't exist" -fi - -# Checking difference -diff $dom_crt $vst_crt >/dev/null 2>&1 -if [ $? -ne 0 ]; then - rm -f $vst_crt.old $vst_key.old - mv $vst_crt $vst_crt.old - mv $vst_key $vst_key.old - cp $dom_crt $vst_crt 2>/dev/null - cp $dom_key $vst_key 2>/dev/null - chown root:mail $vst_crt $vst_key -else - restart=no -fi - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Restarting services -if [ "$restart" != 'no' ]; then - if [ ! -z "$MAIL_SYSTEM" ] && [ -z "$MAIL_CERTIFICATE" ]; then - $BIN/v-restart-service $MAIL_SYSTEM - fi - if [ ! -z "$IMAP_SYSTEM" ] && [ -z "$MAIL_CERTIFICATE" ]; then - $BIN/v-restart-service $IMAP_SYSTEM - fi - if [ ! -z "$FTP_SYSTEM" ]; then - $BIN/v-restart-service "$FTP_SYSTEM" - fi - if [ -e "/var/run/vesta-nginx.pid" ]; then - kill -HUP $(cat /var/run/vesta-nginx.pid) - else - service vesta restart - fi -fi - -# Updating vesta.conf -if [ -z "$(grep VESTA_CERTIFICATE $VESTA/conf/vesta.conf)" ]; then - echo "VESTA_CERTIFICATE='$user:$domain'" >> $VESTA/conf/vesta.conf -else - sed -i "s/VESTA_CERTIFICATE.*/VESTA_CERTIFICATE='$user:$domain'/g" \ - $VESTA/conf/vesta.conf -fi - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-add-user-package b/bin/v-add-user-package index e9fe210a..23f42725 100755 --- a/bin/v-add-user-package +++ b/bin/v-add-user-package @@ -28,44 +28,41 @@ is_package_new() { } is_package_consistent() { - parse_object_kv_list_non_eval $(cat $pkg_dir/$package.pkg) + source $pkg_dir/$package.pkg if [ "$WEB_DOMAINS" != 'unlimited' ]; then - is_int_format_valid $WEB_DOMAINS 'WEB_DOMAINS' + is_format_valid_int $WEB_DOMAINS 'WEB_DOMAINS' fi if [ "$WEB_ALIASES" != 'unlimited' ]; then - is_int_format_valid $WEB_ALIASES 'WEB_ALIASES' + is_format_valid_int $WEB_ALIASES 'WEB_ALIASES' fi if [ "$DNS_DOMAINS" != 'unlimited' ]; then - is_int_format_valid $DNS_DOMAINS 'DNS_DOMAINS' + is_format_valid_int $DNS_DOMAINS 'DNS_DOMAINS' fi if [ "$DNS_RECORDS" != 'unlimited' ]; then - is_int_format_valid $DNS_RECORDS 'DNS_RECORDS' + is_format_valid_int $DNS_RECORDS 'DNS_RECORDS' fi if [ "$MAIL_DOMAINS" != 'unlimited' ]; then - is_int_format_valid $MAIL_DOMAINS 'MAIL_DOMAINS' + is_format_valid_int $MAIL_DOMAINS 'MAIL_DOMAINS' fi if [ "$MAIL_ACCOUNTS" != 'unlimited' ]; then - is_int_format_valid $MAIL_ACCOUNTS 'MAIL_ACCOUNTS' + is_format_valid_int $MAIL_ACCOUNTS 'MAIL_ACCOUNTS' fi if [ "$DATABASES" != 'unlimited' ]; then - is_int_format_valid $DATABASES 'DATABASES' + is_format_valid_int $DATABASES 'DATABASES' fi if [ "$CRON_JOBS" != 'unlimited' ]; then - is_int_format_valid $CRON_JOBS 'CRON_JOBS' + is_format_valid_int $CRON_JOBS 'CRON_JOBS' fi if [ "$DISK_QUOTA" != 'unlimited' ]; then - is_int_format_valid $DISK_QUOTA 'DISK_QUOTA' + is_format_valid_int $DISK_QUOTA 'DISK_QUOTA' fi if [ "$BANDWIDTH" != 'unlimited' ]; then - is_int_format_valid $BANDWIDTH 'BANDWIDTH' + is_format_valid_int $BANDWIDTH 'BANDWIDTH' fi if [ "$BACKUPS" != 'unlimited' ]; then - is_int_format_valid $BACKUPS 'BACKUPS' + is_format_valid_int $BACKUPS 'BACKUPS' fi is_format_valid_shell $SHELL - is_web_template_valid $WEB_TEMPLATE - is_dns_template_valid $DNS_TEMPLATE - is_proxy_template_valid $PROXY_TEMPLATE } diff --git a/bin/v-add-vesta-softaculous b/bin/v-add-vesta-softaculous index b0cca53a..be96196c 100755 --- a/bin/v-add-vesta-softaculous +++ b/bin/v-add-vesta-softaculous @@ -46,7 +46,7 @@ fi #----------------------------------------------------------# # Cleaning yum cache -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then yum -q clean all yum="yum -q -y --noplugins --disablerepo=* --enablerepo=vesta" else @@ -57,7 +57,7 @@ fi # Updating php pacakge if [ -z "$($VESTA/php/bin/php -v|grep 'PHP 5.6')" ]; then - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then $yum -y update vesta-php check_result $? "vesta-php package upgrade failed" $E_UPDATE else @@ -67,7 +67,7 @@ if [ -z "$($VESTA/php/bin/php -v|grep 'PHP 5.6')" ]; then fi # Adding vesta-ioncube package -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then rpm -q vesta-ioncube >/dev/null 2>&1 if [ $? -ne 0 ]; then $yum -y install vesta-ioncube >/dev/null 2>&1 @@ -82,7 +82,7 @@ else fi # Adding vesta-softaculous package -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then rpm -q vesta-softaculous >/dev/null 2>&1 if [ $? -ne 0 ]; then $yum -y install vesta-softaculous >/dev/null 2>&1 @@ -98,8 +98,6 @@ fi # Installing softaculous if [ ! -e "$VESTA/softaculous/vst_installed" ]; then - mkdir -p /var/softaculous - chown -R admin:admin /var/softaculous cd $VESTA/softaculous wget -q http://c.vestacp.com/3rdparty/softaculous_install.inc $VESTA/php/bin/php softaculous_install.inc @@ -107,11 +105,9 @@ if [ ! -e "$VESTA/softaculous/vst_installed" ]; then touch $VESTA/softaculous/vst_installed fi -# Enabling symlink -if [ -e "$VESTA/disabled_plugins/softaculous" ]; then - if [ ! -e "$VESTA/web/softaculous" ]; then - mv $VESTA/disabled_plugins/softaculous $VESTA/web/softaculous - fi +# Adding symlink +if [ ! -e "$VESTA/web/softaculous" ]; then + ln -s $VESTA/softaculous/vesta $VESTA/web/softaculous fi # Updating SOFTACULOUS value diff --git a/bin/v-add-web-domain b/bin/v-add-web-domain index 72de559a..018adcb4 100755 --- a/bin/v-add-web-domain +++ b/bin/v-add-web-domain @@ -47,9 +47,6 @@ is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" is_package_full 'WEB_DOMAINS' 'WEB_ALIASES' is_domain_new 'web' "$domain,$aliases" -is_dir_symlink $HOMEDIR/$user/web -if_dir_exists $HOMEDIR/$user/web/$domain -is_dir_symlink $HOMEDIR/$user/web/$domain if [ ! -z "$ip" ]; then is_ip_valid "$ip" "$user" else @@ -65,7 +62,7 @@ fi source $USER_DATA/user.conf # Creating domain directories -sudo -u $user mkdir -p $HOMEDIR/$user/web/$domain \ +mkdir -p $HOMEDIR/$user/web/$domain \ $HOMEDIR/$user/web/$domain/public_html \ $HOMEDIR/$user/web/$domain/public_shtml \ $HOMEDIR/$user/web/$domain/document_errors \ @@ -82,7 +79,7 @@ ln -f -s /var/log/$WEB_SYSTEM/domains/$domain.*log \ $HOMEDIR/$user/web/$domain/logs/ # Adding domain skeleton -sudo -u $user cp -r $WEBTPL/skel/* $HOMEDIR/$user/web/$domain/ >/dev/null 2>&1 +cp -r $WEBTPL/skel/* $HOMEDIR/$user/web/$domain/ >/dev/null 2>&1 for file in $(find "$HOMEDIR/$user/web/$domain/" -type f); do sed -i "s/%domain%/$domain/g" $file done @@ -91,9 +88,9 @@ done chown -R $user:$user $HOMEDIR/$user/web/$domain chown root:$user /var/log/$WEB_SYSTEM/domains/$domain.* $conf chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.* -sudo -u $user chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/* -sudo -u $user chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs -sudo -u $user chmod 644 $HOMEDIR/$user/web/$domain/public_*html/*.* +chmod 751 $HOMEDIR/$user/web/$domain $HOMEDIR/$user/web/$domain/* +chmod 551 $HOMEDIR/$user/web/$domain/stats $HOMEDIR/$user/web/$domain/logs +chmod 644 $HOMEDIR/$user/web/$domain/public_*html/* # Addding PHP-FPM backend if [ ! -z "$WEB_BACKEND" ]; then @@ -115,12 +112,9 @@ if [ "$aliases" = 'none' ]; then ALIAS='' else ALIAS="www.$domain" - if [ -z "$aliases" ]; then - ALIAS="www.$domain" - else - ALIAS="$aliases" + if [ ! -z "$aliases" ]; then + ALIAS="$ALIAS,$aliases" fi - ip_alias=$(get_ip_alias $domain) if [ ! -z "$ip_alias" ]; then ALIAS="$ALIAS,$ip_alias" @@ -139,7 +133,7 @@ if [ ! -z "$PROXY_SYSTEM" ]; then if [ -z "$proxy_ext" ]; then PROXY_EXT="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls" PROXY_EXT="$PROXY_EXT,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp" - PROXY_EXT="$PROXY_EXT,rtf,js,mp3,avi,mpeg,flv,woff,woff2" + PROXY_EXT="$PROXY_EXT,rtf,js,mp3,avi,mpeg,flv,html,htm" fi add_web_config "$PROXY_SYSTEM" "$PROXY_TEMPLATE.tpl" fi @@ -166,9 +160,6 @@ echo "DOMAIN='$domain' IP='$ip' IP6='' ALIAS='$ALIAS' TPL='$WEB_TEMPLATE'\ STATS='' STATS_USER='' STATS_CRYPT='' U_DISK='0' U_BANDWIDTH='0'\ SUSPENDED='no' TIME='$time' DATE='$date'" >> $USER_DATA/web.conf -# Install unsigned SSL -$BIN/v-install-unsigned-ssl "$domain" "no" - # Restarting web server $BIN/v-restart-web $restart check_result $? "Web restart failed" >/dev/null diff --git a/bin/v-add-web-domain-proxy b/bin/v-add-web-domain-proxy index 330fa677..9bd42746 100755 --- a/bin/v-add-web-domain-proxy +++ b/bin/v-add-web-domain-proxy @@ -14,7 +14,8 @@ user=$1 domain=$2 template=$3 -default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2" +default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\ +exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm" extentions=${4-$default_extentions} restart="$5" diff --git a/bin/v-add-web-domain-ssl b/bin/v-add-web-domain-ssl index 6d9deb9b..4f1e83c0 100755 --- a/bin/v-add-web-domain-ssl +++ b/bin/v-add-web-domain-ssl @@ -120,42 +120,6 @@ check_result $? "Web restart failed" >/dev/null $BIN/v-restart-proxy $restart check_result $? "Proxy restart failed" >/dev/null -# Updating system ssl dependencies -if [ ! -z "$VESTA_CERTIFICATE" ]; then - crt_user=$(echo "$VESTA_CERTIFICATE" |cut -f 1 -d :) - crt_domain=$(echo "$VESTA_CERTIFICATE" |cut -f 2 -d :) - if [ "$user" = "$crt_user" ] && [ "$domain" = "$crt_domain" ]; then - $BIN/v-add-sys-vesta-ssl $user $domain >/dev/null 2>&1 - fi -fi -if [ ! -z "$MAIL_CERTIFICATE" ]; then - crt_user=$(echo "$MAIL_CERTIFICATE" |cut -f 1 -d :) - crt_domain=$(echo "$MAIL_CERTIFICATE" |cut -f 2 -d :) - if [ "$user" = "$crt_user" ] && [ "$domain" = "$crt_domain" ]; then - $BIN/v-add-sys-mail-ssl $user $domain >/dev/null 2>&1 - fi -fi - -if [ ! -z "$UPDATE_HOSTNAME_SSL" ] && [ "$UPDATE_HOSTNAME_SSL" = "yes" ]; then - hostname=$(hostname) - if [ "$hostname" = "$domain" ]; then - $BIN/v-update-host-certificate $user $domain - fi -fi - -UPDATE_SSL_SCRIPT='' -source $VESTA/conf/vesta.conf -if [ ! -z "$UPDATE_SSL_SCRIPT" ]; then - eval "$UPDATE_SSL_SCRIPT $user $domain" -fi - -UPDATE_SSL_SCRIPT2='' -source $VESTA/conf/vesta.conf -if [ ! -z "$UPDATE_SSL_SCRIPT2" ]; then - eval "$UPDATE_SSL_SCRIPT2 $user $domain" -fi - - # Logging log_history "enabled ssl support for $domain" log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-add-wordpress-admin b/bin/v-add-wordpress-admin deleted file mode 100644 index 60778fb2..00000000 --- a/bin/v-add-wordpress-admin +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# info: Add a WordPress admin user to a specific domain -# options: DOMAIN USERNAME PASSWORD EMAIL - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -if [ "$#" -lt 4 ]; then - echo "Usage: v-add-wordpress-admin [DOMAIN] [USERNAME] [PASSWORD] [EMAIL]" - exit 1 -fi - -# Importing system environment -source /etc/profile - -SILENT_MODE=1 - -# Argument definition -domain=$1 -username=$2 -password=$3 -email=$4 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '4' "$#" 'DOMAIN USERNAME PASSWORD EMAIL' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Domain doesn't exist"; - exit 1; -fi - -if [ ! -f "/home/$user/web/$domain/public_html/wp-config.php" ]; then - echo 'Please install WordPress first.' - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -/usr/local/vesta/bin/v-run-wp-cli $domain user create $username $email --role=administrator --user_pass="$password" --skip-plugins --skip-themes; - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit 0; diff --git a/bin/v-backup-user b/bin/v-backup-user index f6629c9e..2d545d71 100755 --- a/bin/v-backup-user +++ b/bin/v-backup-user @@ -22,9 +22,6 @@ source $VESTA/func/domain.sh source $VESTA/func/db.sh source $VESTA/conf/vesta.conf -if [ ! -z "$NOW" ]; then - BACKUP_LA_LIMIT=50 -fi #----------------------------------------------------------# # Verifications # @@ -42,13 +39,6 @@ is_backup_enabled # Action # #----------------------------------------------------------# -wait_for_backup_if_it_is_not_time_for_backup - -# Override backup path -if [ ! -z "$OVERRIDE_BACKUP_PATH" ]; then - BACKUP=$OVERRIDE_BACKUP_PATH -fi - # Set backup directory if undefined if [ -z "$BACKUP" ]; then BACKUP=/backup @@ -62,25 +52,24 @@ start_time=$(date '+%s') subj="$user → backup failed" email=$(grep CONTACT $VESTA/data/users/admin/user.conf |cut -f 2 -d \') -# Validate available disk space (take usage * 2, due to the backup handling) -let u_account=$(grep "U_DISK=" $VESTA/data/users/$user/user.conf |cut -f 2 -d \') -let u_disk=$(grep "U_DISK=" $VESTA/data/users/$user/user.conf |cut -f 2 -d \')*2 -let v_disk=$(($(stat -f --format="%a*%S" $BACKUP)))/1024/1024 - -if [ "$u_disk" -gt "$v_disk" ]; then - echo "account size : $u_account megabytes" |tee $BACKUP/$user.log - echo "available space on disk: $v_disk megabytes" |tee $BACKUP/$user.log - echo "needed space on disk : $u_disk megabytes" |tee $BACKUP/$user.log - echo "not enough disk space available to perform the backup." |$SENDMAIL -s "$subj" $email $notify - check_result $E_LIMIT "not enough disk space available to perform the backup." -fi - -if [ -z "$BACKUP_TEMP" ]; then - BACKUP_TEMP=$BACKUP -fi +# Checking load average +la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') +i=0 +while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do + echo -e "$(date "+%F %T") Load Average $la" + sleep 60 + if [ "$i" -ge "15" ]; then + la_error="LoadAverage $la is above threshold" + echo "$la_error" |$SENDMAIL -s "$subj" $email $notify + sed -i "/ $user /d" $VESTA/data/queue/backup.pipe + check_result $E_LA "$la_error" + fi + la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') + (( ++i)) +done # Creating temporary directory -tmpdir=$(mktemp -p $BACKUP_TEMP -d) +tmpdir=$(mktemp -p /tmp -d) if [ "$?" -ne 0 ]; then echo "Can't create tmp dir $tmpdir" |$SENDMAIL -s "$subj" $email $notify @@ -143,7 +132,6 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then i=0 for domain in $web_list; do - wait_for_backup_if_it_is_not_time_for_backup ((i ++)) echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log mkdir -p $tmpdir/web/$domain/conf @@ -154,25 +142,6 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then format_domain_idn get_domain_values 'web' - # backuping php-fpm conf file - if [[ $TPL == "PHP-FPM-"* ]]; then - fpm_tpl_ver=${TPL:8:2} - fpm_ver="${TPL:8:1}.${TPL:9:1}" - fpm_folder="$fpm_ver/fpm/pool.d" - fpm_path="$fpm_ver/fpm/pool.d/$domain.conf" - if [[ $TPL == *"-ioncube" ]]; then - fpm_folder="$fpm_ver/fpm/pool.d-ioncube" - fpm_path="$fpm_ver/fpm/pool.d-ioncube/$domain.conf" - fi - fpm_original_path="/etc/php/$fpm_path" - fpm_dest_path="$tmpdir/web/$domain/php/$fpm_path" - fpm_dest_folder="$tmpdir/web/$domain/php/$fpm_folder" - if [ -f "$fpm_original_path" ]; then - mkdir -p $fpm_dest_folder - cp $fpm_original_path $fpm_dest_path - fi - fi - # Backup web.conf cd $tmpdir/web/$domain/ conf="$USER_DATA/web.conf" @@ -243,37 +212,24 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB" != '*' ]; then cp $USER_DATA/ssl/$domain.* vesta/ fi - # Changin dir to documentroot - cd $HOMEDIR/$user/web/$domain - # Define exclude arguments exlusion=$(echo -e "$WEB" |tr ',' '\n' |grep "^$domain:") set -f fargs=() - fargs+=(--exclude='./logs/*') + fargs+=(--exclude='logs/*') if [ ! -z "$exlusion" ]; then xdirs="$(echo -e "$exlusion" |tr ':' '\n' |grep -v $domain)" for xpath in $xdirs; do - # Add ./ at the beginning of the path if the path is in old pattern - if [[ $xpath != ./* ]]; then - xpath=(./$xpath) - fi - - if [ -d "$xpath" ]; then - fargs+=(--exclude=$xpath/*) - echo "$(date "+%F %T") excluding directory $xpath" - msg="$msg\n$(date "+%F %T") excluding directory $xpath" - else - echo "$(date "+%F %T") excluding file $xpath" - msg="$msg\n$(date "+%F %T") excluding file $xpath" - fargs+=(--exclude=$xpath) - fi + fargs+=(--exclude=$xpath/*) + echo "$(date "+%F %T") excluding directory $xpath" + msg="$msg\n$(date "+%F %T") excluding directory $xpath" done fi set +f # Backup files - tar --anchored -cpf- ${fargs[@]} --exclude={'./','../'} . |gzip -$BACKUP_GZIP - > $tmpdir/web/$domain/domain_data.tar.gz + cd $HOMEDIR/$user/web/$domain + tar -cpf- * ${fargs[@]} |gzip -$BACKUP_GZIP - > $tmpdir/web/$domain/domain_data.tar.gz done # Print total @@ -349,7 +305,6 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then i=0 for domain in $mail_list; do - wait_for_backup_if_it_is_not_time_for_backup ((i ++)) echo -e "$(date "+%F %T") $domain" |tee -a $BACKUP/$user.log mkdir -p $tmpdir/mail/$domain/conf @@ -422,7 +377,6 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then conf="$USER_DATA/db.conf" db_list=$(echo "$db_list" |sed -e "s/ */\ /g" -e "s/^ //") for database in $db_list; do - wait_for_backup_if_it_is_not_time_for_backup ((i ++)) get_database_values @@ -434,34 +388,14 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB" != '*' ]; then grep "DB='$database'" $conf > vesta/db.conf dump="$tmpdir/db/$database/$database.$TYPE.sql" - dumpgz="$tmpdir/db/$database/$database.$TYPE.sql.gz" grants="$tmpdir/db/$database/conf/$database.$TYPE.$DBUSER" - if [ ! -f "$dumpgz" ]; then + case $TYPE in + mysql) dump_mysql_database ;; + pgsql) dump_pgsql_database ;; + esac - WAIT_LOOP_ENTERED=0 - while true - do - if pgrep -x "mysqldump" > /dev/null - then - WAIT_LOOP_ENTERED=1 - echo "Wait other mysqldump to finish" - sleep 1 - else - if [ "$WAIT_LOOP_ENTERED" -eq 1 ]; then - echo "We can use mysqldump now" - fi - break - fi - done - - case $TYPE in - mysql) dump_mysql_database ;; - pgsql) dump_pgsql_database ;; - esac - - # Compress dump - gzip -$BACKUP_GZIP $dump - fi + # Compress dump + gzip -$BACKUP_GZIP $dump done # Print total @@ -511,33 +445,26 @@ if [ "$USER" != '*' ]; then fi fargs=() for xpath in $(echo "$USER" |tr ',' '\n'); do - if [ -d "$xpath" ]; then - fargs+=(--exclude=$xpath/*) - echo "$(date "+%F %T") excluding directory $xpath" |\ + fargs+=(-not) + fargs+=(-path) + fargs+=("./$xpath*") + echo "$(date "+%F %T") excluding directory $xpath" |\ tee -a $BACKUP/$user.log - else - echo "$(date "+%F %T") excluding file $xpath" |\ - tee -a $BACKUP/$user.log - fargs+=(--exclude=$xpath) - fi done IFS=$'\n' set -f i=0 - for udir in $(ls -a |egrep -v "^conf$|^web$|^dns$|^tmp$|^mail$|^\.\.$|^\.$"); do + for udir in $(ls -a |egrep -v "^conf$|^web$|^dns$|^mail$|^\.\.$|^\.$"); do exclusion=$(echo "$USER" |tr ',' '\n' |grep "^$udir$") if [ -z "$exclusion" ]; then ((i ++)) - udir_str=$(echo "$udir" |sed -e "s|'|\\\'|g") - udir_list="$udir_list $udir_str" + udir_list="$udir_list $udir" echo -e "$(date "+%F %T") adding $udir" |tee -a $BACKUP/$user.log - wait_for_backup_if_it_is_not_time_for_backup - # Backup files and dirs - tar --anchored -cpf- ${fargs[@]} $udir |gzip -$BACKUP_GZIP - > $tmpdir/user_dir/$udir.tar.gz + tar -cpf- $udir |gzip -$BACKUP_GZIP - > $tmpdir/user_dir/$udir.tar.gz fi done set +f @@ -572,7 +499,7 @@ local_backup(){ backup_list=$(ls -lrt $BACKUP/ |awk '{print $9}' |grep "^$user\." | grep ".tar") backups_count=$(echo "$backup_list" |wc -l) if [ "$BACKUPS" -le "$backups_count" ]; then - backups_rm_number=$((backups_count - BACKUPS + 1)) + backups_rm_number=$((backups_count - BACKUPS)) # Removing old backup for backup in $(echo "$backup_list" |head -n $backups_rm_number); do @@ -648,7 +575,7 @@ ftp_backup() { fi # Debug info - echo -e "$(date "+%F %T") Remote: ftp://$HOST/$BPATH/$user.$backup_new_date.tar" + echo -e "$(date "+%F %T") Remote: ftp://$HOST$BPATH/$user.$backup_new_date.tar" # Checking ftp connection fconn=$(ftpc) @@ -686,19 +613,9 @@ ftp_backup() { else backup_list=$(ftpc "cd $BPATH" "ls" |awk '{print $9}' |grep "^$user\.") fi - if [ ! -z "$ONLY_ONE_FTP_BACKUP" ]; then - TEMP_BACKUPS=$BACKUPS - BACKUPS=1 - echo "=== Set BACKUPS=1" - fi - if [ ! -z "$KEEP_N_FTP_BACKUPS" ]; then - TEMP_BACKUPS=$BACKUPS - BACKUPS=$KEEP_N_FTP_BACKUPS - echo "=== Set BACKUPS=$KEEP_N_FTP_BACKUPS" - fi backups_count=$(echo "$backup_list" |wc -l) if [ "$backups_count" -ge "$BACKUPS" ]; then - backups_rm_number=$((backups_count - BACKUPS + 1)) + backups_rm_number=$((backups_count - BACKUPS)) for backup in $(echo "$backup_list" |head -n $backups_rm_number); do backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar$//") echo -e "$(date "+%F %T") Rotated ftp backup: $backup_date" |\ @@ -710,14 +627,6 @@ ftp_backup() { fi done fi - if [ ! -z "$ONLY_ONE_FTP_BACKUP" ]; then - BACKUPS=$TEMP_BACKUPS - echo "=== Bringing back old value BACKUPS=$BACKUPS" - fi - if [ ! -z "$KEEP_N_FTP_BACKUPS" ]; then - BACKUPS=$TEMP_BACKUPS - echo "=== Bringing back old value BACKUPS=$BACKUPS" - fi # Uploading backup archive if [ "$localbackup" = 'yes' ]; then @@ -860,18 +769,8 @@ sftp_backup() { backup_list=$(sftpc "cd $BPATH" "ls -l" |awk '{print $9}'|grep "^$user\.") fi backups_count=$(echo "$backup_list" |wc -l) - if [ ! -z "$ONLY_ONE_FTP_BACKUP" ]; then - TEMP_BACKUPS=$BACKUPS - BACKUPS=1 - echo "=== Set BACKUPS=1" - fi - if [ ! -z "$KEEP_N_FTP_BACKUPS" ]; then - TEMP_BACKUPS=$BACKUPS - BACKUPS=$KEEP_N_FTP_BACKUPS - echo "=== Set BACKUPS=$KEEP_N_FTP_BACKUPS" - fi if [ "$backups_count" -ge "$BACKUPS" ]; then - backups_rm_number=$((backups_count - BACKUPS + 1)) + backups_rm_number=$((backups_count - BACKUPS)) for backup in $(echo "$backup_list" |head -n $backups_rm_number); do backup_date=$(echo $backup |sed -e "s/$user.//" -e "s/.tar.*$//") echo -e "$(date "+%F %T") Rotated sftp backup: $backup_date" |\ @@ -883,14 +782,6 @@ sftp_backup() { fi done fi - if [ ! -z "$ONLY_ONE_FTP_BACKUP" ]; then - BACKUPS=$TEMP_BACKUPS - echo "=== Bringing back old value BACKUPS=$BACKUPS" - fi - if [ ! -z "$KEEP_N_FTP_BACKUPS" ]; then - BACKUPS=$TEMP_BACKUPS - echo "=== Bringing back old value BACKUPS=$BACKUPS" - fi # Uploading backup archive echo "$(date "+%F %T") Uploading $user.$backup_new_date.tar"|tee -a $BACKUP/$user.log diff --git a/bin/v-backup-user-now b/bin/v-backup-user-now deleted file mode 100644 index 10eecd87..00000000 --- a/bin/v-backup-user-now +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -export ALLOW_BACKUP_ANYTIME='yes' -export NOW='yes' - -nice -n 19 ionice -c 3 /usr/local/vesta/bin/v-backup-user $1 diff --git a/bin/v-backup-users b/bin/v-backup-users index 05550ded..e96eb2fb 100755 --- a/bin/v-backup-users +++ b/bin/v-backup-users @@ -4,13 +4,6 @@ # # The function backups all system users. -scriptname="v-backup-users" -for pid in $(pidof -x "$scriptname"); do - if [ $pid != $$ ]; then - echo "[$(date)] : $scriptname : Process is already running with PID $pid" - exit 1 - fi -done #----------------------------------------------------------# # Variable&Function # @@ -24,64 +17,28 @@ source /etc/profile source $VESTA/func/main.sh source $VESTA/conf/vesta.conf -ALLOW_MYSQL_REPAIR=1 - -if [ $# -ge 1 ]; then - ALLOW_MYSQL_REPAIR=$1 -fi - #----------------------------------------------------------# # Action # #----------------------------------------------------------# -log=$VESTA/log/backup.log - -# $BIN/v-check-vesta-license >/dev/null - -touch $log -if [ ! -z "$NOTIFY_ADMIN_FULL_BACKUP" ]; then - mv $log $log-`date +"%Y-%m-%d--%H:%M:%S"` -fi - -# Auto-repair all databases before backuping all accounts -if [ $ALLOW_MYSQL_REPAIR -eq 1 ]; then - nice -n 19 ionice -c 3 mysqlrepair --all-databases --check --auto-repair >> $log 2>&1 -fi +$BIN/v-check-vesta-license >/dev/null if [ -z "$BACKUP_SYSTEM" ]; then exit fi -FINAL_STATUS='OK' -i_am_in_backup_all_users=1 for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then - continue; - fi - wait_for_backup_if_it_is_not_time_for_backup check_suspend=$(grep "SUSPENDED='no'" $VESTA/data/users/$user/user.conf) + log=$VESTA/log/backup.log if [ ! -z "$check_suspend" ]; then echo -e "================================" >> $log echo -e "$user" >> $log echo -e "--------------------------------\n" >> $log - i_am_in_backup_all_users=0 - nice -n 19 ionice -c 3 $BIN/v-backup-user $user >> $log 2>&1 - STATUS=$? - if [ $STATUS -ne 0 ]; then - FINAL_STATUS='CONTAINS ERRORS !!!' - fi - i_am_in_backup_all_users=1 + $BIN/v-backup-user $user >> $log 2>&1 echo -e "\n--------------------------------\n\n" >> $log fi done -if [ ! -z "$NOTIFY_ADMIN_FULL_BACKUP" ]; then - cat $log |$SENDMAIL -s "Full backup report for $HOSTNAME; status=$FINAL_STATUS" "$NOTIFY_ADMIN_FULL_BACKUP" 'yes' -fi -if [ ! -z "$NOTIFY_ADMIN_FULL_BACKUP2" ]; then - cat $log |$SENDMAIL -s "Full backup report for $HOSTNAME; status=$FINAL_STATUS" "$NOTIFY_ADMIN_FULL_BACKUP2" 'yes' -fi - #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# diff --git a/bin/v-blacklist-email-account b/bin/v-blacklist-email-account deleted file mode 100644 index 59ec9cf8..00000000 --- a/bin/v-blacklist-email-account +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash -# info: Add a specific email address to exim4 and spamassassin blacklist -# usage: v-blacklist-email-account EMAIL - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Determine Debian version and set SpamAssassin service name -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) -if [ "$release" -lt 12 ]; then - SPAMD_SERVICE="spamassassin.service" -else - SPAMD_SERVICE="spamd.service" -fi - -DENY_SENDERS_FILE="/etc/exim4/deny_senders" -SPAMASSASSIN_FILE="/etc/spamassassin/local.cf" - -# Flags to track changes -SPAMASSASSIN_CHANGED=false - -# Function to check if an entry already exists in a file -check_entry_exists() { - local entry=$1 - local file=$2 - grep -qF "$entry" "$file" -} - -# Function to add an entry to a file -add_entry_to_file() { - local entry=$1 - local file=$2 - echo "$entry" >> "$file" -} - -# Display usage if no arguments are provided -if [ $# -lt 1 ]; then - echo "Usage: v-blacklist-email EMAIL" - exit 1 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -EMAIL=$1 - -# Validate email format -if [[ ! "$EMAIL" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]]; then - echo "Invalid email address format." - exit 1 -fi - -# Prepare entries for Exim4 and SpamAssassin -EXIM_ENTRY="$EMAIL" -SPAMASSASSIN_ENTRY="blacklist_from $EMAIL" - -#----------------------------------------------------------# -# Exim4 Blacklist # -#----------------------------------------------------------# - -echo "Updating $DENY_SENDERS_FILE..." -if ! check_entry_exists "$EXIM_ENTRY" "$DENY_SENDERS_FILE"; then - add_entry_to_file "$EXIM_ENTRY" "$DENY_SENDERS_FILE" - echo "Added $EXIM_ENTRY to $DENY_SENDERS_FILE." -else - echo "$EXIM_ENTRY already exists in $DENY_SENDERS_FILE." -fi - -#----------------------------------------------------------# -# SpamAssassin Blacklist # -#----------------------------------------------------------# - -echo "Updating $SPAMASSASSIN_FILE..." -if ! check_entry_exists "$SPAMASSASSIN_ENTRY" "$SPAMASSASSIN_FILE"; then - add_entry_to_file "$SPAMASSASSIN_ENTRY" "$SPAMASSASSIN_FILE" - echo "Added $SPAMASSASSIN_ENTRY to $SPAMASSASSIN_FILE." - SPAMASSASSIN_CHANGED=true -else - echo "$SPAMASSASSIN_ENTRY already exists in $SPAMASSASSIN_FILE." -fi - -if [ "$SPAMASSASSIN_CHANGED" == "true" ]; then - systemctl restart "$SPAMD_SERVICE" - echo "SpamAssassin service ($SPAMD_SERVICE) restarted." -fi - -#----------------------------------------------------------# -# Done # -#----------------------------------------------------------# - -exit 0 diff --git a/bin/v-blacklist-email-domain b/bin/v-blacklist-email-domain deleted file mode 100644 index a72a17a9..00000000 --- a/bin/v-blacklist-email-domain +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# info: Add a domain to exim4 and spamassassin blacklist -# usage: v-blacklist-email-domain DOMAIN SUBDOMAIN(YES/NO) - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Determine Debian version and set SpamAssassin service name -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) -if [ "$release" -lt 12 ]; then - SPAMD_SERVICE="spamassassin.service" -else - SPAMD_SERVICE="spamd.service" -fi - -DENY_SENDERS_FILE="/etc/exim4/deny_senders" -SPAMASSASSIN_FILE="/etc/spamassassin/local.cf" - -# Flags to track changes -SPAMASSASSIN_CHANGED=false - -# Function to check if a domain already exists in a file -check_domain_exists() { - local domain=$1 - local file=$2 - grep -qE "^${domain}$" "$file" -} - -# Function to check if a SpamAssassin entry already exists -check_spamassassin_exists() { - local entry=$1 - local file=$2 - grep -qF "$entry" "$file" -} - -# Function to add domain to file -add_domain_to_file() { - local domain=$1 - local file=$2 - echo "$domain" >> "$file" -} - -# Display usage if no arguments are provided -if [ $# -lt 2 ]; then - echo "Usage: v-blacklist-domain DOMAIN SUBDOMAIN(YES/NO)" - exit 1 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -DOMAIN=$1 -SUBDOMAIN=${2^^} # Convert to uppercase for consistency (YES/NO) - -# Validate SUBDOMAIN parameter -if [[ "$SUBDOMAIN" != "YES" && "$SUBDOMAIN" != "NO" ]]; then - echo "Invalid parameter for SUBDOMAIN. Use YES or NO." - exit 1 -fi - -# Prepare entries for Exim4 -EXIM_ENTRY_MAIN="$DOMAIN" -EXIM_ENTRY_SUB="*.$DOMAIN" - -# Prepare entries for SpamAssassin -SPAMASSASSIN_ENTRY_MAIN="blacklist_from *@${DOMAIN}" -SPAMASSASSIN_ENTRY_SUB="blacklist_from *.$DOMAIN" - -#----------------------------------------------------------# -# Exim4 Blacklist # -#----------------------------------------------------------# - -echo "Updating $DENY_SENDERS_FILE..." -if ! check_domain_exists "$EXIM_ENTRY_MAIN" "$DENY_SENDERS_FILE"; then - add_domain_to_file "$EXIM_ENTRY_MAIN" "$DENY_SENDERS_FILE" - echo "Added $EXIM_ENTRY_MAIN to $DENY_SENDERS_FILE." -else - echo "$EXIM_ENTRY_MAIN already exists in $DENY_SENDERS_FILE." -fi - -if [ "$SUBDOMAIN" == "YES" ]; then - if ! check_domain_exists "$EXIM_ENTRY_SUB" "$DENY_SENDERS_FILE"; then - add_domain_to_file "$EXIM_ENTRY_SUB" "$DENY_SENDERS_FILE" - echo "Added $EXIM_ENTRY_SUB to $DENY_SENDERS_FILE." - else - echo "$EXIM_ENTRY_SUB already exists in $DENY_SENDERS_FILE." - fi -fi - -#----------------------------------------------------------# -# SpamAssassin Blacklist # -#----------------------------------------------------------# - -echo "Updating $SPAMASSASSIN_FILE..." -if ! check_spamassassin_exists "$SPAMASSASSIN_ENTRY_MAIN" "$SPAMASSASSIN_FILE"; then - add_domain_to_file "$SPAMASSASSIN_ENTRY_MAIN" "$SPAMASSASSIN_FILE" - echo "Added $SPAMASSASSIN_ENTRY_MAIN to $SPAMASSASSIN_FILE." - SPAMASSASSIN_CHANGED=true -else - echo "$SPAMASSASSIN_ENTRY_MAIN already exists in $SPAMASSASSIN_FILE." -fi - -if [ "$SUBDOMAIN" == "YES" ]; then - if ! check_spamassassin_exists "$SPAMASSASSIN_ENTRY_SUB" "$SPAMASSASSIN_FILE"; then - add_domain_to_file "$SPAMASSASSIN_ENTRY_SUB" "$SPAMASSASSIN_FILE" - echo "Added $SPAMASSASSIN_ENTRY_SUB to $SPAMASSASSIN_FILE." - SPAMASSASSIN_CHANGED=true - else - echo "$SPAMASSASSIN_ENTRY_SUB already exists in $SPAMASSASSIN_FILE." - fi -fi - -if [ "$SPAMASSASSIN_CHANGED" == "true" ]; then - systemctl restart "$SPAMD_SERVICE" - echo "SpamAssassin service ($SPAMD_SERVICE) restarted." -fi - -#----------------------------------------------------------# -# Done # -#----------------------------------------------------------# - -exit 0 diff --git a/bin/v-change-database-owner b/bin/v-change-database-owner index 983f7cb1..d84d8eb2 100755 --- a/bin/v-change-database-owner +++ b/bin/v-change-database-owner @@ -60,10 +60,6 @@ if [ ! -z "$check_db" ]; then exit $E_EXISTS fi -if [ ! -d "/backup" ]; then - echo "There is no /backup folder, creating it now..." - mkdir /backup -fi #----------------------------------------------------------# # Action # diff --git a/bin/v-change-database-password-for-all-wordpress b/bin/v-change-database-password-for-all-wordpress deleted file mode 100644 index 1a364307..00000000 --- a/bin/v-change-database-password-for-all-wordpress +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# info: change db password to all wordpress databases -# options: -# -# The command is used for changing db password to all wordpress databases on the server. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Importing system variables -source /etc/profile - -# Includes -source $VESTA/func/main.sh - -only_user=''; -if [ ! -z "$1" ]; then - only_user=$1 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -touch /root/remember-db-user-pass.txt - -for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then - continue; - fi - - if [ ! -z "$only_user" ]; then - if [ "$only_user" != "$user" ]; then - continue; - fi - fi - - for domain in $(/usr/local/vesta/bin/v-list-web-domains $user plain |cut -f 1); do - if [ -f "/home/$user/web/$domain/public_html/wp-config.php" ]; then - /usr/local/vesta/bin/v-change-database-password-for-wordpress $domain $user - echo "--------------------------------" - fi - done - - if [ ! -z "$only_user" ]; then - break; - fi - -done - -# cat /root/remember-db-user-pass.txt -if [ -f "/root/remember-db-user-pass.txt" ]; then - rm /root/remember-db-user-pass.txt -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-change-database-password-for-wordpress b/bin/v-change-database-password-for-wordpress deleted file mode 100644 index 7f31b181..00000000 --- a/bin/v-change-database-password-for-wordpress +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/bash -# info: change database password for wordpress -# options: -# -# The command is used for changing database password for wordpress. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -# Check if number of arguments is 2 -if [ $# -eq 2 ]; then - user=$2 -else - user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -fi -USER=$user - -if [ -z "$user" ]; then - echo "ERROR: Domain $domain not found" - exit 1; -fi - -if [ ! -d "/home/$user" ]; then - echo "ERROR: User $user doesn't exist"; - exit 1; -fi - -# Includes -source /usr/local/vesta/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "ERROR: Domain doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ -f "/home/$user/web/$domain/public_html/wp-config.php" ]; then - echo "=== Domain: $domain" - wp_config_path="/home/$user/web/$domain/public_html/wp-config.php" - if grep -q $'\r' $wp_config_path; then - echo "=== removing CRLF from wp-config.php" - tr -d '\r' < $wp_config_path > /tmp/wp-config.php && mv /tmp/wp-config.php $wp_config_path - chown $user:$user $wp_config_path - fi - db_name=$(grep "DB_NAME" $wp_config_path | grep -oP "define\s*\(\s*'DB_NAME'\s*,\s*'\K[^']+") - db_user=$(grep "DB_USER" $wp_config_path | grep -oP "define\s*\(\s*'DB_USER'\s*,\s*'\K[^']+") - if [ -z "$db_name" ]; then - db_name=$(grep "DB_NAME" $wp_config_path | grep -oP "define\s*\(\s*'DB_NAME'\s*,\s*\"\K[^\"]+") - fi - if [ -z "$db_user" ]; then - db_user=$(grep "DB_USER" $wp_config_path | grep -oP "define\s*\(\s*'DB_USER'\s*,\s*\"\K[^\"]+") - fi - new_password='' - found_existing_password=0 - if [ -f "/root/remember-db-user-pass.txt" ]; then - db_user_pass=$(grep "$db_user:" /root/remember-db-user-pass.txt) - if [ -n "$db_user_pass" ]; then - new_password=$(echo "$db_user_pass" | cut -d':' -f2) - echo "= Using existing password for $db_user" - found_existing_password=1 - fi - fi - - if [ -z "$new_password" ]; then - new_password=$(generate_password) - fi - - echo "DB name: $db_name" - echo "DB user: $db_user" - echo "New DB password: $new_password" - if [ $found_existing_password -eq 0 ]; then - touch /root/remember-db-user-pass.txt - echo "$db_user:$new_password" >> /root/remember-db-user-pass.txt - chown root:root /root/remember-db-user-pass.txt - chmod 600 /root/remember-db-user-pass.txt - fi - /usr/local/vesta/bin/v-change-database-password "$user" "$db_name" "$new_password" - if [ $? -ne 0 ]; then - echo "*************** ERROR: Failed to change database password ***************" - exit 1; - fi - line="define('DB_PASSWORD', '$new_password');" - chattr -i $wp_config_path - sed -i "s/.*define(.*DB_PASSWORD'.*/$line/" $wp_config_path - new_password_line=$(grep "DB_PASSWORD" $wp_config_path) - echo "New DB password line: $new_password_line" - if [ "$new_password_line" != "$line" ]; then - echo "*************** ERROR: line in wp-config.php is not what we expected ***************" - echo "Expected: $line" - echo "Actual : $new_password_line" - echo "*************** ERROR: Please check wp-config.php manually ***************" - exit 1; - fi -else - echo "ERROR: WP-config.php not found" - exit 1; -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit 0; diff --git a/bin/v-change-dir-www b/bin/v-change-dir-www deleted file mode 100644 index 1f230099..00000000 --- a/bin/v-change-dir-www +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# info: Change directory to the public_html folder of a domain -# usage: source v-cd-www DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then - echo "This script must be sourced to change the current directory." - echo "Usage: source v-cd-www DOMAIN" - exit 1 -fi - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - return 1 -fi - -# Importing system environment -source /etc/profile -PATH=$PATH:/usr/local/vesta/bin && export PATH - -SILENT_MODE=1 - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) - -if [ -z "$user" ]; then - echo "Domain $domain doesn't exist" - return 1 -fi - -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "User $user doesn't exist" - return 1 -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Domain $domain doesn't have a public_html directory" - return 1 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -cd "/home/$user/web/$domain/public_html" - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -return 0 diff --git a/bin/v-change-domain-owner b/bin/v-change-domain-owner index ed5fa5a4..8f267307 100755 --- a/bin/v-change-domain-owner +++ b/bin/v-change-domain-owner @@ -35,9 +35,6 @@ if [ "$owner" = "$user" ]; then exit fi -USER_DATA=$VESTA/data/users/$owner -is_object_unsuspended 'user' 'USER' "$owner" -USER_DATA=$VESTA/data/users/$user #----------------------------------------------------------# # Action # @@ -60,11 +57,11 @@ if [ ! -z "$web_data" ]; then ssl_key=$VESTA/data/users/$owner/ssl/$domain.key ssl_ca=$VESTA/data/users/$owner/ssl/$domain.ca ssl_pem=$VESTA/data/users/$owner/ssl/$domain.pem - cp $ssl_crt $VESTA/data/users/$user/ssl/ - cp $ssl_key $VESTA/data/users/$user/ssl/ - cp $ssl_ca $VESTA/data/users/$user/ssl/ > /dev/null 2>&1 - cp $ssl_pem $VESTA/data/users/$user/ssl/ > /dev/null 2>&1 - # rm -f $HOMEDIR/$owner/conf/web/ssl.$domain.* + mv $ssl_crt $VESTA/data/users/$user/ssl/ + mv $ssl_key $VESTA/data/users/$user/ssl/ + mv $ssl_ca $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1 + mv $ssl_pem $VESTA/data/users/$user/ssl/ >> /dev/null 2>&1 + rm -f $HOMEDIR/$owner/conf/web/ssl.$domain.* fi # Check ftp user account @@ -82,23 +79,10 @@ if [ ! -z "$web_data" ]; then # Move data mv $HOMEDIR/$owner/web/$domain $HOMEDIR/$user/web/ - if [ -d "/hdd/home/$owner/web/$domain" ]; then - $BIN/v-move-folder-and-make-symlink /hdd/home/$owner/web/$domain /hdd/home/$user/web/$domain - fi - # Change ownership find $HOMEDIR/$user/web/$domain -user $owner \ -exec chown -h $user:$user {} \; - if [ "$SSL" = 'yes' ]; then - sleep 10 - rm $ssl_crt - rm $ssl_key - rm $ssl_ca > /dev/null 2>&1 - rm $ssl_pem > /dev/null 2>&1 - rm -f $HOMEDIR/$owner/conf/web/ssl.$domain.* - fi - # Rebuild config $BIN/v-unsuspend-web-domain $user $domain no >> /dev/null 2>&1 $BIN/v-rebuild-web-domains $owner no @@ -156,10 +140,6 @@ if [ ! -z "$mail_data" ]; then # Move data mv $HOMEDIR/$owner/mail/$domain $HOMEDIR/$user/mail/ - if [ -d "/hdd/home/$owner/mail/$domain" ]; then - $BIN/v-move-folder-and-make-symlink /hdd/home/$owner/mail/$domain /hdd/home/$user/mail/$domain - fi - # Change ownership find $HOMEDIR/$user/mail/$domain -user $owner \ -exec chown -h $user {} \; diff --git a/bin/v-change-firewall-rule b/bin/v-change-firewall-rule index aad2ec38..d2502bce 100755 --- a/bin/v-change-firewall-rule +++ b/bin/v-change-firewall-rule @@ -62,8 +62,6 @@ str="RULE='$rule' ACTION='$action' PROTOCOL='$protocol' PORT='$port_ext'" str="$str IP='$ip' COMMENT='$comment' SUSPENDED='no'" str="$str TIME='$time' DATE='$date'" -oldvalues=$(grep "RULE='$rule'" $VESTA/data/firewall/rules.conf) - # Deleting old rule sed -i "/RULE='$rule' /d" $VESTA/data/firewall/rules.conf @@ -76,14 +74,6 @@ sort_fw_rules # Updating system firewall $BIN/v-update-firewall -if [ "$WEB_SYSTEM" == 'nginx' ] || [ "$PROXY_SYSTEM" == 'nginx' ]; then - if [ "$port_ext" == "80,443" ] && [ "$action" == "DROP" ]; then - NEWIP=$ip - parse_object_kv_list_non_eval "$oldvalues" - sed -i "s|$IP|$NEWIP|g" /etc/nginx/conf.d/block-firewall.conf - systemctl restart nginx - fi -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-change-sys-config-value b/bin/v-change-sys-config-value index 3681075c..10657656 100755 --- a/bin/v-change-sys-config-value +++ b/bin/v-change-sys-config-value @@ -28,7 +28,6 @@ PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin" check_args '2' "$#" 'KEY VALUE' is_format_valid 'key' -format_no_quotes "$value" 'value' #----------------------------------------------------------# # Action # diff --git a/bin/v-change-sys-hostname b/bin/v-change-sys-hostname index c5a6adb1..bf1e8bae 100755 --- a/bin/v-change-sys-hostname +++ b/bin/v-change-sys-hostname @@ -31,16 +31,18 @@ is_format_valid 'domain' hostname $domain -if [ -d "/etc/sysconfig" ]; then - # RHEL/CentOS/Amazon +# RHEL/CentOS +if [ -e "/etc/redhat-release" ]; then touch /etc/sysconfig/network 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 +fi + +# Debian/Ubuntu +if [ ! -e "/etc/redhat-release" ]; then echo "$domain" > /etc/hostname fi diff --git a/bin/v-change-sys-ip-nat b/bin/v-change-sys-ip-nat index a3b24830..58232212 100755 --- a/bin/v-change-sys-ip-nat +++ b/bin/v-change-sys-ip-nat @@ -34,72 +34,48 @@ is_ip_valid "$ip" # Action # #----------------------------------------------------------# -# Updating IP +# Changing nat ip if [ -z "$(grep NAT= $VESTA/data/ips/$ip)" ]; then sed -i "s/^TIME/NAT='$nat_ip'\nTIME/g" $VESTA/data/ips/$ip - old='' - new=$nat_ip else - old=$(get_ip_value '$NAT') - new=$nat_ip - sed -i "s/NAT=.*/NAT='$new'/" $VESTA/data/ips/$ip - if [ -z "$nat_ip" ]; then - new=$ip + update_ip_value '$NAT' "$nat_ip" +fi + +# Check ftp system +if [ "$FTP_SYSTEM" = 'vsftpd' ]; then + + # Find configuration + if [ -e '/etc/vsftpd/vsftpd.conf' ]; then + conf='/etc/vsftpd/vsftpd.conf' fi -fi -# Updating WEB configs -if [ ! -z "$old" ] && [ ! -z "$WEB_SYSTEM" ]; then - sed -i "s/$old/$new/" $VESTA/data/users/*/web.conf - for user in $(ls $VESTA/data/users/); do - $BIN/v-rebuild-web-domains $user no - done - $BIN/v-restart-dns $restart -fi + if [ -e '/etc/vsftpd.conf' ]; then + conf='/etc/vsftpd.conf' + fi -# Updating DNS configs -if [ ! -z "$old" ] && [ ! -z "$DNS_SYSTEM" ]; then - sed -i "s/$old/$new/" $VESTA/data/users/*/dns.conf - sed -i "s/$old/$new/" $VESTA/data/users/*/dns/*.conf - for user in $(ls $VESTA/data/users/); do - $BIN/v-rebuild-dns-domains $user no - done - $BIN/v-restart-dns $restart -fi - -# Updating FTP -if [ ! -z "$old" ] && [ ! -z "$FTP_SYSTEM" ]; then - conf=$(find /etc -name $FTP_SYSTEM.conf) - if [ -e "$conf" ]; then - sed -i "s/$old/$new/g" $conf - if [ "$FTP_SYSTEM" = 'vsftpd' ]; then - check_pasv=$(grep pasv_address $conf) - if [ -z "$check_pasv" ] && [ ! -z "$nat_ip" ]; then - echo "pasv_address=$nat_ip" >> $conf - fi - if [ ! -z "$check_pasv" ] && [ -z "$nat_ip" ]; then - sed -i "/pasv_address/d" $conf - fi - if [ ! -z "$check_pasv" ] && [ ! -z "$nat_ip" ]; then - sed -i "s/pasv_address=.*/pasv_address='$nat_ip'/g" $conf - fi + # Update config + if [ -z "$(grep pasv_address $conf)" ]; then + if [ ! -z "$nat_ip" ]; then + echo "pasv_address=$nat_ip" >> $conf + fi + else + if [ ! -z "$nat_ip" ]; then + sed -i "s/pasv_address=.*/pasv_address='$nat_ip'/g" $conf + else + sed -i "/pasv_address/d" $conf fi fi - $BIN/v-restart-ftp $restart fi -# Updating firewall -if [ ! -z "$old" ] && [ ! -z "$FIREWALL_SYSTEM" ]; then - sed -i "s/$old/$new/g" $VESTA/data/firewall/*.conf - $BIN/v-update-firewall -fi - - #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# +# Restart ftp server +$BIN/v-restart-ftp $restart +check_result $? "FTP restart failed" >/dev/null + # Logging log_history "changed associated nat address on $ip to $nat_ip" '' 'admin' log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-change-sys-service-config b/bin/v-change-sys-service-config index 0500ecb9..97c14a17 100755 --- a/bin/v-change-sys-service-config +++ b/bin/v-change-sys-service-config @@ -95,21 +95,13 @@ if [ "$update" = 'yes' ] && [ "$restart" != 'no' ]; then if [ "$service" = 'php' ]; then if [ "$WEB_SYSTEM" = "nginx" ]; then - if [ $(ps --no-headers -o comm 1) == systemd ]; then - service=$(systemctl | grep -o -E "php.*fpm.*\.service") - service=${service//.service/} - else - service=$(ls /etc/init.d/php*fpm* |cut -f 4 -d /) - fi + service=$(ls /etc/init.d/php*fpm* |cut -f 4 -d / |sed -n 1p) else service=$WEB_SYSTEM fi fi - for single_service in $service; do - service $single_service restart >/dev/null 2>&1 - done <<< "$service" - + service $service restart >/dev/null 2>&1 if [ $? -ne 0 ]; then for config in $dst; do cat $config.vst.back > $config diff --git a/bin/v-change-user-package b/bin/v-change-user-package index 1e088bcc..d0de98db 100755 --- a/bin/v-change-user-package +++ b/bin/v-change-user-package @@ -16,7 +16,6 @@ force=$3 # Includes source $VESTA/func/main.sh -source $VESTA/func/domain.sh source $VESTA/conf/vesta.conf is_package_avalable() { @@ -24,7 +23,7 @@ is_package_avalable() { usr_data=$(cat $USER_DATA/user.conf) IFS=$'\n' for key in $usr_data; do - parse_object_kv_list_non_eval $key + eval ${key%%=*}=${key#*=} done WEB_DOMAINS='0' @@ -36,7 +35,7 @@ is_package_avalable() { pkg_data=$(cat $VESTA/data/packages/$package.pkg |grep -v TIME |\ grep -v DATE) - parse_object_kv_list_non_eval $pkg_data + eval $pkg_data # Checking usage agains package limits if [ "$WEB_DOMAINS" != 'unlimited' ]; then @@ -74,15 +73,11 @@ is_package_avalable() { check_result $E_LIMIT "Package doesn't cover BANDWIDTH usage" fi fi - - is_web_template_valid $WEB_TEMPLATE - is_dns_template_valid $DNS_TEMPLATE - is_proxy_template_valid $PROXY_TEMPLATE } change_user_package() { - parse_object_kv_list_non_eval $(cat $USER_DATA/user.conf) - parse_object_kv_list_non_eval $(cat $VESTA/data/packages/$package.pkg |egrep -v "TIME|DATE") + eval $(cat $USER_DATA/user.conf) + eval $(cat $VESTA/data/packages/$package.pkg |egrep -v "TIME|DATE") echo "FNAME='$FNAME' LNAME='$LNAME' PACKAGE='$package' diff --git a/bin/v-change-user-password b/bin/v-change-user-password index 30328641..a420502a 100755 --- a/bin/v-change-user-password +++ b/bin/v-change-user-password @@ -13,10 +13,6 @@ user=$1 password=$2; HIDE=2 -# Importing system enviroment as we run this script -# mostly by cron wich not read it by itself -source /etc/profile - # Includes source $VESTA/func/main.sh source $VESTA/conf/vesta.conf @@ -26,9 +22,6 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# -if [ "$user" = "root" ]; then - check_result $E_FORBIDEN "Changing root password is forbiden" -fi check_args '2' "$#" 'USER PASSWORD' is_format_valid 'user' is_object_valid 'user' 'USER' "$user" @@ -44,10 +37,6 @@ is_password_valid echo "$user:$password" | /usr/sbin/chpasswd md5=$(awk -v user=$user -F : 'user == $1 {print $2}' /etc/shadow) -if [ "$user" = 'admin' ] && [ -e "$VESTA/web/reset.admin" ]; then - rm -f $VESTA/web/reset.admin -fi - #----------------------------------------------------------# # Vesta # diff --git a/bin/v-change-user-rkey b/bin/v-change-user-rkey deleted file mode 100644 index 38777e4c..00000000 --- a/bin/v-change-user-rkey +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash -# info: change user rkey -# options: USER -# -# The function changes user's RKEY value. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -user=$1 - -# Includes -source $VESTA/func/main.sh -source $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -if [ "$user" = "root" ]; then - check_result $E_FORBIDEN "Changing root password is forbiden" -fi - -check_args '1' "$#" 'USER' -is_format_valid 'user' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -hash=$(generate_password) -d=$(date +%s) - -# Changing RKEY value -update_user_value "$user" '$RKEY' "$hash" - -#check if RKEYEXP exists -if [ -z "$(grep RKEYEXP $USER_DATA/user.conf)" ]; then - sed -i "s/^RKEY/RKEYEXP='$d'\nRKEY/g" $USER_DATA/user.conf -else - update_user_value "$user" '$RKEYEXP' "$d" -fi - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_history "changed rkey" -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-change-vesta-port b/bin/v-change-vesta-port deleted file mode 100755 index 7ea7827e..00000000 --- a/bin/v-change-vesta-port +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# info: change vesta port -# options: port -# -# Function will change vesta port - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -port=$1 - -if [ -z "$VESTA" ]; then - VESTA="/usr/local/vesta" -fi - -# Get current vesta port by reading nginx.conf -oldport=$(grep 'listen' $VESTA/nginx/conf/nginx.conf | awk '{print $2}' | sed "s|;||") -if [ -z "$oldport" ]; then - oldport=8083 -fi - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -# Checking permissions -if [ "$(id -u)" != '0' ]; then - check_result $E_FORBIDEN "You must be root to execute this script" -fi - -check_args '1' "$#" 'PORT' -is_int_format_valid "$port" 'port number' - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -sed -i "s|$oldport;|$port;|g" $VESTA/nginx/conf/nginx.conf -sed -i "s|$oldport ssl;|$port ssl;|g" $VESTA/nginx/conf/nginx.conf -if [ -f "/etc/roundcube/plugins/password/config.inc.php" ]; then - sed -i "s|'$oldport'|'$port'|g" /etc/roundcube/plugins/password/config.inc.php -fi -sed -i "s|'$oldport'|'$port'|g" $VESTA/data/firewall/rules.conf -$VESTA/bin/v-update-firewall -systemctl restart fail2ban.service -sed -i "s| $oldport | $port |g" /etc/iptables.rules -systemctl restart vesta - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit 0; diff --git a/bin/v-change-web-domain-ip b/bin/v-change-web-domain-ip index 5b2ab31b..17eb55d9 100755 --- a/bin/v-change-web-domain-ip +++ b/bin/v-change-web-domain-ip @@ -49,7 +49,7 @@ is_ip_valid "$ip" "$user" # Preparing variables for vhost replace get_domain_values 'web' old=$(get_real_ip $IP) -new=$(get_real_ip $ip) +new=$ip # Replacing vhost replace_web_config "$WEB_SYSTEM" "$TPL.tpl" diff --git a/bin/v-change-web-domain-proxy-tpl b/bin/v-change-web-domain-proxy-tpl index 93f67723..4d022cb9 100755 --- a/bin/v-change-web-domain-proxy-tpl +++ b/bin/v-change-web-domain-proxy-tpl @@ -14,7 +14,8 @@ user=$1 domain=$2 domain_idn=$2 template=$3 -default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2" +default_extentions="jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,\ +exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,html,htm" extentions=${4-$default_extentions} restart="$5" diff --git a/bin/v-change-wordpress-admin-passwords b/bin/v-change-wordpress-admin-passwords deleted file mode 100644 index bca23ad8..00000000 --- a/bin/v-change-wordpress-admin-passwords +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/bash -# info: interactively delete or change WordPress admin passwords for a given domain -# options: DOMAIN -# -# d → delete user (with content reassignment) -# c → change password (random 10-char alnum) -# s → skip -# x → exit - -#----------------------------------------------------------# -# Variable & Function # -#----------------------------------------------------------# - -[ "$(whoami)" != "root" ] && { echo "You must be root to run this command."; exit 1; } -source /etc/profile - -DOMAIN="$1" -[ -z "$DOMAIN" ] && { echo "Usage: v-change-wp-admins-pass DOMAIN"; exit 1; } - -USER="$(/usr/local/vesta/bin/v-search-domain-owner "$DOMAIN")" -[ -z "$USER" ] && { echo "Domain $DOMAIN does not exist."; exit 1; } - -WP_PATH="/home/$USER/web/$DOMAIN/public_html" -[ ! -f "$WP_PATH/wp-config.php" ] && { echo "WordPress is not installed on this domain."; exit 1; } - -# WP-CLI wrapper -if [ ! -z "$PHP" ]; then - WP_RUN="PHP=$PHP /usr/local/vesta/bin/v-run-wp-cli $DOMAIN --skip-plugins --skip-themes" -else - WP_RUN="/usr/local/vesta/bin/v-run-wp-cli $DOMAIN --skip-plugins --skip-themes" -fi - -# random 10-char password -gen_pass() { tr -dc 'A-Za-z0-9' > /home/$USER/web/$DOMAIN/wp-admin-password-change.txt - chown $USER:$USER /home/$USER/web/$DOMAIN/wp-admin-password-change.txt - chmod 600 /home/$USER/web/$DOMAIN/wp-admin-password-change.txt - else - cat /home/$USER/web/$DOMAIN/wp-cli-error.log - echo "Failed to change password for $TARGET." - fi - break - ;; - [Ss]* ) - echo "Skipping $TARGET." - break - ;; - [Xx]* ) - echo "Exiting." - exit 0 - ;; - * ) echo "Please answer d, c, s, or x." ;; - esac - done -done <<< "$ADMIN_LIST_CSV" - -if [ -f /home/$USER/web/$DOMAIN/wp-admin-password-change.txt ]; then - echo "" - echo "" - echo "-------------------------------------" - echo "For website $DOMAIN - new wp-admin passwords have been set." - echo "-------------------------------------" - cat /home/$USER/web/$DOMAIN/wp-admin-password-change.txt - echo "-------------------------------------" - echo "" - echo "" - read -r -p "Do you want to save the new passwords to a file /home/$USER/web/$DOMAIN/wp-admin-password-change.txt ? (y/n, default: n) " SAVE_PASSWORDS < /dev/tty - if [ -z "$SAVE_PASSWORDS" ]; then - SAVE_PASSWORDS="n" - fi - if [[ $SAVE_PASSWORDS =~ ^[Nn]$ ]]; then - rm /home/$USER/web/$DOMAIN/wp-admin-password-change.txt - fi -fi - -#----------------------------------------------------------# -# flush cache and refresh all security salts # -#----------------------------------------------------------# - -echo "-------------------------------------" -echo -echo "Flushing cache and refreshing salts..." - -RUN="$WP_RUN cache flush" -eval "$RUN" -RUN="$WP_RUN config shuffle-salts WP_CACHE_KEY_SALT --force" -eval "$RUN" -RUN="$WP_RUN config shuffle-salts" -eval "$RUN" - -echo "Cache flushed and salts refreshed." - -echo -echo "Done." - -exit 0 diff --git a/bin/v-check-api-key b/bin/v-check-api-key deleted file mode 100755 index 66284e69..00000000 --- a/bin/v-check-api-key +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# info: check api key -# options: KEY -# -# The function checks a key file in /usr/local/vesta/data/keys/ - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -if [ -z "$1" ]; then - echo "Error: key missmatch" - exit 9 -fi -key=$(basename $1) -ip=${2-127.0.0.1} -time_n_date=$(date +'%T %F') -time=$(echo "$time_n_date" |cut -f 1 -d \ ) -date=$(echo "$time_n_date" |cut -f 2 -d \ ) - -if [[ -z $key || ${#key} -lt 16 ]]; then - echo "Error: not valid keys" - echo "$date $time api $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ ! -e $VESTA/data/keys/$key ]; then - echo "Error: key missmatch" - echo "$date $time api $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -echo "$date $time api $ip successfully launched" >> $VESTA/log/auth.log - -exit diff --git a/bin/v-check-letsencrypt-domain b/bin/v-check-letsencrypt-domain new file mode 100755 index 00000000..97e24878 --- /dev/null +++ b/bin/v-check-letsencrypt-domain @@ -0,0 +1,162 @@ +#!/bin/bash +# info: check letsencrypt domain +# options: USER DOMAIN +# +# The function check and validates domain with LetsEncript + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument definition +user=$1 +domain=$2 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + +# encode base64 +encode_base64() { + cat |base64 |tr '+/' '-_' |tr -d '\r\n=' +} + +# Additional argument formatting +format_domain_idn + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '2' "$#" 'USER DOMAIN' +is_format_valid 'user' 'domain' +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' +is_object_valid 'user' 'USER' "$user" +is_object_unsuspended 'user' 'USER' "$user" +if [ ! -e "$USER_DATA/ssl/le.conf" ]; then + check_result $E_NOTEXIST "LetsEncrypt key doesn't exist" +fi +rdomain=$(egrep "'$domain'|'$domain,|,$domain,|,$domain'" $USER_DATA/web.conf) +if [ -z "$rdomain" ]; then + check_result $E_NOTEXIST "domain $domain doesn't exist" +fi + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +source $USER_DATA/ssl/le.conf +api='https://acme-v01.api.letsencrypt.org' +r_domain=$(echo "$rdomain" |cut -f 2 -d \') +key="$USER_DATA/ssl/user.key" +exponent="$EXPONENT" +modulus="$MODULUS" +thumb="$THUMB" + +# Defining JWK header +header='{"e":"'$exponent'","kty":"RSA","n":"'"$modulus"'"}' +header='{"alg":"RS256","jwk":'"$header"'}' + +# Requesting nonce +nonce=$(curl -s -I "$api/directory" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') +protected=$(echo -n '{"nonce":"'"$nonce"'"}' |encode_base64) + +# Defining ACME query (request challenge) +query='{"resource":"new-authz","identifier"' +query=$query':{"type":"dns","value":"'"$domain_idn"'"}}' +payload=$(echo -n "$query" |encode_base64) +signature=$(printf "%s" "$protected.$payload" |\ + openssl dgst -sha256 -binary -sign "$key" |encode_base64) +data='{"header":'"$header"',"protected":"'"$protected"'",' +data=$data'"payload":"'"$payload"'","signature":"'"$signature"'"}' + +# Sending request to LetsEncrypt API +answer=$(curl -s -i -d "$data" "$api/acme/new-authz") + +# Checking http answer status +status=$(echo "$answer" |grep HTTP/1.1 |tail -n1 |cut -f2 -d ' ') +if [[ "$status" -ne "201" ]]; then + check_result $E_CONNECT "LetsEncrypt challenge request $status" +fi + +# Parsing domain nonce,token and uri +nonce=$(echo "$answer" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') +protected=$(echo -n '{"nonce":"'"$nonce"'"}' |encode_base64) +token=$(echo "$answer" |grep -A 3 http-01 |grep token |cut -f 4 -d \") +uri=$(echo "$answer" |grep -A 3 http-01 |grep uri |cut -f 4 -d \") + +# Adding location wrapper for request challenge +if [ "$WEB_SYSTEM" = 'nginx' ] || [ "$PROXY_SYSTEM" = 'nginx' ]; then + conf="$HOMEDIR/$user/conf/web/nginx.$r_domain.conf_letsencrypt" + sconf="$HOMEDIR/$user/conf/web/snginx.$r_domain.conf_letsencrypt" + if [ ! -e "$conf" ]; then + echo 'location ~ "^/\.well-known/acme-challenge/(.*)$" {' > $conf + echo ' default_type text/plain;' >> $conf + echo ' return 200 "$1.'$thumb'";' >> $conf + echo '}' >> $conf + fi + if [ ! -e "$sconf" ]; then + ln -s "$conf" "$sconf" + fi +else + acme="$HOMEDIR/$user/web/$r_domain/public_html/.well-known/acme-challenge" + if [ ! -d "$acme" ]; then + mkdir -p $acme + fi + echo "$token.$thumb" > $acme/$token + chown -R $user:$user $HOMEDIR/$user/web/$r_domain/public_html/.well-known +fi + +# Restarting web server +if [ -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-web + check_result $? "Proxy restart failed" >/dev/null +else + $BIN/v-restart-proxy + $BIN/v-restart-web + check_result $? "Web restart failed" >/dev/null +fi + +# Defining ACME query (request validation) +query='{"resource":"challenge","type":"http-01","keyAuthorization"' +query=$query':"'$token.$thumb'","token":"'$token'"}' +payload=$(echo -n "$query" |encode_base64) +signature=$(printf "%s" "$protected.$payload" |\ + openssl dgst -sha256 -binary -sign "$key" |encode_base64) +data='{"header":'"$header"',"protected":"'"$protected"'",' +data=$data'"payload":"'"$payload"'","signature":"'"$signature"'"}' + +# Sending request to LetsEncrypt API +answer=$(curl -s -i -d "$data" "$uri") + +# Checking domain validation status +i=1 +status=$(echo $answer |tr ',' '\n' |grep status |cut -f 4 -d \") +location=$(echo "$answer" |grep Location: |awk '{print $2}' |tr -d '\r\n') +while [ "$status" = 'pending' ]; do + answer=$(curl -s -i "$location") + detail="$(echo $answer |tr ',' '\n' |grep detail |cut -f 4 -d \")" + status=$(echo "$answer" |tr ',' '\n' |grep status |cut -f 4 -d \") + sleep 1 + i=$((i + 1)) + if [ "$i" -gt 60 ]; then + check_result $E_CONNECT "$detail" + fi +done +if [ "$status" = 'invalid' ]; then + detail="$(echo $answer |tr ',' '\n' |grep detail |cut -f 4 -d \")" + check_result $E_CONNECT "$detail" +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$ARGUMENTS" + +exit diff --git a/bin/v-check-user-hash b/bin/v-check-user-hash deleted file mode 100755 index a18aba0e..00000000 --- a/bin/v-check-user-hash +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# info: check user hash -# options: USER HASH [IP] -# -# The function verifies user hash - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -user=$1 -hash=$2; HIDE=2 -ip=${3-127.0.0.1} - -# Includes -source $VESTA/func/main.sh -source $VESTA/conf/vesta.conf - -time_n_date=$(date +'%T %F') -time=$(echo "$time_n_date" |cut -f 1 -d \ ) -date=$(echo "$time_n_date" |cut -f 2 -d \ ) - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - - -check_args '2' "$#" 'USER HASH' -is_format_valid 'user' - -# Checking user -if [ ! -d "$VESTA/data/users/$user" ] && [ "$user" != 'root' ]; then - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - -# Checking user hash -is_hash_valid - -# Checking empty hash -if [[ -z "$hash" ]]; then - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - - -# Parsing user's salt -shadow=$(grep "^$user:" /etc/shadow | cut -f 2 -d :) - -if echo "$shadow" | grep -qE '^\$[0-9a-z]+\$[^\$]+\$' -then - salt=$(echo "$shadow" |cut -f 3 -d \$) - method=$(echo "$shadow" |cut -f 2 -d \$) - if [ "$method" -eq '1' ]; then - method='md5' - elif [ "$method" -eq '6' ]; then - method='sha-512' - else - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 - fi -else - salt=${shadow:0:2} - method='des' -fi - -# Checking salt -if [ -z "$salt" ]; then - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - -# Comparing hashes -if [[ "$shadow" != "$hash" ]]; then - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -echo "$date $time $user $ip successfully logged in" >> $VESTA/log/auth.log - -exit diff --git a/bin/v-check-user-password b/bin/v-check-user-password index fbb0221e..6d829c3a 100755 --- a/bin/v-check-user-password +++ b/bin/v-check-user-password @@ -82,8 +82,7 @@ if [ -z "$salt" ]; then fi # Generating hash -set -o noglob -hash=$($BIN/v-generate-password-hash $method $salt <<< "$password") +hash=$($BIN/v-generate-password-hash $method $salt <<< $password) if [[ -z "$hash" ]]; then echo "Error: password missmatch" echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log diff --git a/bin/v-check-vesta-license b/bin/v-check-vesta-license index 18c7dab4..7fa1a12c 100755 --- a/bin/v-check-vesta-license +++ b/bin/v-check-vesta-license @@ -42,7 +42,7 @@ for str in $modules; do license=$(echo "$str" |cut -f 2 -d \') if [ ! -z "$license" ]; then v_host='https://vestacp.com/checkout' - answer=$(curl --max-time 60 -s "$v_host/check.php?licence_key=$license&module=$module") + answer=$(curl -s "$v_host/check.php?licence_key=$license&module=$module") check_result $? "cant' connect to vestacp.com " 0 echo "$module $license $answer" if [[ "$answer" != '0' ]]; then diff --git a/bin/v-clean-garbage b/bin/v-clean-garbage deleted file mode 100644 index 11e29122..00000000 --- a/bin/v-clean-garbage +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# info: Clean all unnecessary files like logs -# options: NONE -# -# The function is cleaning all unnecessary files like logs - -#----------------------------------------------------------# -# Verifications & Variable & Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -echo "===== Before cleaning =====" -df -h -echo "===========================" - -# Includes -source /usr/local/vesta/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# turn off tailf watcher process -if [ -f "/usr/local/bin/tailf_apache_error.php" ]; then - kill $(ps aux | grep 'tailf_apache_error' | grep -v "grep tailf_apache_error" | awk '{print $2}') -fi -if [ -f "/usr/local/bin/tailf_exim.php" ]; then - kill $(ps aux | grep 'tailf_exim' | grep -v "grep tailf_exim" | awk '{print $2}') -fi - -find /tmp/ -type f -mtime +7 -delete -rm /var/backups/* > /dev/null 2>&1 -rm /var/cache/apt/archives/* > /dev/null 2>&1 -cd /var/log -truncate -s 0 xferlog lastlog faillog btmp syslog; -find /var/log/ -name "*.log" -not -path "/var/log/apt/*" -type f -exec truncate -s 0 {} \; -find /var/log/ -name "*.err" -type f -exec truncate -s 0 {} \; -find /var/log/ -name "errors" -type f -exec truncate -s 0 {} \; -find /var/log/ -name "*.info" -type f -exec truncate -s 0 {} \; -find /var/log/ -name "*.warn" -type f -exec truncate -s 0 {} \; -find /var/log/ -type f -name "*.1" -delete -find /var/log/ -type f -name "*.2" -delete -find /var/log/ -type f -name "*.3" -delete -find /var/log/ -type f -name "*.4" -delete -find /var/log/ -type f -name "*.5" -delete -find /var/log/ -type f -name "*.6" -delete -find /var/log/ -type f -name "*.7" -delete -find /var/log/ -type f -name "*.8" -delete -find /var/log/ -type f -name "*.9" -delete -find /var/log/ -name "*.gz" -type f -delete -find /usr/local/vesta/log/ -type f -name "*.log" -exec truncate -s 0 {} \; -find /usr/local/vesta/log/ -type f -not -name "*.log" -delete -find /var/log/exim4/ -type f -exec truncate -s 0 {} \; -truncate -s 0 /*.log > /dev/null 2>&1 -rm /panic-*.log > /dev/null 2>&1 -rm /var/log/panic-*.log > /dev/null 2>&1 - -clean_home() { - nice -n 19 ionice -c 3 find $1/*/tmp/ -type f -delete > /dev/null 2>&1 - find $1/ -name '.wp-cli' -type d -exec rm -rf {} \; > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/aiowps_backups/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/envato-backups/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/ai1wm-backups/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/wpvividbackups/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/updraft/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/plugins/ezpz-one-click-backup/backups/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/backups-dup-lite/ -type f -not -name ".htaccess" -not -name "index.php" -not -name "index.html" -not -name "web.config" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/wp-content/cache/ -type f -not -name ".htaccess" -delete > /dev/null 2>&1 - find $1/*/web/*/public_html/ -type f -name "*.wpress" -delete > /dev/null 2>&1 - nice -n 19 ionice -c 3 find $1/*/tmp/ -type f -mtime +1 -delete > /dev/null 2>&1 - nice -n 19 ionice -c 3 find $1/*/web/*/public_html/ -type f -name "error_log" -exec truncate -s 0 {} \; - nice -n 19 ionice -c 3 find $1/*/web/*/public_html/ -type f -name "error_log.txt" -exec truncate -s 0 {} \; - nice -n 19 ionice -c 3 find $1/ -type f -name "*.log" -exec truncate -s 0 {} \; -} - -clean_home "/home" -if [ -d "/hdd/home" ]; then - clean_home "/hdd/home" -fi - -# Cleaning fail2ban database -fail2ban_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'fail2ban' | grep -c 'running') -if [ $fail2ban_running -eq 1 ]; then - systemctl stop fail2ban -fi -if [ -f "/var/lib/fail2ban/fail2ban.sqlite3" ]; then - rm /var/lib/fail2ban/fail2ban.sqlite3 - if [ -f "/etc/nginx/conf.d/block.conf" ]; then - truncate -s 0 /etc/nginx/conf.d/block.conf - nginx_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'nginx' | grep -c 'running') - if [ $nginx_running -eq 1 ]; then - systemctl restart nginx - fi - fi -fi -if [ $fail2ban_running -eq 1 ]; then - systemctl start fail2ban -fi - -# turn on tailf watcher process -if [ -f "/usr/local/bin/tailf_apache_error.php" ]; then - nohup php /usr/local/bin/tailf_apache_error.php > /var/log/tailf_apache_error.log 2>&1 & -fi -if [ -f "/usr/local/bin/tailf_exim.php" ]; then - nohup php /usr/local/bin/tailf_exim.php > /var/log/tailf_exim.log 2>&1 & -fi - -exim_installed=$(/usr/local/vesta/bin/v-list-sys-services | grep -c 'exim') -if [ $exim_installed -gt 0 ]; then - systemctl restart exim4 -fi - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -echo "" -echo "***** Garbage cleaned *****" -echo "" -echo "===== After cleaning ======" -df -h -echo "===========================" - - -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-clear-fail2ban b/bin/v-clear-fail2ban deleted file mode 100644 index ab3ab30c..00000000 --- a/bin/v-clear-fail2ban +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# info: Clean fail2ban database -# options: NONE -# -# The function is cleaning fail2ban database - -#----------------------------------------------------------# -# Verifications & Variable & Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# check if fail2ban is installed -fail2ban_installed=$(/usr/local/vesta/bin/v-list-sys-services | grep -c 'fail2ban') -if [ $fail2ban_installed -eq 0 ]; then - echo "Fail2ban is not installed" - exit 1 -fi - -# Includes -source /usr/local/vesta/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Cleaning fail2ban database -fail2ban_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'fail2ban' | grep -c 'running') -if [ $fail2ban_running -eq 1 ]; then - echo "== Stopping fail2ban" - systemctl stop fail2ban -fi -if [ -f "/var/lib/fail2ban/fail2ban.sqlite3" ]; then - echo "== Cleaning fail2ban database" - rm /var/lib/fail2ban/fail2ban.sqlite3 - if [ -f "/etc/nginx/conf.d/block.conf" ]; then - echo "== Cleaning nginx block.conf" - truncate -s 0 /etc/nginx/conf.d/block.conf - nginx_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'nginx' | grep -c 'running') - if [ $nginx_running -eq 1 ]; then - echo "== Restarting nginx" - systemctl restart nginx - fi - fi -fi -if [ $fail2ban_running -eq 1 ]; then - echo "== Starting fail2ban" - systemctl start fail2ban -fi - -echo "== Done, fail2ban database cleaned" - -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-clone-website b/bin/v-clone-website deleted file mode 100644 index 9bebbffd..00000000 --- a/bin/v-clone-website +++ /dev/null @@ -1,467 +0,0 @@ -#!/bin/bash -# info: Migration tool that will copy whole site from one (sub)domain to another (sub)domain (on the same server) -# options: FROM_DOMAIN TO_DOMAIN -# -# Migration tool that will copy whole site from one (sub)domain to another (sub)domain (on the same server), changing URL in database (it's careful with serialized arrays in database). -# Useful for making staging copy in one command-line. -# Automatic detection of WordPress, automaticaly read DB user, DB name, DB pass, automatic cloning to new database, automatic changing wp-config.php file. - -if [ $# -lt 2 ]; then - echo "USAGE: v-clone-website FROM_DOMAIN TO_DOMAIN" - echo "Available parameters:" - echo "--DATABASE_SUFIX=... (will be added to database name)" - echo "--TO_DATABASE=... (this will override --TO_DATABASE_NAME, --TO_DATABASE_USERNAME and --DATABASE_SUFIX)" - echo "--FROM_DATABASE_NAME=..." - echo "--FROM_DATABASE_USERNAME=..." - echo "--FROM_DATABASE_PASSWORD=..." - echo "--CONFIG_FILE=..." - echo "--TO_USER=..." - echo "--TO_DATABASE_NAME=..." - echo "--TO_DATABASE_USERNAME=..." - echo "--TO_DATABASE_PASSWORD=..." - echo "--SITE_SUBFOLDER=..." - echo "--EXCLUDE_UPLOADS=1 (or do not set it)" - exit 1 -fi - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -FROM_DOMAIN=$1 -TO_DOMAIN=$2 - -user=$(/usr/local/vesta/bin/v-search-domain-owner "$FROM_DOMAIN") -if [ -z "$user" ]; then - echo "Error: domain $FROM_DOMAIN does not exists" - exit 2 -fi - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/db.sh -source /usr/local/vesta/conf/vesta.conf - -FROM_DATABASE_NAME='' -FROM_DATABASE_USERNAME='' -FROM_DATABASE_PASSWORD='' -FROM_CONFIG_FILE='' -TO_DATABASE_NAME='' -TO_DATABASE_USERNAME='' -TO_DATABASE_PASSWORD='' -DATABASE_SUFIX='_migrated' -SITE_SUBFOLDER='' -SEARCH_FOR_CONFIGS_DATABASE_NAME='' -SEARCH_FOR_CONFIGS_DATABASE_USERNAME='' - -if [ ! -z "$MAX_DBUSER_LEN" ] && [ "$MAX_DBUSER_LEN" -ge 80 ]; then - DATABASE_SUFIX='' -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -# check_args '2' "$#" 'FROM_DOMAIN TO_DOMAIN' -is_domain_format_valid "$FROM_DOMAIN" -is_domain_format_valid "$TO_DOMAIN" - -FROM_USER=$user - -# take --parameters -source /usr/local/vesta/func/handle_parameters.sh - -if [ -z "$SITE_SUBFOLDER" ]; then - r=$(/usr/local/vesta/bin/v-get-database-credentials-of-domain "$FROM_DOMAIN") -else - r=$(/usr/local/vesta/bin/v-get-database-credentials-of-domain "$FROM_DOMAIN" "$SITE_SUBFOLDER") -fi -#echo $r -#exit -eval $r - -# take --parameters -source /usr/local/vesta/func/handle_parameters.sh - -FROM_FOLDER=$SITE_FOLDER - -if [ ! -z "$CONFIG_FILE" ]; then - FROM_CONFIG_FILE=$CONFIG_FILE -fi -if [ ! -z "$FROM_CONFIG_FILE" ]; then - FROM_CONFIG_FILE_FULL_PATH="$FROM_FOLDER/$FROM_CONFIG_FILE" -fi -if [ ! -z "$CONFIG_FILE_FULL_PATH" ]; then - FROM_CONFIG_FILE_FULL_PATH=$CONFIG_FILE_FULL_PATH -fi - -if [ ! -f "$FROM_CONFIG_FILE_FULL_PATH" ]; then - echo "Error: FROM_CONFIG_FILE_FULL_PATH $FROM_CONFIG_FILE_FULL_PATH does not exists" - exit 3 -fi - -IT_IS_WP=0 -if [ "$CMS_TYPE" = "wordpress" ]; then - IT_IS_WP=1 -fi - -if [ -z "$FROM_DATABASE_NAME" ]; then - FROM_DATABASE_NAME=$DATABASE_NAME -fi -if [ -z "$FROM_DATABASE_USERNAME" ]; then - FROM_DATABASE_USERNAME=$DATABASE_USERNAME -fi -if [ -z "$FROM_DATABASE_PASSWORD" ]; then - FROM_DATABASE_PASSWORD=$DATABASE_PASSWORD -fi - -if [ -z "$FROM_DATABASE_NAME" ]; then - echo "Error: FROM_DATABASE_NAME is empty" - exit 4 -fi -if [ -z "$FROM_DATABASE_USERNAME" ]; then - echo "Error: FROM_DATABASE_USERNAME is empty" - exit 5 -fi -if [ -z "$FROM_DATABASE_PASSWORD" ]; then - echo "Error: FROM_DATABASE_PASSWORD is empty" - exit 6 -fi - -DB_EXISTS=$(check_if_database_exists "$user" "$FROM_DATABASE_NAME") -if [ "$DB_EXISTS" = "no" ]; then - echo "Error: database $FROM_DATABASE_NAME does not exists" - exit 7 -fi - -FROM_DATABASE_NAME_WITHOUT_PREFIX=$(get_database_name_without_user_prefix "$FROM_USER" "$FROM_DATABASE_NAME") -FROM_DATABASE_USERNAME_WITHOUT_PREFIX=$(get_database_name_without_user_prefix "$FROM_USER" "$FROM_DATABASE_USERNAME") - -FROM_DOMAIN_HAS_SSL=0 -if [ -f "/home/$FROM_USER/conf/web/ssl.$FROM_DOMAIN.ca" ]; then - FROM_DOMAIN_HAS_SSL=1 -fi - -FROM_DOMAIN_TPL=$(/usr/local/vesta/bin/v-list-web-domain "$FROM_USER" "$FROM_DOMAIN" | grep 'TEMPLATE:' | awk '{print $2}') -FROM_DOMAIN_PROXY_TPL=$(/usr/local/vesta/bin/v-list-web-domain "$FROM_USER" "$FROM_DOMAIN" | grep 'PROXY:' | awk '{print $2}') -FROM_DOMAIN_PROXY_EXT=$(/usr/local/vesta/bin/v-list-web-domain "$FROM_USER" "$FROM_DOMAIN" | grep 'PROXY EXT:' | cut -d ' ' -f8- | sed "s# #,#g") - -# ----------- TO ------------- - -CREATE_TO_USER=0 -CREATE_TO_DOMAIN=0 - -if [ -z "$TO_USER" ]; then - TO_USER=$(/usr/local/vesta/bin/v-search-domain-owner "$TO_DOMAIN") - if [ -z "$TO_USER" ]; then - TO_USER=$FROM_USER - CREATE_TO_DOMAIN=1 - fi -else - if [ ! -d "/home/$TO_USER" ]; then - CREATE_TO_USER=1 - fi - if [ ! -d "/home/$TO_USER/web/$TO_DOMAIN/public_html" ]; then - CREATE_TO_DOMAIN=1 - fi -fi - -TO_FOLDER="/home/$TO_USER/web/$TO_DOMAIN/public_html" -CHECK_PUBLIC_SHTML=$(/usr/local/vesta/bin/v-list-web-domain "$TO_USER" "$TO_DOMAIN" | grep 'SSL:' | grep -c 'single') -if [ $CHECK_PUBLIC_SHTML -eq 1 ]; then - TO_FOLDER="/home/$TO_USER/web/$TO_DOMAIN/public_shtml" -fi -if [ ! -z "$SITE_SUBFOLDER" ]; then - TO_FOLDER="$TO_FOLDER/$SITE_SUBFOLDER" -fi - -TO_CONFIG_FILE_FULL_PATH="$TO_FOLDER/$FROM_CONFIG_FILE" - -if [ ! -z "$MAX_DBUSER_LEN" ] && [ "$MAX_DBUSER_LEN" -ge 80 ] && [ -z "$DATABASE_SUFIX" ]; then - TO_DATABASE_NAME=$(echo "$TO_DOMAIN" | sed 's#\.#_#g') - TO_DATABASE_NAME="${TO_USER}_$TO_DATABASE_NAME" - TO_DATABASE_USERNAME=$TO_DATABASE_NAME -else - LENGTH_OF_DATABASE_SUFIX=${#DATABASE_SUFIX} - if [ -z "$TO_DATABASE_NAME" ]; then - LENGTH_OF_TO_DATABASE_NAME=${#FROM_DATABASE_NAME} - START_FROM=$((LENGTH_OF_TO_DATABASE_NAME-LENGTH_OF_DATABASE_SUFIX)) - CHECK_PREFIX=${FROM_DATABASE_NAME:START_FROM} - if [ "$CHECK_PREFIX" = "${DATABASE_SUFIX}" ]; then - TO_DATABASE_NAME="${TO_USER}_${FROM_DATABASE_NAME_WITHOUT_PREFIX}" - LENGTH_OF_TO_DATABASE_NAME=${#TO_DATABASE_NAME} - CUT_TO=$((LENGTH_OF_TO_DATABASE_NAME-LENGTH_OF_DATABASE_SUFIX)) - TO_DATABASE_NAME=${TO_DATABASE_NAME:0:CUT_TO} - else - TO_DATABASE_NAME="${TO_USER}_${FROM_DATABASE_NAME_WITHOUT_PREFIX}${DATABASE_SUFIX}" - fi - fi - if [ -z "$TO_DATABASE_USERNAME" ]; then - LENGTH_OF_TO_DATABASE_USERNAME=${#FROM_DATABASE_USERNAME} - START_FROM=$((LENGTH_OF_TO_DATABASE_USERNAME-LENGTH_OF_DATABASE_SUFIX)) - CHECK_PREFIX=${FROM_DATABASE_USERNAME:START_FROM} - if [ "$CHECK_PREFIX" = "${DATABASE_SUFIX}" ]; then - TO_DATABASE_USERNAME="${TO_USER}_${FROM_DATABASE_USERNAME_WITHOUT_PREFIX}" - LENGTH_OF_TO_DATABASE_USERNAME=${#TO_DATABASE_USERNAME} - CUT_TO=$((LENGTH_OF_TO_DATABASE_USERNAME-LENGTH_OF_DATABASE_SUFIX)) - TO_DATABASE_USERNAME=${TO_DATABASE_USERNAME:0:CUT_TO} - else - TO_DATABASE_USERNAME="${TO_USER}_${FROM_DATABASE_USERNAME_WITHOUT_PREFIX}${DATABASE_SUFIX}" - fi - fi -fi - -if [ ! -z "$TO_DATABASE" ]; then - TO_DATABASE_USERNAME=$TO_DATABASE - TO_DATABASE_NAME=$TO_DATABASE -fi -if [ -z "$TO_DATABASE_PASSWORD" ]; then - TO_DATABASE_PASSWORD=$FROM_DATABASE_PASSWORD -fi -if [ -z "$TO_DATABASE_NAME" ]; then - echo "Error: TO_DATABASE_NAME $TO_DATABASE_NAME is empty" - exit 10 -fi -if [ -z "$TO_DATABASE_USERNAME" ]; then - echo "Error: TO_DATABASE_USERNAME $TO_DATABASE_USERNAME is empty" - exit 11 -fi -if [ -z "$TO_DATABASE_PASSWORD" ]; then - echo "Error: TO_DATABASE_PASSWORD $TO_DATABASE_PASSWORD is empty" - exit 12 -fi - -TO_DATABASE_NAME_WITHOUT_PREFIX=$(get_database_name_without_user_prefix "$TO_USER" "$TO_DATABASE_NAME") -TO_DATABASE_USERNAME_WITHOUT_PREFIX=$(get_database_name_without_user_prefix "$TO_USER" "$TO_DATABASE_USERNAME") - - -TO_DOMAIN_HAS_SSL=0 -if [ -f "/home/$TO_USER/conf/web/ssl.$TO_DOMAIN.ca" ]; then - TO_DOMAIN_HAS_SSL=1 -fi -SHOULD_INSTALL_SSL=0 -if [ $FROM_DOMAIN_HAS_SSL -eq 1 ] && [ $TO_DOMAIN_HAS_SSL -eq 0 ]; then - SHOULD_INSTALL_SSL=1 -fi - -FROM_FPM_VER="" -if [[ $FROM_DOMAIN_TPL == "PHP-FPM-"* ]]; then - FROM_FPM_TPL_VER=${FROM_DOMAIN_TPL:8:2} - FROM_FPM_VER="${FROM_DOMAIN_TPL:8:1}.${FROM_DOMAIN_TPL:9:1}" -fi - -# ----------- CHECK ------------- - -if [ $IT_IS_WP -eq 0 ]; then - if [ ! -f "/root/Search-Replace-DB/srdb.cli.php" ]; then - if [ ! -f "/usr/bin/git" ]; then - apt-get update > /dev/null 2>&1 - apt-get -y install git > /dev/null 2>&1 - fi - cd /root - git clone https://github.com/interconnectit/Search-Replace-DB.git - fi -fi - -CREATE_TO_DATABASE=0 -object=$(grep "DB='$TO_DATABASE_NAME'" $VESTA/data/users/$TO_USER/db.conf) -if [ -z "$object" ]; then - CREATE_TO_DATABASE=1 -fi - -# ----------- PRINT ------------- - -echo "===============================================================================" -echo "FROM_DOMAIN = $FROM_DOMAIN" -echo "TO_DOMAIN = $TO_DOMAIN" -echo "FROM_USER = $FROM_USER" -echo "TO_USER = $TO_USER" -echo "SITE_SUBFOLDER = $SITE_SUBFOLDER" -echo "FROM_FOLDER = $FROM_FOLDER" -echo "TO_FOLDER = $TO_FOLDER" -echo "CMS_TYPE = $CMS_TYPE" -echo "IT_IS_WP = $IT_IS_WP" -echo "CONFIG_FILE = $CONFIG_FILE" -echo "FROM_CONFIG_FILE_FULL_PATH = $FROM_CONFIG_FILE_FULL_PATH" -echo "TO_CONFIG_FILE_FULL_PATH = $TO_CONFIG_FILE_FULL_PATH" -echo "FROM_DATABASE_NAME = $FROM_DATABASE_NAME" -echo "TO_DATABASE_NAME = $TO_DATABASE_NAME" -echo "FROM_DATABASE_USERNAME = $FROM_DATABASE_USERNAME" -echo "TO_DATABASE_USERNAME = $TO_DATABASE_USERNAME" -echo "FROM_DATABASE_PASSWORD = $FROM_DATABASE_PASSWORD" -echo "TO_DATABASE_PASSWORD = $TO_DATABASE_PASSWORD" -echo "FROM_DATABASE_NAME_WITHOUT_PREFIX = $FROM_DATABASE_NAME_WITHOUT_PREFIX" -echo "TO_DATABASE_NAME_WITHOUT_PREFIX = $TO_DATABASE_NAME_WITHOUT_PREFIX" -echo "FROM_DATABASE_USERNAME_WITHOUT_PREFIX = $FROM_DATABASE_USERNAME_WITHOUT_PREFIX" -echo "TO_DATABASE_USERNAME_WITHOUT_PREFIX = $TO_DATABASE_USERNAME_WITHOUT_PREFIX" -echo "DATABASE_SUFIX = $DATABASE_SUFIX" -echo "CREATE_TO_USER = $CREATE_TO_USER" -echo "CREATE_TO_DOMAIN = $CREATE_TO_DOMAIN" -echo "CREATE_TO_DATABASE = $CREATE_TO_DATABASE" -echo "SHOULD_INSTALL_SSL = $SHOULD_INSTALL_SSL" -echo "FROM_DOMAIN_TPL = $FROM_DOMAIN_TPL" -echo "FROM_FPM_VER = $FROM_FPM_VER" -echo "FROM_DOMAIN_PROXY_TPL = $FROM_DOMAIN_PROXY_TPL" -echo "FROM_DOMAIN_PROXY_EXT = $FROM_DOMAIN_PROXY_EXT" -echo "SEARCH_FOR_CONFIGS_DATABASE_NAME = $SEARCH_FOR_CONFIGS_DATABASE_NAME" -echo "SEARCH_FOR_CONFIGS_DATABASE_USERNAME = $SEARCH_FOR_CONFIGS_DATABASE_USERNAME" -echo "EXCLUDE_UPLOADS = $EXCLUDE_UPLOADS" -echo "===============================================================================" -read -p "=== Press Enter to continue ===" - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ $CREATE_TO_USER -eq 1 ]; then - pass=$(vesta_generate_pass 10) - echo "=== Create user $TO_USER, pass=$pass" - /usr/local/vesta/bin/v-add-user "$TO_USER" "$pass" "info@$TO_DOMAIN" "default" "Cloned" "site" -fi - -if [ $CREATE_TO_DOMAIN -eq 1 ]; then - echo "=== Create domain $TO_DOMAIN" - /usr/local/vesta/bin/v-add-domain "$TO_USER" "$TO_DOMAIN" - rm $TO_FOLDER/index.html -fi - -if [ $SHOULD_INSTALL_SSL -eq 1 ]; then - echo "=== Installing LetsEncrypt for domain $TO_DOMAIN" - /usr/local/vesta/bin/v-add-letsencrypt-domain "$TO_USER" "$TO_DOMAIN" "www.$TO_DOMAIN" "yes" - if [ $? -ne 0 ]; then - echo "=== LetsEncrypt installation failed" - fi -fi - -if [ ! -z "$FROM_DOMAIN_TPL" ]; then - echo "=== Set $FROM_DOMAIN_TPL template to domain $TO_DOMAIN" - /usr/local/vesta/bin/v-change-web-domain-tpl "$TO_USER" "$TO_DOMAIN" "$FROM_DOMAIN_TPL" "yes" -fi -if [ "$SITE_SUBFOLDER" = ".." ]; then - if [ ! -z "$FROM_FPM_VER" ]; then - POOLD_FILE="/etc/php/$FROM_FPM_VER/fpm/pool.d/$TO_DOMAIN.conf" - echo "=== Removing public_html from open_basedir in $POOLD_FILE" - sed -i "s|/public_html:|:|g" $POOLD_FILE - sed -i "s|/public_shtml:|:|g" $POOLD_FILE - systemctl restart php${FROM_FPM_VER}-fpm - fi -fi - -if [ ! -z "$FROM_DOMAIN_PROXY_TPL" ]; then - echo "=== Set $FROM_DOMAIN_PROXY_TPL proxy template to domain $TO_DOMAIN" - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$TO_USER" "$TO_DOMAIN" "$FROM_DOMAIN_PROXY_TPL" "$FROM_DOMAIN_PROXY_EXT" "yes" -fi - -if [ $CREATE_TO_DATABASE -eq 1 ]; then - echo "=== Create database $TO_DATABASE_NAME" - /usr/local/vesta/bin/v-add-database "$TO_USER" "$TO_DATABASE_NAME_WITHOUT_PREFIX" "$TO_DATABASE_USERNAME_WITHOUT_PREFIX" "$TO_DATABASE_PASSWORD" 'mysql' 'localhost' 'utf8' -fi - -echo "=== Dumping database $FROM_DATABASE_NAME" -if [ -d "/root/temp" ]; then - rm -rf /root/temp -fi -mkdir -p /root/temp -cd /root/temp -mysqldump --max_allowed_packet=1024M $FROM_DATABASE_NAME > $FROM_DATABASE_NAME.sql -echo "=== Importing to database $TO_DATABASE_NAME" -mysql $TO_DATABASE_NAME < $FROM_DATABASE_NAME.sql -rm $FROM_DATABASE_NAME.sql - -EXCLUDE='' -if [ ! -z "$EXCLUDE_UPLOADS" ]; then - EXCLUDE="--exclude '/wp-content/uploads/*'" -fi - -echo "=== Copying files from $FROM_FOLDER to folder $TO_FOLDER" -if [ "$SITE_SUBFOLDER" != ".." ]; then - run="rsync -a --delete $EXCLUDE $FROM_FOLDER/ $TO_FOLDER/" - echo "====== Executing: $run" - eval $run -else - run="rsync -a --delete $EXCLUDE --exclude 'logs/*' $FROM_FOLDER/ $TO_FOLDER/" - echo "====== Executing: $run" - eval $run -fi -echo "=== Chowning to $TO_USER:$TO_USER in folder $TO_FOLDER" -chown -R $TO_USER:$TO_USER $TO_FOLDER - -replace_php_config_value "${FROM_DATABASE_NAME}" "${TO_DATABASE_NAME}" "$TO_CONFIG_FILE_FULL_PATH" "yes" -replace_php_config_value "${FROM_DATABASE_USERNAME}" "${TO_DATABASE_USERNAME}" "$TO_CONFIG_FILE_FULL_PATH" "yes" -replace_php_config_value "${FROM_DATABASE_PASSWORD}" "${TO_DATABASE_PASSWORD}" "$TO_CONFIG_FILE_FULL_PATH" "yes" - -echo "=== Replacing $FROM_DOMAIN to $TO_DOMAIN by searching in folder $TO_FOLDER" -REGEXP_FROM_DOMAIN="${FROM_DOMAIN//\./\\.}" -grep -rl "$REGEXP_FROM_DOMAIN" $TO_FOLDER | xargs sed -i "s#$REGEXP_FROM_DOMAIN#$TO_DOMAIN#g" -if [ "$FROM_USER" != "$TO_USER" ]; then - echo "=== Replacing /home/$FROM_USER/ to /home/$TO_USER/ by searching in folder $TO_FOLDER" - grep -rl "/home/$FROM_USER/" $TO_FOLDER | xargs sed -i "s#/home/$FROM_USER/#/home/$TO_USER/#g" -fi -if [ ! -z "$SEARCH_FOR_CONFIGS_DATABASE_NAME" ]; then - echo "=== Replacing ${FROM_DATABASE_NAME} to ${TO_DATABASE_NAME} by searching in folder $TO_FOLDER [SEARCH_FOR_CONFIGS_DATABASE_NAME]" - grep -rl "${FROM_DATABASE_NAME}" $TO_FOLDER | xargs sed -i "s#${FROM_DATABASE_NAME}#${TO_DATABASE_NAME}#g" -fi -if [ ! -z "$SEARCH_FOR_CONFIGS_DATABASE_USERNAME" ]; then - DO_SEARCH_FOR_CONFIGS_DATABASE_USERNAME=1; - if [ ! -z "$SEARCH_FOR_CONFIGS_DATABASE_NAME" ] && [ "$SEARCH_FOR_CONFIGS_DATABASE_NAME" = "$SEARCH_FOR_CONFIGS_DATABASE_USERNAME" ]; then - DO_SEARCH_FOR_CONFIGS_DATABASE_USERNAME=0 - fi - if [ $DO_SEARCH_FOR_CONFIGS_DATABASE_USERNAME -eq 1 ]; then - echo "=== Replacing ${FROM_DATABASE_USERNAME} to ${TO_DATABASE_USERNAME} by searching in folder $TO_FOLDER [SEARCH_FOR_CONFIGS_DATABASE_USERNAME]" - grep -rl "${FROM_DATABASE_USERNAME}" $TO_FOLDER | xargs sed -i "s#${FROM_DATABASE_USERNAME}#${TO_DATABASE_USERNAME}#g" - fi -fi - -if [ $IT_IS_WP -eq 0 ]; then - echo "=== Replacing $FROM_DOMAIN to $TO_DOMAIN in database $TO_DATABASE_NAME" - php /root/Search-Replace-DB/srdb.cli.php -h localhost -n "$TO_DATABASE_NAME" -u "$TO_DATABASE_USERNAME" -p "$TO_DATABASE_PASSWORD" -s "$FROM_DOMAIN" -r "$TO_DOMAIN" - if [ "$FROM_USER" != "$TO_USER" ]; then - echo "=== Replacing /home/$FROM_USER/ to /home/$TO_USER/ in database $TO_DATABASE_NAME" - php /root/Search-Replace-DB/srdb.cli.php -h localhost -n "$TO_DATABASE_NAME" -u "$TO_DATABASE_USERNAME" -p "$TO_DATABASE_PASSWORD" -s "/home/$FROM_USER/" -r "/home/$TO_USER/" - fi -else - echo "=== Replacing $FROM_DOMAIN to $TO_DOMAIN in database $TO_DATABASE_NAME" - /usr/local/vesta/bin/v-run-wp-cli $TO_DOMAIN search-replace "$FROM_DOMAIN" "$TO_DOMAIN" --precise --all-tables --skip-columns=guid --skip-plugins --skip-themes; - if [ "$FROM_USER" != "$TO_USER" ]; then - echo "=== Replacing /home/$FROM_USER/ to /home/$TO_USER/ in database $TO_DATABASE_NAME" - /usr/local/vesta/bin/v-run-wp-cli $TO_DOMAIN search-replace "/home/$FROM_USER/" "/home/$TO_USER/" --precise --all-tables --skip-columns=guid --skip-plugins --skip-themes; - fi - /usr/local/vesta/bin/v-run-wp-cli $TO_DOMAIN cache flush --skip-plugins --skip-themes; - /usr/local/vesta/bin/v-run-wp-cli $TO_DOMAIN config shuffle-salts WP_CACHE_KEY_SALT --force --skip-plugins --skip-themes; - /usr/local/vesta/bin/v-run-wp-cli $TO_DOMAIN config shuffle-salts --skip-plugins --skip-themes; -fi - -# ----------- Update Wordfence WAF Path ------------- - -# Path to .user.ini file in the new domain directory -user_ini="/home/$TO_USER/web/$TO_DOMAIN/public_html/.user.ini" - -# Check if .user.ini exists -if [ -f "$user_ini" ]; then - echo "Updating .user.ini with new path..." - - # Change path from old domain to new domain - sed -i "s|/home/.*/public_html|/home/$TO_USER/web/$TO_DOMAIN/public_html|g" $user_ini - - # Check if replacement was successful and update .user.ini - if [ $? -eq 0 ]; then - echo ".user.ini updated successfully." - else - echo "Failed to update .user.ini file." - fi -fi - -echo "===== DONE ====" -echo "You can visit http://$TO_DOMAIN/" - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-commander b/bin/v-commander deleted file mode 100644 index a7fbf454..00000000 --- a/bin/v-commander +++ /dev/null @@ -1,634 +0,0 @@ -#!/bin/bash - -numargs=$# - -SHOWHEADER=0 -if [ $numargs -eq 0 ]; then - SHOWHEADER=1 -fi -if [ $numargs -eq 1 ] && [ "$1" = "q" ]; then - SHOWHEADER=1 -fi - - -source /etc/profile -PATH=$PATH:/usr/local/vesta/bin && export PATH -if [ $SHOWHEADER -eq 1 ]; then - echo "======================= mvVesta-commander ================================" -fi - -if [ -f /root/kernelupdate ]; then - rm /root/kernelupdate -fi -apt_updated=0 -apt_upgraded=0 -quit_on_empty=0 - -if [ $SHOWHEADER -eq 1 ]; then - hostname - if [ -f "/root/current-status.txt" ]; then - echo "------------------ WAS LONG TIME AGO ------------------" - cat /root/current-status.txt - truncate -s 0 /root/current-status.txt - fi - echo -n 'Debian ' >> /root/current-status.txt && cat /etc/debian_version >> /root/current-status.txt - php -v | grep '^PHP' >> /root/current-status.txt - /usr/local/vesta/bin/v-list-sys-services >> /root/current-status.txt - /usr/local/vesta/bin/v-list-sys-web-status | grep "Server MPM:" >> /root/current-status.txt - w | grep 'load average' >> /root/current-status.txt - df -h | grep "/$" >> /root/current-status.txt - - echo "------------------------ NOW ------------------------" - cat /root/current-status.txt - echo "-----------------------------------------------------" - echo "(press 'h' for help)" - echo "" -fi - -check_status() { - echo "==============================================================" - hostname - echo "------------------------ WAS ------------------------" - cat /root/current-status.txt - echo "------------------------ NOW ------------------------" - hostname - echo -n 'Debian ' && cat /etc/debian_version - php -v | grep '^PHP' - /usr/local/vesta/bin/v-list-sys-services - /usr/local/vesta/bin/v-list-sys-web-status | grep "Server MPM:" - w | grep 'load average' - df -h | grep "/$" - echo "-----------------------------------------------------" -} - -myhelp() { - echo "---------- Press: -----------" - echo "a = Activate Email rate limit" - echo "b = bash" - echo "c = check status" - echo "d = df -h" - echo "e = make sure Apache is in mpm_event" - echo "f = free -h" - echo "g = apt-get upgrade" - echo "h = help" - echo "m = install php-memcached" - echo "p = set version of php as default" - echo "q = quit" - echo "r = reboot" - echo "s = download sury.org apt-get key" - echo "n = download nginx gpg key" - echo "freexian = add Freexian repository" - echo "t = clean the trash" - echo "u = apt-get update" - echo "v = update myVesta" - echo "vo = update myVesta without 'apt-get update'" - echo "w = w" - echo "-----------------------------" - echo "inst v = install myVesta" - echo "inst p = install multi-php" - echo "inst pgw = install php-gate" - echo "inst r = install new Roundcube" - echo "inst memcached = install memcached" - echo "inst redis = install Redis" - echo "inst nginx-rate-limit = install nginx-rate-limit templates" - echo "dis fb = stop and disable fail2ban" - echo "dis dove = stop and disable dovecot" - echo "dis spam = stop and disable spamassassin" - echo "dis clam = stop and disable ClamAV" - echo "p 7.0 = set default php 7.0" - echo "p 7.3 = set default php 7.3" - echo "p 7.4 = set default php 7.4" - echo "p def = set proper default php" - echo "e def = set mpm_event if needed" - echo "m def = install php-memcached if needed" - echo "check fc = check if FreshClam is up" - echo "-----------------------------" - echo "enable-ssh-root-password-login = Allow root password authentication via SSH" - echo "id_rsa = generate id_rsa and id_rsa.pub if it does not exist and show id_rsa.pub" - echo "-----------------------------" -} - -apt_update() { - echo "=============================" - echo "== running: apt-get update" - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - if [ "$release" -lt 10 ]; then - apt-get update - else - apt-get update --allow-releaseinfo-change - fi - apt_updated=1 -} - -COUNTER=0 -HAS_PARAMETERS=0 - -while true -do - - COUNTER=$((COUNTER + 1)) - if [ $COUNTER -le $numargs ]; then - HAS_PARAMETERS=1 - answer=$1 - shift - else - if [ $HAS_PARAMETERS -eq 1 ]; then - exit; - fi - read -p 'What to do: ' answer - fi - - if [ "$answer" = 'prompt' ] || [ "$answer" = 'PROMPT' ]; then - echo "=============================" - echo "hostname: $HOSTNAME" - read -p 'What to do [or press Enter to continue]: ' answer - fi - - if [ "$answer" = '' ] && [ $quit_on_empty -eq 1 ]; then - answer='q' - fi - - if [ "$answer" = 'quit-on-empty' ]; then - echo "== the script will quit on next enter" - quit_on_empty=1 - HAS_PARAMETERS=0 - fi - - - if [ "$answer" = 'a' ] || [ "$answer" = 'A' ]; then - mv /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf.template-backup - cp /usr/local/vesta/install/debian/12/exim/exim4.conf.template /etc/exim4/exim4.conf.template - - touch /etc/exim4/limit_per_email_account_max_sent_emails_per_hour - touch /etc/exim4/limit_per_email_account_max_recipients - touch /etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour - touch /etc/exim4/limit_per_hosting_account_max_recipients - - check_grep=$(grep -c '#SPAMASSASSIN' /etc/exim4/exim4.conf.template-backup) - if [ "$check_grep" -eq 0 ]; then - sed -i "s|#SPAMASSASSIN|SPAMASSASSIN|g" /etc/exim4/exim4.conf.template - fi - - check_grep=$(grep -c '#SPAM_SCORE' /etc/exim4/exim4.conf.template-backup) - if [ "$check_grep" -eq 0 ]; then - sed -i "s|#SPAM_SCORE|SPAM_SCORE|g" /etc/exim4/exim4.conf.template - fi - - check_grep=$(grep -c '#CLAMD' /etc/exim4/exim4.conf.template-backup) - if [ "$check_grep" -eq 0 ]; then - sed -i "s|#CLAMD|CLAMD|g" /etc/exim4/exim4.conf.template - fi - - systemctl restart exim4 - echo "Email rate limit activated." - fi - - - - if [ "$answer" = 'u' ] || [ "$answer" = 'U' ]; then - apt_update - fi - - if [ "$answer" = 'g' ] || [ "$answer" = 'G' ]; then - echo "=============================" - echo "== running: apt-get upgrade" - - if [ $apt_upgraded -eq 0 ]; then - cp /var/log/apt/history.log /var/log/apt/history-`date +"%Y%m%d%H%M%S"`.log - truncate -s 0 /var/log/apt/history.log - fi - - apt-get -y --with-new-pkgs upgrade - apt-get -y dist-upgrade - apt_upgraded=1 - - kernelupdate=$(grep -c 'linux-image-' /var/log/apt/history.log) - dbusupdate=$(grep -c ' dbus:a' /var/log/apt/history.log) - if [ $kernelupdate -gt 0 ] || [ $dbusupdate -gt 0 ] || [ -f "/run/reboot-required" ] || [ -f "/var/run/reboot-required" ]; then - touch /root/kernelupdate - echo "== kernel is updated, reboot is required!" - fi - fi - - if [ "$answer" = 'c' ] || [ "$answer" = 'C' ]; then - check_status - fi - - if [ "$answer" = 's' ] || [ "$answer" = 'S' ]; then - if [ -f "/etc/apt/trusted.gpg.d/php.gpg" ]; then - echo "=============================" - echo "== renewing sury.org gpg key" - wget -nv -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - fi - fi - - if [ "$answer" = 'n' ] || [ "$answer" = 'N' ]; then - if [ -f "/etc/apt/sources.list.d/nginx.list" ]; then - echo "=============================" - echo "== renewing nginx gpg key" - apt-get update - apt-get -y install curl gnupg2 ca-certificates lsb-release debian-archive-keyring - curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null - echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] http://nginx.org/packages/debian `lsb_release -cs` nginx" | tee /etc/apt/sources.list.d/nginx.list - fi - fi - - if [ "$answer" = 'freexian' ] || [ "$answer" = 'FREEXIAN' ]; then - if [ "$release" -lt 11 ]; then - echo "=============================" - echo "== adding Freexian repository" - apt-get update - apt-get install lsb-release - wget https://deb.freexian.com/extended-lts/pool/main/f/freexian-archive-keyring/freexian-archive-keyring_2022.06.08_all.deb && sudo dpkg -i freexian-archive-keyring_2022.06.08_all.deb - cat /etc/apt/sources.list - mv /etc/apt/sources.list /etc/apt/sources.list.old - echo "deb http://deb.freexian.com/extended-lts `lsb_release -cs` main contrib non-free" > /etc/apt/sources.list - rm /etc/apt/sources.list.d/hetzner* - else - echo "== Freexian is not supported on Debian 11 or higher" - fi - fi - - if [ "$answer" = 'e def' ] || [ "$answer" = 'E DEF' ]; then - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - echo "=============================" - echo "== checking if we need mpm_event mode" - echo "== detected Debian $release" - if [ "$release" -eq 10 ] || [ "$release" -eq 11 ] || [ -f "/root/switch-apache-to-event-mode.sh" ]; then - isevent=$(/usr/local/vesta/bin/v-list-sys-web-status | grep -c "Server MPM: event") - if [ $isevent -eq 0 ]; then - echo "== Apache should be switched to mpm_event mode" - answer='e' - else - echo "== Apache is already in mpm_event mode" - fi - fi - - fi - if [ "$answer" = 'e' ] || [ "$answer" = 'E' ]; then - echo "=============================" - echo "== switching to mpm_event mode" - apt-get -y remove libapache2-mod-php* - a2dismod ruid2 - a2dismod suexec - a2dismod php5.6 - a2dismod php7.0 - a2dismod php7.1 - a2dismod php7.2 - a2dismod php7.3 - a2dismod php7.4 - a2dismod php8.0 - a2dismod php8.1 - a2dismod php8.2 - a2dismod mpm_prefork - a2enmod mpm_event - systemctl restart apache2 - fi - - if [ "$answer" = 'dis fb' ] || [ "$answer" = 'DIS FB' ]; then - echo "=============================" - echo "== disabling fail2ban" - systemctl stop fail2ban - systemctl disable fail2ban - systemctl status fail2ban - fi - - if [ "$answer" = 'dis dove' ] || [ "$answer" = 'DIS DOVE' ]; then - echo "=============================" - echo "== disabling dovecot" - systemctl stop dovecot.service - systemctl stop dovecot.socket - systemctl disable dovecot.service - fi - - if [ "$answer" = 'dis clam' ] || [ "$answer" = 'DIS CLAM' ]; then - echo "=============================" - echo "== disabling ClamAV" - systemctl stop clamav-daemon.service - systemctl disable clamav-daemon.service - - systemctl stop clamav-daemon.socket - systemctl disable clamav-daemon.socket - - systemctl stop clamav-freshclam.service - systemctl disable clamav-freshclam.service - - sed -i "s/^CLAMD =/#CLAMD =/g" /etc/exim4/exim4.conf.template - systemctl restart exim4 - fi - - if [ "$answer" = 'dis spam' ] || [ "$answer" = 'DIS SPAM' ]; then - echo "=============================" - echo "== disabling SpamAssassin" - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - if [ "$release" -lt 12 ]; then - systemctl stop spamassassin.service - systemctl disable spamassassin.service - else - systemctl stop spamd.service - systemctl disable spamd.service - fi - - sed -i "s/^SPAMASSASSIN =/#SPAMASSASSIN =/g" /etc/exim4/exim4.conf.template - sed -i "s/^SPAM_SCORE =/#SPAM_SCORE =/g" /etc/exim4/exim4.conf.template - systemctl restart exim4 - fi - - if [ "$answer" = 'p' ] || [ "$answer" = 'P' ]; then - echo "=============================" - echo "== changing default php version" - update-alternatives --config php - echo "--- NEW ---" - php -v | grep '^PHP' - fi - - if [ "$answer" = 'p 7.0' ] || [ "$answer" = 'P 7.0' ]; then - echo "=============================" - echo "== changing default php version to 7.0" - update-alternatives --set php /usr/bin/php7.0 - echo "--- NEW ---" - php -v | grep '^PHP' - fi - - if [ "$answer" = 'p 7.3' ] || [ "$answer" = 'P 7.3' ]; then - echo "=============================" - echo "== changing default php version to 7.3" - update-alternatives --set php /usr/bin/php7.3 - echo "--- NEW ---" - php -v | grep '^PHP' - fi - - if [ "$answer" = 'p 7.4' ] || [ "$answer" = 'P 7.4' ]; then - echo "=============================" - echo "== changing default php version to 7.4" - update-alternatives --set php /usr/bin/php7.4 - echo "--- NEW ---" - php -v | grep '^PHP' - fi - - if [ "$answer" = 'p def' ] || [ "$answer" = 'P DEF' ]; then - echo "=============================" - echo "== checking if we need to change default php version" - automode=$(update-alternatives --display php | grep -c 'auto mode') - echo "=============================" - if [ $automode -ge 1 ]; then - echo "=== php auto mode detected" - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - echo "== detected Debian $release" - if [ "$release" -eq 8 ]; then - echo "== set default php 5" - update-alternatives --set php /usr/bin/php5 - fi - if [ "$release" -eq 9 ]; then - echo "== set default php 7.0" - update-alternatives --set php /usr/bin/php7.0 - fi - if [ "$release" -eq 10 ]; then - echo "== set default php 7.3" - update-alternatives --set php /usr/bin/php7.3 - fi - if [ "$release" -eq 11 ]; then - echo "== set default php 7.4" - update-alternatives --set php /usr/bin/php7.4 - fi - echo "--- NEW ---" - php -v | grep '^PHP' - else - echo "== php is already in manual mode" - php -v | grep '^PHP' - fi - fi - - - if [ "$answer" = 'v' ] || [ "$answer" = 'V' ]; then - echo "=============================" - echo "== updating myVesta" - if [ -f "/usr/local/vesta/bin/v-update-myvesta" ]; then - /usr/local/vesta/bin/v-update-myvesta - else - number_of_files=$(ls /var/cache/apt/archives/vesta_.* 2>/dev/null | wc -l) - if [ $number_of_files -gt 0 ]; then - rm /var/cache/apt/archives/vesta_* > /dev/null 2>&1 - fi - apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" > /usr/local/vesta/log/update-$package.log 2>&1 - apt-get install --reinstall vesta - fi - fi - - if [ "$answer" = 'vo' ] || [ "$answer" = 'VO' ]; then - echo "=============================" - echo "== updating myVesta (without 'apt-get update')" - number_of_files=$(ls /var/cache/apt/archives/vesta_.* 2>/dev/null | wc -l) - if [ $number_of_files -gt 0 ]; then - rm /var/cache/apt/archives/vesta_* > /dev/null 2>&1 - fi - apt-get install --reinstall vesta - fi - - if [ "$answer" = 'vor' ] || [ "$answer" = 'VOR' ]; then - echo "=============================" - echo "== updating myVesta (without apt-get update and without reinstall)" - number_of_files=$(ls /var/cache/apt/archives/vesta_.* 2>/dev/null | wc -l) - if [ $number_of_files -gt 0 ]; then - rm /var/cache/apt/archives/vesta_* > /dev/null 2>&1 - fi - apt-get install vesta - fi - - if [ "$answer" = 't' ] || [ "$answer" = 'T' ]; then - echo "=============================" - echo "== cleaning trash" - df -m - echo "------" - ps -Af | grep tailf | grep -v "grep tailf" - echo "------" - /usr/local/vesta/bin/v-clean-garbage - echo "--------------" - df -m - echo "--------------" - ps -Af | grep tailf | grep -v "grep tailf" - fi - - if [ "$answer" = 'm def' ] || [ "$answer" = 'M DEF' ]; then - phpupdate=$(grep -c 'php' /var/log/apt/history.log) - if [ $phpupdate -gt 0 ]; then - answer='m' - fi - fi - - if [ "$answer" = 'm' ] || [ "$answer" = 'M' ]; then - echo "=============================" - echo "== installing php-memcache modules" - apt-get install -y $(systemctl --full --type service --all | grep "php...-fpm" | sed 's#●##g' | awk '{print $1}' | cut -c1-6 | xargs -n 1 printf "%s-memcache ") - apt-get install -y $(systemctl --full --type service --all | grep "php...-fpm" | sed 's#●##g' | awk '{print $1}' | cut -c1-6 | xargs -n 1 printf "%s-memcached ") - fi - - if [ "$answer" = 'd' ] || [ "$answer" = 'D' ]; then - echo "=============================" - echo "== running: df -h" - df -h - fi - - if [ "$answer" = 'f' ] || [ "$answer" = 'F' ]; then - echo "=============================" - echo "== running: free -h" - free -h - fi - - if [ "$answer" = 'w' ] || [ "$answer" = 'W' ]; then - echo "== running: free -h" - w - fi - - if [ "$answer" = 'inst p' ] || [ "$answer" = 'INST P' ]; then - echo "=============================" - echo "== installing new PHP versions" - cd /root - wget -nv -O /root/vesta-inst-php.sh https://c.myvestacp.com/tools/multi-php-install.sh - chmod u+x ./vesta-inst-php.sh - mcedit ./vesta-inst-php.sh - sudo ./vesta-inst-php.sh - fi - - if [ "$answer" = 'inst pgw' ] || [ "$answer" = 'INST PGW' ]; then - echo "=============================" - echo "== Installing phpgate" - wget -nv http://dl.myvestacp.com/vesta/install-phpgate.sh -O /root/install-phpgate.sh - chmod u+x /root/install-phpgate.sh - /root/install-phpgate.sh - fi - - if [ "$answer" = 'inst memcache' ] || [ "$answer" = 'inst memcached' ] || [ "$answer" = 'INST MEMCACHE' ] || [ "$answer" = 'INST MEMCACHED' ]; then - echo "=============================" - echo "== Installing memcached" - memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) - apt-get update - apt-get -y install memcached - apt-get -y install $(systemctl --full --type service --all | grep "php...-fpm" | sed 's#●##g' | awk '{print $1}' | cut -c1-6 | xargs -n 1 printf "%s-memcache ") - apt-get -y install $(systemctl --full --type service --all | grep "php...-fpm" | sed 's#●##g' | awk '{print $1}' | cut -c1-6 | xargs -n 1 printf "%s-memcached ") - if [ $memory -lt 15000000 ]; then - sed -i "s/-m 64/-m 256/" /etc/memcached.conf - else - sed -i "s/-m 64/-m 1024/" /etc/memcached.conf - fi - systemctl restart memcached - echo "== memcached installed." - echo "-----------------------" - fi - - if [ "$answer" = 'inst redis' ] || [ "$answer" = 'INST REDIS' ]; then - echo "=============================" - echo "== Installing Redis" - memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) - apt-get update - apt-get install -y redis-server - apt-get install $(systemctl --full --type service --all | grep "php...-fpm" | sed 's#●##g' | awk '{print $1}' | cut -c1-6 | xargs -n 1 printf "%s-redis ") - - sed -i "s|^supervised no|supervised systemd|g" /etc/redis/redis.conf - sed -i "s|^save |# save |g" /etc/redis/redis.conf - sed -i 's|^# save ""|save ""|g' /etc/redis/redis.conf - if [ $memory -lt 15000000 ]; then - sed -i "s|^# maxmemory .*|maxmemory 256m|g" /etc/redis/redis.conf - else - sed -i "s|^# maxmemory .*|maxmemory 1g|g" /etc/redis/redis.conf - fi - sed -i "s|^# maxmemory-policy .*|maxmemory-policy allkeys-lru|g" /etc/redis/redis.conf - systemctl restart redis - redis-cli info memory - echo "== Redis installed." - echo "-------------------" - fi - - if [ "$answer" = 'inst nginx-rate-limit' ] || [ "$answer" = 'INST NGINX-RATE-LIMIT' ]; then - echo "=============================" - echo "== Installing inst nginx-rate-limit templates" - curl -O https://c.myvestacp.com/tools/rate-limit-tpl/install_rate_limit_tpl.sh - bash install_rate_limit_tpl.sh - echo "== nginx-rate-limit templates installed." - echo "-------------------" - fi - - if [ "$answer" = 'check fc' ] || [ "$answer" = 'CHECK FC' ]; then - echo "== Checking if FreshClam is up" - clamavup=$(/usr/local/vesta/bin/v-list-sys-services | grep 'clamav-daemon' | grep -c 'running') - freshclamdown=$(/usr/local/vesta/bin/v-list-sys-services | grep 'clamav-freshclam' | grep -c 'off') - if [ $clamavup -eq 1 ] && [ $freshclamdown -eq 1 ]; then - echo "== Starting FreshClam" - systemctl enable clamav-freshclam.service - systemctl start clamav-freshclam.service - fi - fi - - if [ "$answer" = 'enable-ssh-root-password-login' ] || [ "$answer" = 'ENABLE-SSH-ROOT-PASSWORD-LOGIN' ]; then - sed -i "s|^PermitRootLogin .*|PermitRootLogin yes|g" /etc/ssh/sshd_config - sed -i "s|^#PermitRootLogin .*|PermitRootLogin yes|g" /etc/ssh/sshd_config - systemctl restart sshd - echo "--- New settings ---" - grep '^PermitRoot' /etc/ssh/sshd_config - echo "--------------------" - echo "Port 22 opened in Firewall for all IP addresses." - /usr/local/vesta/bin/v-unsuspend-firewall-rule "11" - echo "--------------------" - echo "Type 'passwd' in the terminal to set the root password." - echo "--------------------" - fi - - if [ "$answer" = 'r' ] || [ "$answer" = 'R' ]; then - echo "=============================" - echo "== Rebooting the server" - reboot - fi - - if [ "$answer" = 'b' ] || [ "$answer" = 'B' ]; then - echo "=============================" - echo "== Running bash" - bash - fi - - if [ "$answer" = 'q' ] || [ "$answer" = 'Q' ]; then - echo "=============================" - echo "== Exiting... bye bye :)" - exit 0 - fi - - if [ "$answer" = 'h' ] || [ "$answer" = 'H' ]; then - myhelp - fi - - if [ "$answer" = 'inst v' ] || [ "$answer" = 'INST V' ]; then - echo "=============================" - echo "== installing myVesta" - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - if [ "$release" -lt 10 ]; then - apt-get update - else - apt-get update --allow-releaseinfo-change - fi - apt-get -y --with-new-pkgs upgrade && apt-get -y dist-upgrade - apt-get -y install curl wget mc git sudo dnsutils screen - cd ~ - curl -O http://c.myvestacp.com/vst-install-debian.sh - sudo bash vst-install-debian.sh - source /etc/profile - PATH=$PATH:/usr/local/vesta/bin && export PATH - fi - - if [ "$answer" = 'inst r' ] || [ "$answer" = 'INST R' ]; then - echo "=============================" - echo "== Installing new Roundcube" - wget -nv https://c.myvestacp.com/tools/install-new-roundcube.sh -O /root/install-new-roundcube.sh - chmod u+x /root/install-new-roundcube.sh - mcedit /root/install-new-roundcube.sh - /root/install-new-roundcube.sh - fi - - if [ "$answer" = 'id_rsa' ] || [ "$answer" = 'ID_RSA' ]; then - if [ ! -f "/root/.ssh/id_rsa.pub" ]; then - ssh-keygen -q -t rsa -N '' -C "$HOSTNAME" -b 4096 -f /root/.ssh/id_rsa 2>/dev/null <<< y >/dev/null - fi - echo "=== YOUR id_rsa.pub IS BELOW ===" - cat /root/.ssh/id_rsa.pub - echo "======" - fi - -done diff --git a/bin/v-copy-fs-file b/bin/v-copy-fs-file index 87447b40..792956ec 100755 --- a/bin/v-copy-fs-file +++ b/bin/v-copy-fs-file @@ -43,7 +43,7 @@ fi # Checking destination path rpath=$(readlink -f "$dst_file") if [ -z "$(echo $rpath |egrep "^/tmp|^$homedir")" ]; then - echo "Error: invalid destination path $dst_file" + echo "Error: ivalid destination path $dst_file" exit 2 fi diff --git a/bin/v-deactivate-vesta-license b/bin/v-deactivate-vesta-license index 4f80d0c4..5839aaad 100755 --- a/bin/v-deactivate-vesta-license +++ b/bin/v-deactivate-vesta-license @@ -35,7 +35,7 @@ check_args '2' "$#" 'MODULE LICENSE' # Activating license v_host='https://vestacp.com/checkout' -answer=$(curl --max-time 60 -s $v_host/cancel.php?licence_key=$license) +answer=$(curl -s $v_host/cancel.php?licence_key=$license) check_result $? "cant' connect to vestacp.com " $E_CONNECT # Checking server answer diff --git a/bin/v-delete-database-of-domain b/bin/v-delete-database-of-domain deleted file mode 100644 index 30fd18c0..00000000 --- a/bin/v-delete-database-of-domain +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# info: delete database if domain has database -# options: DOMAIN -# -# The function for deleting database if domain has database - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -RET=$OK - -# echo "=================================" -r=$(/usr/local/vesta/bin/v-get-database-credentials-of-domain $domain) -# echo $r -eval $r -# echo "=================================" - -if [ ! -z "$DATABASE_NAME" ]; then - echo "=== v-delete-database $USER $DATABASE_NAME" - /usr/local/vesta/bin/v-delete-database $USER $DATABASE_NAME - if [ $? -ne 0 ]; then - echo "=== v-delete-database failed" - RET=$E_NOTEXIST - fi -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -log_event "$RET" "$ARGUMENTS" - -exit diff --git a/bin/v-delete-domain b/bin/v-delete-domain index 1ca3373b..b6294679 100755 --- a/bin/v-delete-domain +++ b/bin/v-delete-domain @@ -37,10 +37,9 @@ is_object_unsuspended 'user' 'USER' "$user" if [ ! -z "$WEB_SYSTEM" ]; then str=$(grep "DOMAIN='$domain'" $USER_DATA/web.conf) if [ ! -z "$str" ]; then - $BIN/v-delete-database-of-domain $domain domain_found='yes' $BIN/v-delete-web-domain $user $domain 'no' - check_result $? "can't delete web" > /dev/null + check_result $? "can't suspend web" > /dev/null fi fi @@ -50,7 +49,7 @@ if [ ! -z "$DNS_SYSTEM" ]; then if [ ! -z "$str" ]; then domain_found='yes' $BIN/v-delete-dns-domain $user $domain 'no' - check_result $? "can't delete dns" > /dev/null + check_result $? "can't suspend dns" > /dev/null fi fi @@ -60,7 +59,7 @@ if [ ! -z "$MAIL_SYSTEM" ]; then if [ ! -z "$str" ]; then domain_found='yes' $BIN/v-delete-mail-domain $user $domain - check_result $? "can't delete mail" > /dev/null + check_result $? "can't suspend mail" > /dev/null fi fi diff --git a/bin/v-delete-firewall-ban b/bin/v-delete-firewall-ban index cb5b352c..52f3403d 100755 --- a/bin/v-delete-firewall-ban +++ b/bin/v-delete-firewall-ban @@ -53,11 +53,6 @@ $iptables -D fail2ban-$chain $b 2>/dev/null # Changing permissions chmod 660 $conf -# nginx deny rules conf -if [ "$chain" = "WEB" ] && [ -f "/etc/nginx/conf.d/block.conf" ]; then - sed -i "/deny $ip;/d" /etc/nginx/conf.d/block.conf - systemctl reload nginx -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-delete-firewall-rule b/bin/v-delete-firewall-rule index 10fd0fb9..8f646644 100755 --- a/bin/v-delete-firewall-rule +++ b/bin/v-delete-firewall-rule @@ -34,21 +34,12 @@ is_object_valid '../../data/firewall/rules' 'RULE' "$rule" # Action # #----------------------------------------------------------# -oldvalues=$(grep "RULE='$rule'" $VESTA/data/firewall/rules.conf) - # Deleting rule sed -i "/RULE='$rule' /d" $VESTA/data/firewall/rules.conf # Updating system firewall $BIN/v-update-firewall -if [ "$WEB_SYSTEM" == 'nginx' ] || [ "$PROXY_SYSTEM" == 'nginx' ]; then - parse_object_kv_list_non_eval "$oldvalues" - if [ "$PORT" == "80,443" ] && [ "$ACTION" == "DROP" ]; then - sed -i "\#$IP#d" /etc/nginx/conf.d/block-firewall.conf - systemctl restart nginx - fi -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-delete-inactive-wordpress-plugins-and-themes b/bin/v-delete-inactive-wordpress-plugins-and-themes deleted file mode 100644 index e9b1715c..00000000 --- a/bin/v-delete-inactive-wordpress-plugins-and-themes +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/bash -# info: delete inactive WordPress plugins and themes -# options: DOMAIN - -#----------------------------------------------------------# -# Variable & Function # -#----------------------------------------------------------# - -[ "$(whoami)" != "root" ] && { echo "You must be root to run this command."; exit 1; } -source /etc/profile - -DOMAIN="$1" -[ -z "$DOMAIN" ] && { echo "Usage: v-delete-inactive-wordpress-plugins-and-themes DOMAIN"; exit 1; } - -USER="$(/usr/local/vesta/bin/v-search-domain-owner "$DOMAIN")" -[ -z "$USER" ] && { echo "Domain $DOMAIN does not exist."; exit 1; } - -WP_PATH="/home/$USER/web/$DOMAIN/public_html" -[ ! -f "$WP_PATH/wp-config.php" ] && { echo "WordPress is not installed on this domain."; exit 1; } - -# WP-CLI wrapper -if [ ! -z "$PHP" ]; then - WP_RUN="PHP=$PHP /usr/local/vesta/bin/v-run-wp-cli $DOMAIN --skip-plugins --skip-themes" -else - WP_RUN="/usr/local/vesta/bin/v-run-wp-cli $DOMAIN --skip-plugins --skip-themes" -fi - -quarantined=0; - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -cd "$WP_PATH" || exit 1 -echo "Inactive WordPress plugins for $DOMAIN:" -echo "-------------------------------------" - -RUN="$WP_RUN plugin list --format=csv --skip-plugins --skip-themes" -PLUGINS_LIST_CSV=$(eval "$RUN") -return_code=$? - -if [ $return_code -ne 0 ]; then - echo "WP-CLI error:" - echo "return code: $return_code" - cat /home/$USER/web/$DOMAIN/wp-cli-error.log - exit $return_code -fi - -PLUGINS_LIST_CSV=$(echo "$PLUGINS_LIST_CSV" | tail -n +2) - -DEACTIVATED_PLUGINS_LIST_CSV="" - -if [ ! -z "$PLUGINS_LIST_CSV" ]; then - printf "%-30s %-20s %-20s %-20s %-20s %-20s\n" "name" "status" "update" "version" "update_version" "auto_update" - while IFS=',' read -r NAME STATUS UPDATE VERSION UPDATE_VERSION AUTO_UPDATE; do - if [ "$STATUS" = "inactive" ]; then - printf "%-30s %-20s %-20s %-20s %-20s %-20s\n" "$NAME" "$STATUS" "$UPDATE" "$VERSION" "$UPDATE_VERSION" "$AUTO_UPDATE" - DEACTIVATED_PLUGINS_LIST_CSV="$DEACTIVATED_PLUGINS_LIST_CSV\n$NAME" - fi - done <<< "$PLUGINS_LIST_CSV" -else - echo "No plugins found." -fi - -if [ ! -z "$DEACTIVATED_PLUGINS_LIST_CSV" ]; then - echo "" - read -r -p "Do you want to move inactive plugins to quarantine? (y/n, default: y): " RESPONSE < /dev/tty - if [ "$RESPONSE" == "y" ] || [ "$RESPONSE" == "Y" ] || [ -z "$RESPONSE" ]; then - while IFS=',' read -r NAME STATUS UPDATE VERSION UPDATE_VERSION AUTO_UPDATE; do - if [ "$STATUS" = "inactive" ]; then - folder="/home/$USER/web/$DOMAIN/public_html/wp-content/plugins/$NAME" - file="/home/$USER/web/$DOMAIN/public_html/wp-content/plugins/$NAME.php" - if [ -d "$folder" ] || [ -f "$file" ]; then - destination_base_folder="/srv/wp-deactivated-plugins/$DOMAIN" - if [ -d "$folder" ]; then - source_path="$folder" - destination_path="$destination_base_folder/$NAME" - elif [ -f "$file" ]; then - source_path="$file" - destination_path="$destination_base_folder/$NAME.php" - fi - mkdir -p $destination_base_folder - chown $USER:$USER $destination_base_folder - mv $source_path $destination_path - if [ -d "$destination_path" ]; then - echo "= Folder $source_path moved to $destination_path" - quarantined=1; - fi - if [ -f "$destination_path" ]; then - echo "= File $source_path moved to $destination_path" - quarantined=1; - fi - else - echo "=== ERROR: Folder $folder or file $file not found - it does not exist?" - fi - fi - done <<< "$PLUGINS_LIST_CSV" - fi -fi - -echo "" -echo "Inactive WordPress themes for $DOMAIN:" -echo "-------------------------------------" - -RUN="$WP_RUN theme list --format=csv --skip-plugins --skip-themes" -THEMES_LIST_CSV=$(eval "$RUN") -return_code=$? - -if [ $return_code -ne 0 ]; then - echo "WP-CLI error:" - echo "return code: $return_code" - cat /home/$USER/web/$DOMAIN/wp-cli-error.log - exit $return_code -fi - -THEMES_LIST_CSV=$(echo "$THEMES_LIST_CSV" | tail -n +2) - -DEACTIVATED_THEMES_LIST_CSV="" - -if [ ! -z "$THEMES_LIST_CSV" ]; then - printf "%-30s %-20s %-20s %-20s %-20s %-20s\n" "name" "status" "update" "version" "update_version" "auto_update" - while IFS=',' read -r NAME STATUS UPDATE VERSION UPDATE_VERSION AUTO_UPDATE; do - if [ "$STATUS" = "inactive" ]; then - printf "%-30s %-20s %-20s %-20s %-20s %-20s\n" "$NAME" "$STATUS" "$UPDATE" "$VERSION" "$UPDATE_VERSION" "$AUTO_UPDATE" - DEACTIVATED_THEMES_LIST_CSV="$DEACTIVATED_THEMES_LIST_CSV\n$NAME" - fi - done <<< "$THEMES_LIST_CSV" -else - echo "No themes found." -fi - -if [ ! -z "$DEACTIVATED_THEMES_LIST_CSV" ]; then - echo "" - read -r -p "Do you want to move inactive themes to quarantine? (y/n, default: y): " RESPONSE < /dev/tty - if [ "$RESPONSE" == "y" ] || [ "$RESPONSE" == "Y" ] || [ -z "$RESPONSE" ]; then - while IFS=',' read -r NAME STATUS UPDATE VERSION UPDATE_VERSION AUTO_UPDATE; do - if [ "$STATUS" = "inactive" ]; then - folder="/home/$USER/web/$DOMAIN/public_html/wp-content/themes/$NAME" - if [ -d "$folder" ]; then - destination_base_folder="/srv/wp-deactivated-themes/$DOMAIN" - source_path="$folder" - destination_path="$destination_base_folder/$NAME" - mkdir -p $destination_base_folder - chown $USER:$USER $destination_base_folder - mv $source_path $destination_path - if [ -d "$destination_path" ]; then - echo "= Folder $source_path moved to $destination_path" - quarantined=1; - fi - else - echo "=== ERROR: Folder $folder not found - it does not exist?" - fi - fi - done <<< "$THEMES_LIST_CSV" - fi -fi - -echo "" -if [ $quarantined -eq 1 ]; then - echo "= All deactivated plugins and themes moved to quarantine." - echo "= You can find them in /srv/wp-deactivated-plugins/$DOMAIN and /srv/wp-deactivated-themes/$DOMAIN" -else - echo "= No deactivated plugins or themes found." -fi -exit 0; diff --git a/bin/v-delete-mail-account b/bin/v-delete-mail-account index 09c41b50..f0da423c 100755 --- a/bin/v-delete-mail-account +++ b/bin/v-delete-mail-account @@ -53,7 +53,6 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then sed -i "/^$account@$domain_idn:/d" $HOMEDIR/$user/conf/mail/$domain/aliases sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd - sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/accounts rm -rf $HOMEDIR/$user/mail/$domain/$account fi diff --git a/bin/v-delete-mail-domain b/bin/v-delete-mail-domain index 9be565bb..f3541edb 100755 --- a/bin/v-delete-mail-domain +++ b/bin/v-delete-mail-domain @@ -51,15 +51,12 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then rm -f /etc/$MAIL_SYSTEM/domains/$domain_idn rm -rf $HOMEDIR/$user/conf/mail/$domain rm -rf $HOMEDIR/$user/mail/$domain_idn - if [ -d "/hdd/home/$user/mail/$domain_idn" ]; then - rm -rf /hdd/home/$user/mail/$domain_idn - fi fi # Deleting dkim dns record if [ "$DKIM" = 'yes' ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then records=$($BIN/v-list-dns-records $user $domain plain) - dkim_records=$(echo "$records" |grep -w '_domainkey' |cut -f 1) + dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ') for id in $dkim_records; do $BIN/v-delete-dns-record $user $domain $id done diff --git a/bin/v-delete-mail-domain-dkim b/bin/v-delete-mail-domain-dkim index 7cfbab58..f11e48d4 100755 --- a/bin/v-delete-mail-domain-dkim +++ b/bin/v-delete-mail-domain-dkim @@ -48,7 +48,7 @@ fi # Deleting dns record if [ ! -z "$DNS_SYSTEM" ] && [ -e "$USER_DATA/dns/$domain.conf" ]; then records=$($BIN/v-list-dns-records $user $domain plain) - dkim_records=$(echo "$records" |grep -w '_domainkey' | awk '{print $1}') + dkim_records=$(echo "$records" |grep -w '_domainkey' | cut -f 1 -d ' ') for id in $dkim_records; do $BIN/v-delete-dns-record $user $domain $id done diff --git a/bin/v-delete-mails b/bin/v-delete-mails deleted file mode 100644 index 24ac68e5..00000000 --- a/bin/v-delete-mails +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash -# info: delete old emails (by mtime) for user/domain/account, with optional scope -# usage: v-delete-mails USER DOMAIN ACCOUNT MTIME_DAYS|all SCOPE -# SCOPE: all – clean every Maildir folder (cur, new, tmp, custom subfolders) -# trash – clean only Trash/Junk/Spam folders - -# load Vesta functions & config -source "$VESTA/func/main.sh" -source "$VESTA/conf/vesta.conf" - -# read arguments -user="$1" -domain="$2" -account="$3" -mtime="$4" -scope="$5" - -# verify argument count -check_args '5' "$#" 'USER DOMAIN ACCOUNT MTIME_DAYS|all SCOPE' - -# validate scope -if [[ "$scope" != "all" && "$scope" != "trash" ]]; then - echo "ERROR: SCOPE must be 'all' or 'trash'." - exit 1 -fi - -# validate logical combinations -if [[ "$user" == "all" ]]; then - if [[ "$domain" != "all" || "$account" != "all" ]]; then - echo "ERROR: When USER is 'all', both DOMAIN and ACCOUNT must be 'all'." - exit 1 - fi -elif [[ "$domain" == "all" && "$account" != "all" ]]; then - echo "ERROR: When DOMAIN is 'all', ACCOUNT must also be 'all'." - exit 1 -fi - -# build a detailed summary for the warning -declare -a summary_parts -if [[ "$user" == "all" ]]; then - summary_parts+=("all users") -else - summary_parts+=("user '$user'") -fi - -if [[ "$domain" == "all" ]]; then - summary_parts+=("all domains") -else - summary_parts+=("domain '$domain'") -fi - -if [[ "$account" == "all" ]]; then - summary_parts+=("all accounts") -else - summary_parts+=("account '$account'") -fi - -# join with commas -summary=$(printf ", %s" "${summary_parts[@]}") -summary=${summary:2} - -# only warn if any of them is 'all' or if mtime is 'all' -if [[ "$mtime" == "all" || "$user" == "all" || "$domain" == "all" || "$account" == "all" ]]; then - echo "WARNING: This will delete emails older than '$mtime' days for ${summary}." - read -p "Are you sure? (yes/no): " confirm - [[ "$confirm" != "yes" ]] && { echo "Aborted."; exit 1; } -fi - -# function to delete emails -delete_emails() { - local u="$1" d="$2" a="$3" - local maildir="/home/$u/mail/$d/$a" - - [[ ! -d "$maildir" ]] && return - - echo "→ Cleaning '$a@$d' (user: $u), scope: $scope, mtime: $mtime" - - # build find predicates - if [[ "$scope" == "all" ]]; then - folder_expr=( -path "*/cur/*" -o -path "*/new/*" -o -path "*/tmp/*" ) - else - folder_expr=( -ipath "*/trash/*" -o -ipath "*/junk/*" -o -ipath "*/spam/*" ) - fi - - # assemble and run find - if [[ "$mtime" == "all" ]]; then - find "$maildir" -type f \( "${folder_expr[@]}" \) -print -delete 2>/dev/null - else - find "$maildir" -type f \( "${folder_expr[@]}" \) -mtime +"$mtime" -print -delete 2>/dev/null - fi -} - -# collect users -if [[ "$user" == "all" ]]; then - users=$(v-list-users plain | awk '{print $1}') -else - users="$user" -fi - -# iterate through users, domains, accounts -for u in $users; do - if [[ "$domain" == "all" ]]; then - domains=$(v-list-mail-domains "$u" plain | awk '{print $1}') - else - domains="$domain" - fi - - for d in $domains; do - if [[ "$account" == "all" ]]; then - accounts=$(v-list-mail-accounts "$u" "$d" plain | awk '{print $1}') - else - accounts="$account" - fi - - for a in $accounts; do - delete_emails "$u" "$d" "$a" - done - done -done - -# restart dovecot to refresh mailbox state -systemctl restart dovecot - -# log the action (status first, then message) -log_event "$OK" "Deleted emails (>$mtime days, scope=$scope) for $user $domain $account" - -exit 0 diff --git a/bin/v-delete-sys-mail-ssl b/bin/v-delete-sys-mail-ssl deleted file mode 100755 index 06dab82b..00000000 --- a/bin/v-delete-sys-mail-ssl +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -# info: delete sys vesta user ssl certificate -# options: NONE -# -# The script disables user domain ssl synchronization - - -#----------------------------------------------------------# -# Variable & Function # -#----------------------------------------------------------# - -# Includes -source $VESTA/func/main.sh -source $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -vst_crt="$VESTA/ssl/certificate.crt" -vst_key="$VESTA/ssl/certificate.key" - -# Updating mail certificate -case $MAIL_SYSTEM in - exim) conf='/etc/exim/exim.conf';; - exim4) conf='/etc/exim4/exim4.conf.template';; -esac -if [ -e "$conf" ]; then - sed -e "s|^tls_certificate.*|tls_certificate = $vst_crt|" \ - -e "s|^tls_privatekey.*|tls_privatekey = $vst_key|" -i $conf -fi - -# Updating imap certificate -conf="/etc/dovecot/conf.d/10-ssl.conf" -if [ ! -z "$IMAP_SYSTEM" ] && [ -e "$conf" ]; then - sed -e "s|ssl_cert.*|ssl_cert = <$vst_crt|" \ - -e "s|ssl_key.*|ssl_key = <$vst_key|" -i $conf -fi - -# Moving old certificates -if [ -e "$VESTA/ssl/mail.crt" ]; then - mv -f $VESTA/ssl/mail.crt $VESTA/ssl/mail.crt.old -fi -if [ -e "VESTA/ssl/mail.key" ]; then - mv $VESTA/ssl/mail.key VESTA/ssl/mail.key.old -fi - -# Updating vesta.conf value -sed -i "/MAIL_CERTIFICATE=/ d" $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Restarting services -if [ "$restart" != 'no' ]; then - if [ ! -z "$MAIL_SYSTEM" ]; then - $BIN/v-restart-service $MAIL_SYSTEM - fi - if [ ! -z "$IMAP_SYSTEM" ]; then - $BIN/v-restart-service $IMAP_SYSTEM - fi -fi - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-delete-sys-vesta-ssl b/bin/v-delete-sys-vesta-ssl deleted file mode 100755 index e90f32b9..00000000 --- a/bin/v-delete-sys-vesta-ssl +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# info: delete sys vesta user ssl certificate -# options: NONE -# -# The script disables user domain ssl synchronization - - -#----------------------------------------------------------# -# Variable & Function # -#----------------------------------------------------------# - -# Includes -source $VESTA/func/main.sh -source $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Updating vesta.conf value -sed -i "/VESTA_CERTIFICATE=/ d" $VESTA/conf/vesta.conf - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-delete-user b/bin/v-delete-user index cdf809eb..c452f0a0 100755 --- a/bin/v-delete-user +++ b/bin/v-delete-user @@ -94,9 +94,6 @@ fi # Deleting user directories chattr -i $HOMEDIR/$user/conf rm -rf $HOMEDIR/$user -if [ -d "/hdd/home/$user" ]; then - rm -rf /hdd/home/$user -fi rm -f /var/spool/mail/$user rm -f /var/spool/cron/$user rm -f /var/spool/cron/crontabs/$user diff --git a/bin/v-delete-user-favourites b/bin/v-delete-user-favourites index 28a8dd97..374fa430 100755 --- a/bin/v-delete-user-favourites +++ b/bin/v-delete-user-favourites @@ -32,8 +32,6 @@ case $system in DNS_REC) is_format_valid 'id' ;; *) is_format_valid 'object' esac - -is_format_valid 'user' is_object_valid 'user' 'USER' "$user" is_object_unsuspended 'user' 'USER' "$user" diff --git a/bin/v-delete-vesta-softaculous b/bin/v-delete-vesta-softaculous index c15d68c1..cff7d2b8 100755 --- a/bin/v-delete-vesta-softaculous +++ b/bin/v-delete-vesta-softaculous @@ -29,8 +29,7 @@ fi # Deleting symlink if [ -e "$VESTA/web/softaculous" ]; then - mkdir -p $VESTA/disabled_plugins - mv $VESTA/web/softaculous $VESTA/disabled_plugins + rm -f $VESTA/web/softaculous fi # Updating SOFTACULOUS value diff --git a/bin/v-delete-web-domain b/bin/v-delete-web-domain index e64dd9a7..529f5d09 100755 --- a/bin/v-delete-web-domain +++ b/bin/v-delete-web-domain @@ -56,31 +56,6 @@ fi get_domain_values 'web' local_ip=$(get_real_ip $IP) -# Deleting FPM conf -fpmconf="/etc/php5/fpm/pool.d/$domain.conf" -if [ -f "$fpmconf" ]; then - rm $fpmconf - echo "Deleted: $fpmconf" >> /usr/local/vesta/log/system.log -fi - -for PHPV in /etc/php/*; do - if [ -d "${PHPV}" ]; then - # PHPVER=$(basename ${PHPV}) - POOLD="${PHPV}/fpm/pool.d" - fpmconf="$POOLD/$domain.conf" - if [ -f "$fpmconf" ]; then - rm $fpmconf - echo "Deleted: $fpmconf" >> /usr/local/vesta/log/system.log - fi - POOLD="${PHPV}/fpm/pool.d-ioncube" - fpmconf="$POOLD/$domain.conf" - if [ -f "$fpmconf" ]; then - rm $fpmconf - echo "Deleted: $fpmconf" >> /usr/local/vesta/log/system.log - fi - fi -done - # Deleting domain from web.conf sed -i "/DOMAIN='$domain'/ d" $USER_DATA/web.conf @@ -130,9 +105,6 @@ rm -f /var/log/$WEB_SYSTEM/domains/$domain.error* # Deleting directory rm -rf $HOMEDIR/$user/web/$domain -if [ -d "/hdd/home/$user/web/$domain" ]; then - rm -rf /hdd/home/$user/web/$domain -fi #----------------------------------------------------------# diff --git a/bin/v-delete-web-domain-ssl b/bin/v-delete-web-domain-ssl index 30272928..05e8c940 100755 --- a/bin/v-delete-web-domain-ssl +++ b/bin/v-delete-web-domain-ssl @@ -57,14 +57,8 @@ fi # Deleting old certificate tmpdir=$(mktemp -p $HOMEDIR/$user/web/$domain/private -d) -rm -f $HOMEDIR/$user/conf/web/ssl.$domain.ca -rm -f $HOMEDIR/$user/conf/web/ssl.$domain.crt -rm -f $HOMEDIR/$user/conf/web/ssl.$domain.key -rm -f $HOMEDIR/$user/conf/web/ssl.$domain.pem -mv $USER_DATA/ssl/$domain.ca $tmpdir -mv $USER_DATA/ssl/$domain.crt $tmpdir -mv $USER_DATA/ssl/$domain.key $tmpdir -mv $USER_DATA/ssl/$domain.pem $tmpdir +rm -f $HOMEDIR/$user/conf/web/ssl.$domain.* +mv $USER_DATA/ssl/$domain.* $tmpdir chown -R $user:$user $tmpdir diff --git a/bin/v-delete-wordpress-uploads-php-files b/bin/v-delete-wordpress-uploads-php-files deleted file mode 100644 index ce72c0c4..00000000 --- a/bin/v-delete-wordpress-uploads-php-files +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# info: delete PHP files from WordPress uploads folder -# options: DOMAIN - -#----------------------------------------------------------# -# Variable & Function # -#----------------------------------------------------------# - -[ "$(whoami)" != "root" ] && { echo "You must be root to run this command."; exit 1; } -source /etc/profile - -DOMAIN="$1" -[ -z "$DOMAIN" ] && { echo "Usage: v-delete-wordpress-uploads-php-files DOMAIN"; exit 1; } - -USER="$(/usr/local/vesta/bin/v-search-domain-owner "$DOMAIN")" -[ -z "$USER" ] && { echo "Domain $DOMAIN does not exist."; exit 1; } - -WP_PATH="/home/$USER/web/$DOMAIN/public_html" -[ ! -f "$WP_PATH/wp-config.php" ] && { echo "WordPress is not installed on this domain."; exit 1; } - -quarantined=0; - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -cd "$WP_PATH" || exit 1 - -files=$(find wp-content/uploads/ -type f -name "*.php") - -if [ -z "$files" ]; then - echo "= No PHP files found in WordPress uploads folder." - exit 0; -fi - -echo "= Found PHP files in WordPress uploads folder for domain $DOMAIN :" -echo "-------------------------------------" -echo "$files" -echo "-------------------------------------" - -read -r -p "Do you want to move these files to quarantine? (y/n, default: y): " RESPONSE < /dev/tty -if [ "$RESPONSE" == "y" ] || [ "$RESPONSE" == "Y" ] || [ -z "$RESPONSE" ]; then - for file in $files; do - source_file="/home/$USER/web/$DOMAIN/public_html/$file" - destination_file="/srv/wp-uploads-php-files-quarantine/$DOMAIN/$file" - destination_folder=$(dirname "$destination_file") - mkdir -p "$destination_folder" - chown $USER:$USER "$destination_folder" - mv "$source_file" "$destination_file" - echo "= File $source_file moved to $destination_file" - quarantined=1; - done - chown -R $USER:$USER "/srv/wp-uploads-php-files-quarantine/$DOMAIN" -fi - -echo "" -if [ $quarantined -eq 1 ]; then - echo "= All PHP files moved to quarantine." - echo "= You can find them in /srv/wp-uploads-php-files-quarantine/$DOMAIN" -else - echo "= No PHP files found in WordPress uploads folder." -fi - -exit 0; \ No newline at end of file diff --git a/bin/v-desinfect-wordpress b/bin/v-desinfect-wordpress deleted file mode 100644 index 51ee217e..00000000 --- a/bin/v-desinfect-wordpress +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# info: disinfect a WordPress site with several maintenance commands -# options: DOMAIN - -# -------------------------------------------------------- # -# variables and checks # -# -------------------------------------------------------- # - -if [ "$(whoami)" != "root" ]; then - echo "You must be root to run this command." - exit 1 -fi - -# make sure all Vesta helper scripts are reachable -export PATH="/usr/local/vesta/bin:$PATH" -source /etc/profile - -domain="$1" -if [ -z "$domain" ]; then - echo "Usage: v-desinfect-wp DOMAIN" - exit 1 -fi - -user=$(/usr/local/vesta/bin/v-search-domain-owner "$domain") -if [ -z "$user" ]; then - echo "Domain $domain does not exist." - exit 1 -fi - -if [ ! -f "/usr/local/vesta/bin/v-wf-malware-hyperscan-with-remediate" ]; then - echo "= WordFence CLI is not installed. Installing..." - /usr/local/vesta/bin/v-install-wordfence-cli -fi - -# absolute paths to maintenance scripts, in desired order -declare -a tasks=( - "/usr/local/vesta/bin/v-change-database-password-for-wordpress" - "/usr/local/vesta/bin/v-change-wordpress-admin-passwords" - "/usr/local/vesta/bin/v-fix-wordpress-core" - "/usr/local/vesta/bin/v-delete-inactive-wordpress-plugins-and-themes" - "/usr/local/vesta/bin/v-delete-wordpress-uploads-php-files" - "/usr/local/vesta/bin/v-wf-malware-hyperscan-with-remediate" - "INTERACTIVE=1 /usr/local/vesta/bin/v-wf-malware-hyperscan-with-remediate" -) - -# -------------------------------------------------------- # -# execution strategy # -# -------------------------------------------------------- # - -echo -read -r -p "Run all maintenance steps automatically? (y/n) " run_all < /dev/tty - -if [[ "$run_all" =~ ^[Yy]$ ]]; then - echo "Running all maintenance steps for $domain" - automatic=true -else - echo - echo "Selective mode. You will be asked for each step." - automatic=false -fi - -for cmd in "${tasks[@]}"; do - if [ ! -x "$cmd" ]; then - echo "Command $cmd not found or not executable, skipping." - continue - fi - - if [ "$automatic" = false ]; then - while true; do - read -r -p "Run $(basename "$cmd") for $domain? (y/n) " yn < /dev/tty - case "$yn" in - [Yy]* ) break ;; - [Nn]* ) echo "Skipping $(basename "$cmd")."; continue 2 ;; - * ) echo "Please answer y or n." ;; - esac - done - fi - - echo - echo "=== $(basename "$cmd") $domain ===" - "$cmd" "$domain" -done - -echo -echo "Done." -exit 0 diff --git a/bin/v-df-snapshot-diff b/bin/v-df-snapshot-diff deleted file mode 100644 index ee427bd2..00000000 --- a/bin/v-df-snapshot-diff +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/bash -# info: Make a diff between two snapshots of the disk usage -# options: FILE1 FILE2 - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Let's declare three associative arrays -declare -A FILE1 -declare -A FILE2 -declare -A FILED - -file1=$1 -file2=$2 - -if [[ ! "$file1" =~ ^/usr/local/vesta/data/df/snapshot-.*\.txt$ ]]; then - file1="/usr/local/vesta/data/df/$file1" -fi - -if [[ ! "$file2" =~ ^/usr/local/vesta/data/df/snapshot-.*\.txt$ ]]; then - file2="/usr/local/vesta/data/df/$file2" -fi - -if [ ! -f "$file1" ]; then - echo "File $file1 not found" - exit 1 -fi - -if [ ! -f "$file2" ]; then - echo "File $file2 not found" - exit 1 -fi - -timestamp=$(date +%Y-%m-%d-%H-%M-%S) -mkdir -p /usr/local/vesta/data/df-diff -file0="/usr/local/vesta/data/df-diff/diff-$timestamp.txt" -file0s="/usr/local/vesta/data/df-diff/diff-size-sorted-$timestamp.txt" -file0f="/usr/local/vesta/data/df-diff/diff-folder-sorted-$timestamp.txt" -touch $file0 - -# Let's load the first file and fill the array FILE1 -while IFS=$'\t' read SIZE DIRECTORY; do - # Skip blank lines or lines that are not in the correct format - [[ -z "$DIRECTORY" ]] && continue - [[ "$DIRECTORY" = "total" ]] && continue - # Insert values into the array - FILE1["$DIRECTORY"]="$SIZE" -done < "$file1" - -# Let's load the second file and fill the array FILE2 -while IFS=$'\t' read SIZE DIRECTORY; do - # Skip blank lines or lines that are not in the correct format - [[ -z "$DIRECTORY" ]] && continue - [[ "$DIRECTORY" = "total" ]] && continue - # Insert values into the array - FILE2["$DIRECTORY"]="$SIZE" -done < "$file2" - -# We iterate through FILE1 and look for the matching key in FILE2 -for k in "${!FILE1[@]}"; do - if [[ -v FILE2["$k"] ]]; then - # If there is the same folder (KEY) in FILE2 - DIFF=$(( ${FILE2[$k]} - ${FILE1[$k]} )) - FILED["$k"]=$DIFF - echo -e "${DIFF}\t${k}" >> $file0 - else - # If the folder (KEY) is not found in FILE2 - FILED["$k"]=${FILE1["$k"]} - echo -e "${FILE1["$k"]}\t${k}" >> $file0 - fi -done - -# sorted by size -sort -nr -k1,1 $file0 > $file0s - -# sorted by folders -while IFS=$'\t' read SIZE DIRECTORY; do - [[ -z "$DIRECTORY" ]] && continue - [[ "$DIRECTORY" = "total" ]] && continue - echo -e "$DIRECTORY\t${FILED["$DIRECTORY"]}" >> $file0f -done < "$file2" - -chmod 600 $file0 $file0s $file0f -chown root:root $file0 $file0s $file0f - -echo "Done." -echo "You can do:" -echo "mcview $file0" -echo "mcview $file0s" -echo "mcview $file0f" -echo "--------------------------------" -echo "Here is the first 30 lines of the diff, sorted by size (descending, in MB):" -head -n 30 $file0s -echo "--------------------------------" -echo "Here is the first 30 lines of the diff, sorted by folders (in MB):" -head -n 30 $file0f -echo "--------------------------------" - -exit 0 diff --git a/bin/v-df-snapshot-logs-cleaner b/bin/v-df-snapshot-logs-cleaner deleted file mode 100644 index 63275034..00000000 --- a/bin/v-df-snapshot-logs-cleaner +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# info: Clean up old snapshots of the disk usage -# options: NONE - -folder="/usr/local/vesta/data/df" -mkdir -p $folder -find $folder -type f -mtime +30 -delete - -folder="/usr/local/vesta/data/df-diff" -mkdir -p $folder -find $folder -type f -mtime +30 -delete diff --git a/bin/v-df-snapshot-make b/bin/v-df-snapshot-make deleted file mode 100644 index 985aab15..00000000 --- a/bin/v-df-snapshot-make +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -# info: Make a snapshot of the disk usage -# options: NONE - -folder="/usr/local/vesta/data/df" - -mkdir -p $folder -timestamp=$(date +%Y-%m-%d-%H-%M-%S) - -du --max-depth=1 -m -x / > $folder/snapshot-$timestamp.txt - -du --max-depth=6 -m -x /home > $folder/snapshot-temp.txt -for i in {2..7}; do - while IFS= read -r line; do - count=0 - for (( j=0; j<${#line}; j++ )); do - if [[ ${line:j:1} == "/" ]]; then - ((count++)) - fi - done - if [ $count -eq $i ]; then - printf '%s\n' "$line" >> $folder/snapshot-$timestamp.txt - fi - done < $folder/snapshot-temp.txt -done -rm $folder/snapshot-temp.txt - -if [ -d "/hdd" ]; then - du --max-depth=7 -m -x /hdd > $folder/snapshot-temp.txt - for i in {1..8}; do - while IFS= read -r line; do - count=0 - for (( j=0; j<${#line}; j++ )); do - if [[ ${line:j:1} == "/" ]]; then - ((count++)) - fi - done - if [ $count -eq $i ]; then - printf '%s\n' "$line" >> $folder/snapshot-$timestamp.txt - fi - done < $folder/snapshot-temp.txt - done - rm $folder/snapshot-temp.txt -fi - -du --max-depth=1 -m -x /var/lib/mysql >> $folder/snapshot-$timestamp.txt -du --max-depth=1 -m -x /var/log >> $folder/snapshot-$timestamp.txt - -chmod 600 $folder/snapshot-$timestamp.txt -chown root:root $folder/snapshot-$timestamp.txt - -exit 0 diff --git a/bin/v-edit-domain-php-ini b/bin/v-edit-domain-php-ini deleted file mode 100644 index 9eadfcee..00000000 --- a/bin/v-edit-domain-php-ini +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# info: Edit php.ini for certain domain -# options: DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -SILENT_MODE=1 - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - # echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - # echo "Domain doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -fpm_ver=$(/usr/local/vesta/bin/v-get-php-version-of-domain $domain) - -if [ -z "$fpm_ver" ]; then - echo "PHP version for domain $domain could not be determined." - exit 1 -fi - -config_file="/etc/php/${fpm_ver}/fpm/pool.d/${domain}.conf" - -if command -v mcedit >/dev/null; then - mcedit "$config_file" -else - nano "$config_file" -fi - -echo "Restarting PHP-FPM service for PHP version ${fpm_ver}" -systemctl restart php${fpm_ver}-fpm -if [ $? -ne 0 ]; then - systemctl status php${fpm_ver}-fpm - echo "=========================" - echo "" - echo "ERROR: php${fpm_ver}-fpm restart failed - please re-run the command and fix the problem !!!" - echo "" - exit $E_RESTART; -else - echo "The PHP-FPM service for PHP version ${fpm_ver} has been restarted successfully." -fi -echo "" - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit 0; diff --git a/bin/v-edit-php-ini b/bin/v-edit-php-ini deleted file mode 100644 index 0155e6bb..00000000 --- a/bin/v-edit-php-ini +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# info: Edit php.ini for a specific PHP version - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# List available PHP versions and store them into an array -mapfile -t php_versions < <(/usr/local/vesta/bin/v-list-php) - -echo "Available PHP versions:" -PS3="Please select the PHP version you want to edit php.ini for: " - -select php_version in "${php_versions[@]}"; do - if [[ -n $php_version ]]; then - break - else - echo "Invalid choice. Please try again." - fi -done - -# Define path to the php.ini file -php_ini_path="/etc/php/${php_version}/fpm/php.ini" - -# Check if php.ini exists for the selected version -if [[ ! -f "$php_ini_path" ]]; then - echo "The php.ini file for the selected PHP version ($php_version) does not exist." - exit 1 -fi - -# Determine the text editor to use -if command -v mcedit >/dev/null 2>&1; then - editor_cmd="mcedit" -elif command -v nano >/dev/null 2>&1; then - editor_cmd="nano" -else - echo "No supported text editor found. Please install 'mcedit' or 'nano'." - exit 1 -fi - -# Open php.ini for the chosen PHP version in the selected editor -echo "Opening $php_ini_path in editor $editor_cmd..." -$editor_cmd "$php_ini_path" - -# Restart the PHP-FPM service for the selected version -echo "Restarting the PHP-FPM service for PHP version $php_version..." -systemctl restart php${php_version}-fpm -if [ $? -ne 0 ]; then - systemctl status php${php_version}-fpm - echo "=========================" - echo "" - echo "ERROR: php${php_version}-fpm restart failed - please re-run the command and fix the problem !!!" - echo "" - exit $E_RESTART; -else - echo "The PHP-FPM service for PHP version ${php_version} has been restarted successfully." -fi - -#----------------------------------------------------------# -# Exit # -#----------------------------------------------------------# - -exit 0; diff --git a/bin/v-ensure-poold-folders-not-empty b/bin/v-ensure-poold-folders-not-empty deleted file mode 100644 index cb89765f..00000000 --- a/bin/v-ensure-poold-folders-not-empty +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# info: ensure that pool.d folders are not empty -# options: -# -# The function ensure that pool.d folders are not empty - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Includes -source $VESTA/func/main.sh -source $VESTA/func/domain.sh - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -ensure_poold_folders_not_empty - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-extract-fs-archive b/bin/v-extract-fs-archive index 1ea608af..ec70baba 100755 --- a/bin/v-extract-fs-archive +++ b/bin/v-extract-fs-archive @@ -82,7 +82,7 @@ fi # Extracting ziped archive if [ ! -z "$(echo $src_file |grep -i '.zip')" ]; then sudo -u $user mkdir -p "$dst_dir" >/dev/null 2>&1 - sudo -u $user unzip -o "$src_file" -d "$dst_dir" >/dev/null 2>&1 + sudo -u $user unzip "$src_file" -d "$dst_dir" >/dev/null 2>&1 rc=$? fi diff --git a/bin/v-file-replace-string b/bin/v-file-replace-string deleted file mode 100644 index 271cc50c..00000000 --- a/bin/v-file-replace-string +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/php -> $arg; fi; done' _ - -if [ -f "/tmp/patched" ]; then - rm /tmp/patched - - echo "== Restarting all PHP-FPM services" - systemctl --full --type service --all | grep "php...-fpm" | sed 's#●##g' | awk '{print $1}' | xargs systemctl restart - - echo "=== Everything done." -else - echo "=== Everything is already correct." -fi - -exit 0; diff --git a/bin/v-fix-user-permissions b/bin/v-fix-user-permissions deleted file mode 100644 index 47690477..00000000 --- a/bin/v-fix-user-permissions +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -# info: -# This script will fix files permissions for desired user (if ownership is lost or files have wrong chmod) - -# options: user - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ] && [ "$whoami" != "admin" ] ; then - echo "You must be root or admin to execute this script"; - exit 1; -fi - -# Argument definition -user=$1 - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'USER' -is_format_valid 'user' -is_object_valid 'user' 'USER' "$user" - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -find /home/$user/conf/mail/ -type d -exec chown Debian-exim:mail {} \; -find /home/$user/conf/mail/*/ -type f -exec chown Debian-exim:mail {} \; -find /home/$user/conf/mail/*/ -name "passwd" -type f -exec chown dovecot:mail {} \; - -find /home/$user/mail/ -type d -exec chown $user:mail {} \; -find /home/$user/mail/*/ -type d -exec chown $user:mail {} \; -find /home/$user/mail/*/ -type f -exec chown $user:mail {} \; -find /home/$user/mail/*/ -type d -exec chmod u+rwx {} \; -find /home/$user/mail/*/ -type d -exec chmod g+rwx {} \; -find /home/$user/mail/*/ -type f -exec chmod u+rw {} \; -find /home/$user/mail/*/ -type f -exec chmod g+rw {} \; -find /home/$user/mail/*/ -maxdepth 1 -type d -exec chmod g-rwx {} \; - -find /home/$user/conf/dns/ -type f -exec chown root:bind {} \; -find /home/$user/conf/ -type d -exec chown root:root {} \; - -for domain in $(/usr/local/vesta/bin/v-list-web-domains $user plain |cut -f 1); do - /usr/local/vesta/bin/v-fix-website-permissions $domain $user - echo "--------------------------------" -done - -echo "Done, permissions fixed for user: $user" - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-fix-website-permissions b/bin/v-fix-website-permissions deleted file mode 100644 index 50b143c8..00000000 --- a/bin/v-fix-website-permissions +++ /dev/null @@ -1,161 +0,0 @@ -#!/bin/bash -# info: Fixing chown and chmod permissions for a website -# options: DOMAIN [USER] - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -# Check if number of arguments is 2 -if [ $# -eq 2 ]; then - user=$2 -else - user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -fi -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/conf/vesta.conf - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "Error: Folder /home/$user doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Error: Folder /home/$user/web/$domain/public_html doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Going to domain directory -cd /home/$USER/web/$domain - -# Ownership check -if [ -z "$SKIP_OWNERSHIP_CHECK" ] && [ -f "public_html/index.php" ]; then - owner=$(stat -c '%U' "public_html/index.php") - if [ "$owner" = "root" ] || [ "$owner" = "www-data" ]; then - echo "Skipping permission fix for $domain, because v-lock-wordpress is used (index.php is owned by $owner)" - exit 1 - fi -fi - -echo "Updating permissions and ownership for /home/$USER/web/$domain/" - -php_chmod_allowed=1 -if [ -f "/home/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi -if [ -f "/home/$USER/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi -if [ -f "/home/$USER/web/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi -if [ -f "/home/$USER/web/$domain/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi - -# === General files and directories permissions === -if [ "$php_chmod_allowed" -eq 1 ]; then - # New way of fixing permissions - # Fixing permissions - find public_html/ -type d ! -perm 755 -exec chmod 755 {} + - find public_html/ -type f ! \( -name "*.php" -o -name "*.env" \) ! -perm 644 -exec chmod 644 {} + - - # Fixing ownership - find public_html/ -type d ! -user $USER -exec chown $USER:$USER {} + - find public_html/ -type f ! \( -name "*.php" -o -name "*.env" \) ! -user $USER -exec chown $USER:$USER {} + -else - # Old way of fixing permissions - # Fixing permissions - find public_html/ -type d ! -perm 755 -exec chmod 755 {} + - find public_html/ -type f ! -perm 644 -exec chmod 644 {} + - - # Fixing ownership - find public_html/ -type d ! -user $USER -exec chown $USER:$USER {} + - find public_html/ -type f ! -user $USER -exec chown $USER:$USER {} + -fi - -# === PHP and .env permissions === -if [ "$php_chmod_allowed" -eq 1 ]; then - php_chmod="600" - - if [ "$WEB_SYSTEM" = 'nginx' ]; then - php_chmod="644" - fi - - if [ -f "/home/php_chmod" ]; then - php_chmod=$(cat /home/php_chmod) - fi - if [ -f "/home/$USER/php_chmod" ]; then - php_chmod=$(cat /home/$USER/php_chmod) - fi - if [ -f "/home/$USER/web/php_chmod" ]; then - php_chmod=$(cat /home/$USER/web/php_chmod) - fi - if [ -f "/home/$USER/web/$domain/php_chmod" ]; then - php_chmod=$(cat /home/$USER/web/$domain/php_chmod) - fi - - # Setting chmod 600 for all .php and .env files - echo "= Setting chmod $php_chmod for all .php and .env files" - # Fixing permissions - find -type f \( -name "*.php" -o -name "*.env" \) ! -perm $php_chmod -exec chmod $php_chmod {} + - # Fixing ownership - find -type f \( -name "*.php" -o -name "*.env" \) ! -user $USER -exec chown $USER:$USER {} + -fi - -# === Symlinks ownership === -symlink_chown_allowed=1 -if [ -f "/home/symlink_chown_disabled" ]; then - symlink_chown_allowed=0 -fi -if [ -f "/home/$USER/symlink_chown_disabled" ]; then - symlink_chown_allowed=0 -fi -if [ -f "/home/$USER/web/symlink_chown_disabled" ]; then - symlink_chown_allowed=0 -fi -if [ -f "/home/$USER/web/$domain/symlink_chown_disabled" ]; then - symlink_chown_allowed=0 -fi - -if [ "$symlink_chown_allowed" -eq 1 ]; then - find -type l ! -user $USER -exec chown -h $USER:$USER {} + -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# -echo "Permissions for $domain have been successfully updated." - -exit 0 diff --git a/bin/v-fix-website-permissions-for-all-websites b/bin/v-fix-website-permissions-for-all-websites deleted file mode 100644 index 9b1501bd..00000000 --- a/bin/v-fix-website-permissions-for-all-websites +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# info: fix website permissions for all websites -# options: -# -# The command is used for fixing website permissions for all websites on the server. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Importing system variables -source /etc/profile - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then - continue; - fi - - for domain in $(/usr/local/vesta/bin/v-list-web-domains $user plain |cut -f 1); do - /usr/local/vesta/bin/v-fix-website-permissions $domain $user - echo "--------------------------------" - done - -done - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-fix-website-permissions-for-all-websites-only-php b/bin/v-fix-website-permissions-for-all-websites-only-php deleted file mode 100644 index a89d2416..00000000 --- a/bin/v-fix-website-permissions-for-all-websites-only-php +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# info: fix website permissions for all websites -# options: -# -# The command is used for fixing website permissions for all websites on the server. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Importing system variables -source /etc/profile - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -touch /usr/local/vesta/log/fix-website-permissions-for-all-websites-only-php.log -truncate -s 0 /usr/local/vesta/log/fix-website-permissions-for-all-websites-only-php.log - -for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then - continue; - fi - - for domain in $(/usr/local/vesta/bin/v-list-web-domains $user plain |cut -f 1); do - /usr/local/vesta/bin/v-fix-website-permissions-only-php $domain $user >> /usr/local/vesta/log/fix-website-permissions-for-all-websites-only-php.log 2>&1 - echo "--------------------------------" >> /usr/local/vesta/log/fix-website-permissions-for-all-websites-only-php.log - done - -done - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-fix-website-permissions-only-php b/bin/v-fix-website-permissions-only-php deleted file mode 100644 index cf548e6b..00000000 --- a/bin/v-fix-website-permissions-only-php +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/bash -# info: Fixing PHP and .env permissions and ownership for a website -# options: DOMAIN [USER] - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -# Check if number of arguments is 2 -if [ $# -eq 2 ]; then - user=$2 -else - user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -fi -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/conf/vesta.conf - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "Error: Folder /home/$user doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Error: Folder /home/$user/web/$domain/public_html doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Going to domain directory -cd /home/$USER/web/$domain - -# Ownership check -if [ -z "$SKIP_OWNERSHIP_CHECK" ] && [ -f "public_html/index.php" ]; then - owner=$(stat -c '%U' "public_html/index.php") - if [ "$owner" = "root" ] || [ "$owner" = "www-data" ]; then - echo "Skipping permission fix for $domain, because v-lock-wordpress is used (index.php is owned by $owner)" - exit 1 - fi -fi - -echo "Updating PHP and .env permissions and ownership for /home/$USER/web/$domain/" - -php_chmod_allowed=1 -if [ -f "/home/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi -if [ -f "/home/$USER/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi -if [ -f "/home/$USER/web/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi -if [ -f "/home/$USER/web/$domain/php_chmod_disabled" ]; then - php_chmod_allowed=0 -fi - -# === PHP and .env permissions === -if [ "$php_chmod_allowed" -eq 1 ]; then - php_chmod="600" - - if [ "$WEB_SYSTEM" = 'nginx' ]; then - php_chmod="644" - fi - - if [ -f "/home/php_chmod" ]; then - php_chmod=$(cat /home/php_chmod) - fi - if [ -f "/home/$USER/php_chmod" ]; then - php_chmod=$(cat /home/$USER/php_chmod) - fi - if [ -f "/home/$USER/web/php_chmod" ]; then - php_chmod=$(cat /home/$USER/web/php_chmod) - fi - if [ -f "/home/$USER/web/$domain/php_chmod" ]; then - php_chmod=$(cat /home/$USER/web/$domain/php_chmod) - fi - - # Setting chmod 600 for all .php and .env files - echo "= Setting chmod $php_chmod for all .php and .env files" - # Fixing permissions - find -type f \( -name "*.php" -o -name "*.env" \) ! -perm $php_chmod -exec chmod $php_chmod {} + - # Fixing ownership - find -type f \( -name "*.php" -o -name "*.env" \) ! -user $USER -exec chown $USER:$USER {} + -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# -echo "PHP and .env permissions and ownership for $domain have been successfully updated." - -exit 0 diff --git a/bin/v-fix-wordpress-core b/bin/v-fix-wordpress-core deleted file mode 100644 index 2bcd6c34..00000000 --- a/bin/v-fix-wordpress-core +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/bash -# info: fix compromised wp-admin and wp-includes -# options: DOMAIN [CACHE_DIR] -# -# Replaces wp-admin and wp-includes with clean copies that match -# the WordPress core version detected on the site. -# -# Example: -# v-fix-wp-core example.com -# v-fix-wp-core example.com /srv/wp-cache - -#----------------------------------------------------------# -# Variable & Function # -#----------------------------------------------------------# - -# Arguments -DOMAIN="$1" -CACHE_DIR="${2-/srv/wp-cache}" # default cache location - -QUARANTINE_DIR="/srv/wp-quarantine" - -# Includes -source $VESTA/func/main.sh -source $VESTA/conf/vesta.conf - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# -check_args '1' "$#" 'DOMAIN [CACHE_DIR]' -is_format_valid 'domain' - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -TMP_DIR="$(mktemp -d /tmp/wpfix.XXXXXX)" # temp workspace -trap 'rm -rf "$TMP_DIR"' EXIT - -# 1etermine WP version -if [ -z "$PHP" ]; then - WP_VERSION="$(/usr/local/vesta/bin/v-run-wp-cli "$DOMAIN" core version | tr -d '[:space:]')" -else - WP_VERSION="$(PHP=$PHP /usr/local/vesta/bin/v-run-wp-cli "$DOMAIN" core version | tr -d '[:space:]')" -fi - -check_result $? "cannot detect WP version" > /dev/null -if [ -z "$WP_VERSION" ]; then - check_result 1 "empty WP version string" -fi -echo "Detected WordPress version $WP_VERSION" - -# 2ind site owner and path -USER="$(/usr/local/vesta/bin/v-search-domain-owner "$DOMAIN")" -check_result $? "cannot find domain owner" > /dev/null -SITE_PATH="/home/$USER/web/$DOMAIN/public_html" -if [ ! -d "$SITE_PATH" ]; then - check_result 1 "site path $SITE_PATH does not exist" -fi - -# ensure cached core is present -CACHE_PATH="$CACHE_DIR/$WP_VERSION" -if [ ! -d "$CACHE_PATH/wp-admin" ] || [ ! -d "$CACHE_PATH/wp-includes" ]; then - echo "Cache for $WP_VERSION missing, downloading ZIP..." - - mkdir -p "$CACHE_PATH" - ZIP_URL="https://wordpress.org/wordpress-${WP_VERSION}.zip" - ZIP_FILE="$TMP_DIR/wp.zip" - - curl -fSL "$ZIP_URL" -o "$ZIP_FILE" - check_result $? "download failed" > /dev/null - - unzip -q "$ZIP_FILE" -d "$TMP_DIR" - check_result $? "unzip failed" > /dev/null - - mv "$TMP_DIR/wordpress/wp-admin" "$CACHE_PATH/" - mv "$TMP_DIR/wordpress/wp-includes" "$CACHE_PATH/" - cp "$TMP_DIR/wordpress"/*.php "$CACHE_PATH/" -fi - -# backup current core folders -TIMESTAMP="$(date +%Y%m%d%H%M%S)" -BACKUP_DIR="$QUARANTINE_DIR/$DOMAIN/backup-core-$TIMESTAMP" -mkdir -p "$BACKUP_DIR" -mv "$SITE_PATH/wp-admin" "$BACKUP_DIR/" -mv "$SITE_PATH/wp-includes" "$BACKUP_DIR/" - -for f in "$SITE_PATH"/*.php; do - [[ $(basename "$f") == "wp-config.php" ]] && continue - mv "$f" "$BACKUP_DIR/" -done -if [ -f "$SITE_PATH/.user.ini" ]; then - mv "$SITE_PATH/.user.ini" "$BACKUP_DIR/" -fi - -# chown -R www-data:www-data "$BACKUP_DIR" -check_result $? "backup failed" > /dev/null -echo "Old core folders moved to $BACKUP_DIR" - -# deploy clean core -rsync -a --delete "$CACHE_PATH/wp-admin/" "$SITE_PATH/wp-admin/" -rsync -a --delete "$CACHE_PATH/wp-includes/" "$SITE_PATH/wp-includes/" -check_result $? "rsync failed" > /dev/null - -for corephp in "$CACHE_PATH"/*.php; do - base=$(basename "$corephp") - [ "$base" = "wp-config.php" ] && continue - rsync -a "$corephp" "$SITE_PATH/$base" -done - -# fix permissions -SKIP_OWNERSHIP_CHECK=1 /usr/local/vesta/bin/v-fix-website-permissions $DOMAIN -# chown -R www-data:www-data "$BACKUP_DIR" - -echo "Done, core WP files, wp-admin and wp-includes replaced for $DOMAIN" -exit diff --git a/bin/v-generate-api-key b/bin/v-generate-api-key index c6221cc6..ba60b92f 100755 --- a/bin/v-generate-api-key +++ b/bin/v-generate-api-key @@ -23,7 +23,6 @@ HASH=$(keygen) if [ ! -d ${KEYS} ]; then mkdir ${KEYS} - chmod 0770 ${KEYS} fi if [[ -e ${KEYS}${HASH} ]] ; then diff --git a/bin/v-generate-ssl-cert b/bin/v-generate-ssl-cert index 394c6625..9f75f9d8 100755 --- a/bin/v-generate-ssl-cert +++ b/bin/v-generate-ssl-cert @@ -67,7 +67,7 @@ fi args_usage='DOMAIN EMAIL COUNTRY STATE CITY ORG UNIT [ALIASES] [FORMAT]' check_args '7' "$#" "$args_usage" -is_format_valid 'domain' 'alias' 'format' +is_format_valid 'domain_alias' 'format' #----------------------------------------------------------# diff --git a/bin/v-get-database-credentials-of-domain b/bin/v-get-database-credentials-of-domain deleted file mode 100644 index cb5729b0..00000000 --- a/bin/v-get-database-credentials-of-domain +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/bash - -# info: get database credentials and other basic data of domain -# options: DOMAIN [SUBFOLDER] -# -# The function get database credentials and other basic data of domain. - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Argument definition -DOMAIN=$1 -SUBFOLDER='' -if [ $# -gt 1 ]; then - SUBFOLDER=$2 -fi - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/db.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN [SUBFOLDER]' -is_domain_format_valid "$DOMAIN" - -USER=$(/usr/local/vesta/bin/v-search-domain-owner "$DOMAIN") -if [ -z "$USER" ]; then - echo "Error: domain $DOMAIN does not exists" - exit 2 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -PUBLIC_HTML='public_html'; -CHECK_PUBLIC_SHTML=$(/usr/local/vesta/bin/v-list-web-domain "$USER" "$DOMAIN" | grep 'SSL:' | grep -c 'single') -if [ $CHECK_PUBLIC_SHTML -eq 1 ]; then - PUBLIC_HTML='public_shtml'; -fi -SITE_FOLDER="/home/$USER/web/$DOMAIN/$PUBLIC_HTML" - -if [ ! -z "$SUBFOLDER" ]; then - SITE_FOLDER="${SITE_FOLDER}/${SUBFOLDER}" -fi - -CMS_TYPE='' - -if [ -f "$SITE_FOLDER/wp-config.php" ]; then - CMS_TYPE='wordpress' - CONFIG_FILE="wp-config.php" - CONFIG_FILE_FULL_PATH="$SITE_FOLDER/$CONFIG_FILE" -fi -if [ -f "$SITE_FOLDER/configuration.php" ]; then - CMS_TYPE='joomla' - CONFIG_FILE="configuration.php" - CONFIG_FILE_FULL_PATH="$SITE_FOLDER/$CONFIG_FILE" -fi -if [ -f "$SITE_FOLDER/system/engine/model.php" ]; then - check_grep=$(grep -c 'OpenCart' $SITE_FOLDER/system/engine/model.php) - if [ "$check_grep" -gt 0 ]; then - CMS_TYPE='opencart' - CONFIG_FILE="$PUBLIC_HTML/config.php" - SUBFOLDER='..' - SITE_FOLDER="${SITE_FOLDER}/.." - CONFIG_FILE_FULL_PATH="$SITE_FOLDER/$CONFIG_FILE" - fi -fi - -if [ "$CMS_TYPE" = "wordpress" ]; then - CONFIG_FILE_FULL_PATH_BACKUP="${CONFIG_FILE_FULL_PATH}_backup" - cp $CONFIG_FILE_FULL_PATH $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|//.*$||g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|\"|'|g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|('|( '|g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|');|' );|g" $CONFIG_FILE_FULL_PATH_BACKUP - DATABASE_NAME=$(grep 'DB_NAME' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_USERNAME=$(grep 'DB_USER' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_PASSWORD=$(grep 'DB_PASSWORD' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_HOSTNAME=$(grep 'DB_HOST' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - rm $CONFIG_FILE_FULL_PATH_BACKUP -fi - -if [ "$CMS_TYPE" = "joomla" ]; then - CONFIG_FILE_FULL_PATH_BACKUP="${CONFIG_FILE_FULL_PATH}_backup" - cp $CONFIG_FILE_FULL_PATH $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|//.*$||g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|='|= '|g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|= '| = '|g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s| =| =|g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|';$|'|g" $CONFIG_FILE_FULL_PATH_BACKUP - DATABASE_NAME=$(grep 'public $db ' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $4}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_USERNAME=$(grep 'public $user ' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $4}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_PASSWORD=$(grep 'public $password ' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $4}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_HOSTNAME=$(grep 'public $host ' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $4}' | sed -e "s/^'//" -e "s/'$//") - rm $CONFIG_FILE_FULL_PATH_BACKUP -fi - -if [ "$CMS_TYPE" = "opencart" ]; then - CONFIG_FILE_FULL_PATH_BACKUP="${CONFIG_FILE_FULL_PATH}_backup" - cp $CONFIG_FILE_FULL_PATH $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|//.*$||g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|('|( '|g" $CONFIG_FILE_FULL_PATH_BACKUP - sed -i "s|');|' );|g" $CONFIG_FILE_FULL_PATH_BACKUP - DATABASE_NAME=$(grep 'DB_DATABASE' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_USERNAME=$(grep 'DB_USERNAME' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_PASSWORD=$(grep 'DB_PASSWORD' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - DATABASE_HOSTNAME=$(grep 'DB_HOST' $CONFIG_FILE_FULL_PATH_BACKUP | awk '{print $3}' | sed -e "s/^'//" -e "s/'$//") - rm $CONFIG_FILE_FULL_PATH_BACKUP -fi - - -if [ ! -z "$DATABASE_NAME" ]; then - DATABASE_NAME_WITHOUT_USER_PREFIX=$(get_database_name_without_user_prefix "$USER" "$DATABASE_NAME") -fi -if [ ! -z "$DATABASE_USERNAME" ]; then - DATABASE_USERNAME_WITHOUT_USER_PREFIX=$(get_database_name_without_user_prefix "$USER" "$DATABASE_USERNAME") -fi - -DATABASE_NAME_WITHOUT_USER_PREFIX=$(escape_shell_quote $DATABASE_NAME_WITHOUT_USER_PREFIX) -echo "DATABASE_NAME_WITHOUT_USER_PREFIX=$DATABASE_NAME_WITHOUT_USER_PREFIX" - -DATABASE_USERNAME_WITHOUT_USER_PREFIX=$(escape_shell_quote $DATABASE_USERNAME_WITHOUT_USER_PREFIX) -echo "DATABASE_USERNAME_WITHOUT_USER_PREFIX=$DATABASE_USERNAME_WITHOUT_USER_PREFIX" - -DATABASE_NAME=$(escape_shell_quote $DATABASE_NAME) -echo "DATABASE_NAME=$DATABASE_NAME" - -DATABASE_USERNAME=$(escape_shell_quote $DATABASE_USERNAME) -echo "DATABASE_USERNAME=$DATABASE_USERNAME" - -DATABASE_PASSWORD=$(escape_shell_quote $DATABASE_PASSWORD) -echo "DATABASE_PASSWORD=$DATABASE_PASSWORD" - -DATABASE_HOSTNAME=$(escape_shell_quote $DATABASE_HOSTNAME) -echo "DATABASE_HOSTNAME=$DATABASE_HOSTNAME" - -CONFIG_FILE_FULL_PATH=$(escape_shell_quote $CONFIG_FILE_FULL_PATH) -echo "CONFIG_FILE_FULL_PATH=$CONFIG_FILE_FULL_PATH" - -CONFIG_FILE=$(escape_shell_quote $CONFIG_FILE) -echo "CONFIG_FILE=$CONFIG_FILE" - -CMS_TYPE=$(escape_shell_quote $CMS_TYPE) -echo "CMS_TYPE=$CMS_TYPE" - -SITE_FOLDER=$(escape_shell_quote $SITE_FOLDER) -echo "SITE_FOLDER=$SITE_FOLDER" - -SUBFOLDER=$(escape_shell_quote $SUBFOLDER) -echo "SITE_SUBFOLDER=$SUBFOLDER" - -USER=$(escape_shell_quote $USER) -echo "SITE_USER=$USER" - -if [ "$CMS_TYPE" = "'opencart'" ]; then - echo "SEARCH_FOR_CONFIGS_DATABASE_NAME=1" - echo "SEARCH_FOR_CONFIGS_DATABASE_USERNAME=1" -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-get-dns-config b/bin/v-get-dns-config deleted file mode 100644 index d759c489..00000000 --- a/bin/v-get-dns-config +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# info: Get domain DNS config.db file content -# options: DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -SILENT_MODE=1 - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - # echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - # echo "Domain doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -DNS_FILE="/home/$user/conf/dns/$domain.db" - -if [ -f "$DNS_FILE" ]; then - cat "$DNS_FILE" -else - echo "DNS configuration file for $domain does not exist." - exit 1 -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit 0; diff --git a/bin/v-get-php-version-of-domain b/bin/v-get-php-version-of-domain deleted file mode 100644 index c87b4e4c..00000000 --- a/bin/v-get-php-version-of-domain +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -# info: Check PHP version used for certain domain -# options: DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -SILENT_MODE=1 - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - # echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - # echo "Domain doesn't exist"; - exit 1; -fi - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - - -TPL=$(/usr/local/vesta/bin/v-list-web-domain $user $domain shell | grep 'TEMPLATE:' | awk '{print $2}') -if [[ $TPL == "PHP-FPM-"* ]]; then - fpm_tpl_ver=${TPL:8:2} - fpm_ver="${TPL:8:1}.${TPL:9:1}" - echo "$fpm_ver" - exit 0; -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit 1; diff --git a/bin/v-get-user-salt b/bin/v-get-user-salt deleted file mode 100755 index b99a684a..00000000 --- a/bin/v-get-user-salt +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/bash -# info: get user salt -# options: USER [IP] [FORMAT] -# -# The function provides users salt - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -user=$1 -ip=${2-127.0.0.1} -format=${3-shell} - -# Includes -source $VESTA/func/main.sh -source $VESTA/conf/vesta.conf - -time_n_date=$(date +'%T %F') -time=$(echo "$time_n_date" |cut -f 1 -d \ ) -date=$(echo "$time_n_date" |cut -f 2 -d \ ) - -# JSON list function -json_list() { - echo '{' - echo ' "'$user'": { - "METHOD": "'$method'", - "SALT": "'$salt'", - "TIME": "'$time'", - "DATE": "'$date'" - }' - echo '}' -} - -# SHELL list function -shell_list() { - echo "METHOD: $method" - echo "SALT: $salt" -} - -# PLAIN list function -plain_list() { - echo -e "$method\t$salt" -} - -# CSV list function -csv_list() { - echo "METHOD,SALT" - echo "$method, $salt" -} - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - - -check_args '1' "$#" 'USER [IP] [SALT]' -is_format_valid 'user' - -# Checking user -if [ ! -d "$VESTA/data/users/$user" ]; then - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Parsing user's salt -shadow=$(grep "^$user:" /etc/shadow | cut -f 2 -d :) - -if echo "$shadow" | grep -qE '^\$[0-9a-z]+\$[^\$]+\$' -then - salt=$(echo "$shadow" |cut -f 3 -d \$) - method=$(echo "$shadow" |cut -f 2 -d \$) - if [ "$method" -eq '1' ]; then - method='md5' - elif [ "$method" -eq '6' ]; then - method='sha-512' - else - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 - fi -else - salt=${shadow:0:2} - method='des' -fi - -if [ -z "$salt" ]; then - echo "Error: password missmatch" - echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - exit 9 -fi - - -# Listing data -case $format in - json) json_list ;; - plain) plain_list ;; - csv) csv_list ;; - shell) shell_list ;; -esac - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging - -exit diff --git a/bin/v-grep b/bin/v-grep deleted file mode 100644 index 9ea821e5..00000000 --- a/bin/v-grep +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# info: calling myvesta_grep PHP function -# options: PARAMETERS -# -# The function is calling myVesta PHP replacement for GNU 'grep' command (but without regular expression) - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - - -if [ "$1" == "--stdin" ] && [ -p /dev/stdin ]; then - STDIN=$(cat -) - if [ ! -z "$STDIN" ]; then - shift; - echo "$STDIN" | php /usr/local/vesta/func/bash-to-php-interpreter.php '--stdin' 'myvesta_grep' "$@" - exit $? - fi -fi - -if [ "$1" == "--stdin" ]; then - shift; - php /usr/local/vesta/func/bash-to-php-interpreter.php '--stdin' 'myvesta_grep' "$@" -else - php /usr/local/vesta/func/bash-to-php-interpreter.php 'myvesta_grep' "$@" -fi -exit $? diff --git a/bin/v-import-cpanel-backup b/bin/v-import-cpanel-backup deleted file mode 100644 index 43e8c3bf..00000000 --- a/bin/v-import-cpanel-backup +++ /dev/null @@ -1,382 +0,0 @@ -#!/bin/bash -# Author / Idea: Maks Usmanov - Skamasle and good people who help to improve: -# Thanks to https://github.com/Skamasle/sk-import-cpanel-backup-to-vestacp/graphs/contributors -# Github: https://github.com/Skamasle/sk-import-cpanel-backup-to-vestacp -# Run at your own risk -# This script take cpanel full backup and import it in vestacp account -# This script can import databases and database users and password, -# Import domains, subdomains and website files -# This script import also mail accounts and mails into accounts if previous cpanel run dovecot -########### -# If you need restore main database user read line 160 or above -########### -if [ $# -lt 1 ]; then - echo "usage: bash $0 cpanel-backup.tar.gz" - echo "or" - echo "usage: bash $0 cpanel-backup.tar.gz MX" - exit 1 -fi -if [[ $PATH != *"/usr/local/vesta/bin"* ]]; then - VESTA=/usr/local/vesta - export VESTA - - PATH=$PATH:/usr/local/vesta/bin - export PATH -fi -if [ ! -e /usr/bin/rsync ] || [ ! -e /usr/bin/file ] ; then - echo "#######################################" - echo "rsync not installed, try installing it" - echo "This script need: rsync, file" - echo "#######################################" - if [ -e /etc/redhat-release ]; then - echo "Run: yum install rsync file" - else - echo "Run: apt-get install rsync file" - fi - exit 3 -fi -# Put this to 0 if you want use bash -x to debug it -sk_debug=1 -sk_vesta_package=default -# -# Only for gen_password but I dont like it, a lot of lt -# maybe will use it for other functions :) -source /usr/local/vesta/func/main.sh -sk_file=$1 -sk_tmp=sk_tmp -# I see than this is stupid, not know why is here. -sk_file_name=$(ls $sk_file) -tput setaf 2 -echo "Checking provided file..." -tput sgr0 -if file $sk_file |grep -q -c "gzip compressed data," ; then - tput setaf 2 - echo "OK - Gziped File" - tput sgr0 - if [ ! -d /root/${sk_tmp} ]; then - echo "Creating tmp.." - mkdir /root/${sk_tmp} - fi - echo "Extracting backup..." - if [ "$sk_debug" != 0 ]; then - tar xzvf $sk_file -C /root/${sk_tmp} 2>&1 | - while read sk_extracted_file; do - ex=$((ex+1)) - echo -en "wait... $ex files extracted\r" - done - else - tar xzf $sk_file -C /root/${sk_tmp} - fi - if [ $? -eq 0 ];then - tput setaf 2 - echo "Backup extracted without errors..." - tput sgr0 - else - echo "Error on backup extraction, check your file, try extract it manually" - echo "Remove tmp" - rm -rf "/root/${sk_tmp}" - exit 1 - fi - else - echo "Error 3 not-gzip - no stantard cpanel backup provided of file not installed ( Try yum install file, or apt-get install file )" - rm -rf "/root/${sk_tmp}" - exit 3 -fi -cd /root/${sk_tmp}/* -sk_importer_in=$(pwd) -echo "Access tmp directory $sk_importer_in" -echo "Get prefix..." -sk_dead_prefix=$(cat meta/dbprefix) -if [ $sk_dead_prefix = 1 ]; then - echo "Error 666 - I dont like your prefix, I dont want do this job" - exit 666 -else - echo "I like your prefix, start working" -fi -main_domain1=$(grep main_domain userdata/main |cut -d " " -f2) -if [ "$(ls -A mysql)" ]; then - sk_cp_user=$(ls mysql |grep sql | grep -v roundcube.sql |head -n1 |cut -d "_" -f1) - if [ -z "$sk_cp_user" ]; then - sk_cp_user=$(grep "user:" userdata/${main_domain1} | cut -d " " -f2) - fi - echo "$sk_cp_user" > sk_db_prefix - tput setaf 2 - echo "Get user: $sk_cp_user" - tput sgr0 - sk_restore_dbs=0 -else - sk_restore_dbs=1 -# get real cPanel user if no databases exist - sk_cp_user=$(grep "user:" userdata/${main_domain1} | cut -d " " -f2) -fi -# So get real user, may be we need it after -- oh yes, not remember where but this save my day march 19 2017 on 0.5 -sk_real_cp_user=$(grep "user:" userdata/${main_domain1} | cut -d " " -f2) -if /usr/local/vesta/bin/v-list-users | grep -q -w $sk_cp_user ;then - echo "User alredy exist on your server, maybe on vestacp or in your /etc/passwd" - echo "**" - echo "Grep your /etc/passwd" - grep -q -w $sk_cp_user /etc/passwd - echo "**" - echo "Stop Working, clening..." - rm -rf /root/${sk_tmp} - exit 21 -else - echo "Generate random password for $sk_cp_user and create Vestacp Account ..." - sk_password=$(generate_password) - /usr/local/vesta/bin/v-add-user $sk_cp_user $sk_password administrator@${main_domain1} $sk_vesta_package $sk_cp_user $sk_cp_user - if [ $? != 0 ]; then - tput setaf 2 - echo "Stop Working... Cant create user...if is fresh install of vestacp try reboot or reopen session check bug https://bugs.vestacp.com/issues/138" - tput sgr0 - rm -rf "/root/${sk_tmp}" - exit 4 - fi -fi - -### Start with Databases -mysql -e "SET GLOBAL max_allowed_packet=1073741824;" -tput setaf 2 -echo "Start with Databases" -tput sgr0 -sed -i 's/\\//g' mysql.sql -sed -i "s/\`/'/g" mysql.sql - -## User / Password -grep "GRANT USAGE ON" mysql.sql | awk -F "'" '{ print $2, $6 }' | uniq > user_password_db -# User and database -grep "GRANT" mysql.sql |grep -v "USAGE ON" > u_db -cat u_db | awk -F "'" '{ print $2, $4 }' | sort | uniq > uni_u_db -sed -i "s/$sk_dead_prefix //g" user_password_db -# Get database list -sk_db_list=$(grep -m 1 Database: mysql/*.create | awk '{ print $5 }') -mysql -e "SHOW DATABASES" > server_dbs -for sk_dbr in $sk_db_list - do - grep -w $sk_dbr server_dbs - if [ $? == "1" ]; then - echo " Create and restore ${sk_dbr} " - sed -i "s/utf8mb4_unicode_520_ci/utf8mb4_unicode_ci/g" mysql/${sk_dbr}.create - sed -i "s/utf8mb4_0900_ai_ci/utf8mb4_unicode_ci/g" mysql/${sk_dbr}.create - if grep -q ' enable the sandbox mode ' mysql/${sk_dbr}.create; then - v-sed '/*!999999\- enable the sandbox mode */' '' mysql/${sk_dbr}.create - fi - mysql < mysql/${sk_dbr}.create - sed -i "s/utf8mb4_unicode_520_ci/utf8mb4_unicode_ci/g" mysql/${sk_dbr}.sql - sed -i "s/utf8mb4_0900_ai_ci/utf8mb4_unicode_ci/g" mysql/${sk_dbr}.sql - if grep -q ' enable the sandbox mode ' mysql/${sk_dbr}.sql; then - v-sed '/*!999999\- enable the sandbox mode */' '' mysql/${sk_dbr}.sql - fi - mysql ${sk_dbr} < mysql/${sk_dbr}.sql - else - echo "Error: Cant restore database $sk_dbr alredy exists in mysql server" - fi -done - -cat uni_u_db | while read db userdb -do - grep -w $userdb user_password_db |while read user end_user_pass - do -# default cpanel user has all database privileges -# if you use default user in your config files to connect with database -# you will need remove && [ "$userdb" != "$sk_cp_user" ] to restore main user, but -# this will cause database duplication in db.conf and will interfer with vestacp backups - if [ "$userdb" == "$user" ] && [ "$userdb" != "$sk_cp_user" ] && [ "$userdb" != "$sk_real_cp_user" ] ; then - echo "DB='$db' DBUSER='$userdb' MD5='$end_user_pass' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='$TIME' DATE='$DATE'" >> /usr/local/vesta/data/users/${sk_cp_user}/db.conf - fi - done -done - -# Leave vesta restore passwords and create users -tput setaf 2 -echo "Rebuild databases files for $sk_cp_user" -tput sgr0 -/usr/local/vesta/bin/v-rebuild-databases $sk_cp_user - -## end mysql - -skaddons=$(cat addons |cut -d "=" -f1) -sed -i 's/_/./g; s/=/ /g' addons -echo "Converting addons domains, subdomains and some other fun" -cp sds sk_sds -cp sds2 sk_sds2 -sed -i 's/_/./g' sk_sds -sed -i 's/public_html/public@html/g; s/_/./g; s/public@html/public_html/g; s/=/ /g; s/$sk_default_sub/@/g' sk_sds2 -cat addons | while read sk_addon_domain sk_addon_sub -do - echo "Converting default subdomain: $sk_addon_sub in domain: $sk_addon_domain" - sed -i -e "s/$sk_addon_sub/$sk_addon_domain/g" sk_sds - sed -i -e "s/$sk_addon_sub/$sk_addon_domain/g" sk_sds2 - mv userdata/$sk_addon_sub userdata/${sk_addon_domain} -done - -tput setaf 2 -echo "Start restoring domains" -tput sgr0 -function get_domain_path() { - while read sk_domain path - do - if [ -e userdata/${sk_domain} ];then - /usr/local/vesta/bin/v-add-domain $sk_cp_user $sk_domain - echo "Restoring $sk_domain..." - rm -f /home/${sk_cp_user}/web/${sk_domain}/public_html/index.html - if [ "$sk_debug" != 0 ]; then - rsync -av homedir/${path}/ /home/${sk_cp_user}/web/${sk_domain}/public_html 2>&1 | - while read sk_file_dm; do - sk_sync=$((sk_sync+1)) - echo -en "-- $sk_sync restored files\r" - done - echo " " - else - rsync homedir/${path}/ /home/${sk_cp_user}/web/${sk_domain}/public_html - fi - chown $sk_cp_user:$sk_cp_user -R /home/${sk_cp_user}/web/${sk_domain}/public_html - chmod 751 /home/${sk_cp_user}/web/${sk_domain}/public_html - echo "$sk_domain" >> exclude_path - fi -done - -} -get_domain_path < sk_sds2 - -/usr/local/vesta/bin/v-add-domain $sk_cp_user $main_domain1 -# need it for restore main domain -if [ ! -e exclude_path ];then - touch exclude_path -fi -echo "Restore main domain: $main_domain1" -rm -f /home/${sk_cp_user}/web/${main_domain1}/public_html/index.html -if [ "$sk_debug" != 0 ]; then - rsync -av --exclude-from='exclude_path' homedir/public_html/ /home/${sk_cp_user}/web/${main_domain1}/public_html 2>&1 | - while read sk_file_dm; do - sk_sync=$((sk_sync+1)) - echo -en "-- $sk_sync restored files\r" - done - echo " " -else - rsync --exclude-from='exclude_path' homedir/public_html/ /home/${sk_cp_user}/web/${main_domain1}/public_html 2>&1 -fi -chown $sk_cp_user:$sk_cp_user -R /home/${sk_cp_user}/web/${main_domain1}/public_html -chmod 751 /home/${sk_cp_user}/web/${main_domain1}/public_html -rm -f sk_sds2 sk_sds - -################## -# mail - -time_n_date=$(date +'%T %F') -time=$(echo "$time_n_date" |cut -f 1 -d \ ) -date=$(echo "$time_n_date" |cut -f 2 -d \ ) - -tput setaf 2 -echo "Start Restoring Mails" -tput sgr0 -sk_cod=$(date +%s) # Just for numbers and create another file if acccount was restored before. -sk_mdir=${sk_importer_in}/homedir/mail -cd $sk_mdir -for sk_maild in $(ls -1) -do -if [[ "$sk_maild" != "cur" && "$sk_maild" != "new" && "$sk_maild" != "tmp" ]]; then - if [ -d "$sk_maild" ]; then - for sk_mail_account in $(ls $sk_maild/) - do - echo "Create and restore mail account: $sk_mail_account@$sk_maild" - sk_mail_pass1=$(generate_password) - /usr/local/vesta/bin/v-add-mail-account $sk_cp_user $sk_maild $sk_mail_account $sk_mail_pass1 - mv ${sk_maild}/${sk_mail_account} /home/${sk_cp_user}/mail/${sk_maild} - chown ${sk_cp_user}:mail -R /home/${sk_cp_user}/mail/${sk_maild} - find /home/${sk_cp_user}/mail/${sk_maild} -type f -name 'dovecot*' -delete - if [ -f "${sk_importer_in}/homedir/etc/${sk_maild}/shadow" ]; then - echo "Set password for ${sk_mail_account}@${sk_maild}" - pass=$(grep "^${sk_mail_account}:" ${sk_importer_in}/homedir/etc/${sk_maild}/shadow | awk -F ":" '{print $2}') - newline="${sk_mail_account}:{SHA512-CRYPT}$pass:${sk_cp_user}:mail::/home/${sk_cp_user}:0" - newline2="ACCOUNT='${sk_mail_account}' ALIAS='' AUTOREPLY='no' FWD='' FWD_ONLY='' MD5='{SHA512-CRYPT}$pass' QUOTA='unlimited' U_DISK='0' SUSPENDED='no' TIME='$time' DATE='$date'" - escaped=$(printf '%s\n' "$newline" | sed -e 's/[\/&]/\\&/g') - escaped2=$(printf '%s\n' "$newline2" | sed -e 's/[\/&]/\\&/g') - sed -i "s/^${sk_mail_account}:.*/$escaped/g" /home/${sk_cp_user}/conf/mail/${sk_maild}/passwd - sed -i "s/^ACCOUNT='${sk_mail_account}.*/$escaped2/g" /usr/local/vesta/data/users/${sk_cp_user}/mail/${sk_maild}.conf - else - echo "${sk_mail_account}@${sk_maild} | $sk_mail_pass1" >> /root/sk_mail_password_${sk_cp_user}-${sk_cod} - fi - done - fi -#else -# this only detect default dirs account new, cur, tmp etc -# maybe can do something with this, but on most cpanel default account have only spam. -fi -done -echo "All mail accounts restored" -############# ssl functions <(°-°)> -tput setaf 2 -echo "Restoring SSL for domains" -tput sgr0 - -mv ${sk_importer_in}/sslkeys/* ${sk_importer_in}/sslcerts/ -if ls -1 ${sk_importer_in}/ssl/* >/dev/null 2>&1; then - mv ${sk_importer_in}/ssl/* ${sk_importer_in}/sslcerts/ -else - echo "No SSL Cert. found..." -fi - - -sk_domains=$(/usr/local/vesta/bin/v-list-web-domains $sk_cp_user plain |awk '{ print $1 }') - -for ssl in $sk_domains -do - if [ -e ${sk_importer_in}/sslcerts/${ssl}.key ]; then - echo "Found SSL for ${ssl}, restoring..." - /usr/local/vesta/bin/v-add-web-domain-ssl $sk_cp_user $ssl ${sk_importer_in}/sslcerts/ - fi -done -function sk_restore_pass () { -sk_actual_pass=$(grep -w "^$sk_cp_user:" /etc/shadow |tr ":" " " | awk '{ print $2 }' ) -sk_new_pass=$(cat $sk_importer_in/shadow) -# need replace I hope you have installed it as in most systems... -# sed is a hero but replace is easy and not need space // :D -replace "$sk_cp_user:$sk_actual_pass" "$sk_cp_user:$sk_new_pass" -- /etc/shadow -tput setaf 5 -echo "Old cPanel password restored in $sk_cp_user vesta account" -tput sgr0 -} -function sk_fix_mx () { -tput setaf 2 - echo "Start With MX Records" -tput sgr0 -cd $sk_importer_in/dnszones -for sk_mx in $sk_domains -do - if [ -e $sk_mx.db ]; then - sk_id=$(grep MX /usr/local/vesta/data/users/${sk_cp_user}/dns/${sk_mx}.conf |tr "'" " " | cut -d " " -f 2) - /usr/local/vesta/bin/v-delete-dns-record $sk_cp_user $sk_mx $sk_id - grep MX ${sk_mx}.db | awk '{for(sk=NF;sk>=1;sk--) printf "%s ", $sk;print ""}' | while read value pri ns rest - do - if [ "$ns" == "MX" ];then - if [ "$value" == "$sk_mx" ] || [ "$value" == "$sk_mx." ];then - value=mail.$value - fi - /usr/local/vesta/bin/v-add-dns-record $sk_cp_user $sk_mx @ MX $value $pri - if [[ "$?" -ge "1" ]]; then - /usr/local/vesta/bin/v-add-dns-record $sk_cp_user $sk_mx @ MX mail.${sk_mx} 0 - fi - echo "MX fixed in $sk_mx" - fi - done - fi -done -} -if [ "$2" == "MX" ];then -# Need some fixed so run if you want try it, marked as experimental - sk_fix_mx -fi -sk_restore_pass - -echo "Remove tmp files" -rm -rf "/root/${sk_tmp}" -tput setaf 4 -echo "##############################" -echo "cPanel Backup restored" -echo "Review your content and report any fail" -if [ -f "/root/sk_mail_password_${sk_cp_user}-${sk_cod}" ]; then - echo "I reset mail password not posible restore it yet." - echo "Check your new passwords runing: cat /root/sk_mail_password_${sk_cp_user}-${sk_cod}" -fi -echo "##############################" -tput sgr0 diff --git a/bin/v-insert-dns-domain b/bin/v-insert-dns-domain index 9e6874df..b767b576 100755 --- a/bin/v-insert-dns-domain +++ b/bin/v-insert-dns-domain @@ -50,7 +50,7 @@ if [ "$flush" = 'records' ]; then fi # Flush domain -if [ "$flush" != 'no' ]; then +if [ "$flush" ! = 'no' ]; then sed -i "/DOMAIN='$DOMAIN'/d" $USER_DATA/dns.conf 2> /dev/null fi diff --git a/bin/v-install-unsigned-ssl b/bin/v-install-unsigned-ssl deleted file mode 100644 index 9ac2f188..00000000 --- a/bin/v-install-unsigned-ssl +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/bash - -# info: install unsigned SSL to domain -# options: DOMAIN [RESTART] -# -# The function install unsigned SSL to domain - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Argument definition -if [ $# -lt 1 ]; then - echo "usage: v-install-unsigned-ssl DOMAIN [RESTART]" - exit 1 -fi - -domain=$1 - -if [ $# -lt 2 ]; then - restart='yes' -else - restart=$2 -fi - -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) - -if [ ! -d "/home/$user" ]; then - echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Domain doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ -f "/home/$user/conf/web/ssl.$domain.crt" ]; then - /usr/local/vesta/bin/v-delete-web-domain-ssl "$user" "$domain" -fi - -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - -email="info@$domain" - -TMPLOC="/home/$user/tmp/$domain" -mkdir $TMPLOC - -# Generating SSL certificate -/usr/local/vesta/bin/v-generate-ssl-cert $domain $email 'US' 'California' 'San Francisco' 'myVesta Control Panel' 'IT' "www.$domain" > $TMPLOC/vst.pem - -# Parsing certificate file -crt_end=$(grep -n "END CERTIFICATE-" $TMPLOC/vst.pem |cut -f 1 -d:) -if [ "$release" -lt 12 ]; then - key_start=$(grep -n "BEGIN RSA" $TMPLOC/vst.pem |cut -f 1 -d:) - key_end=$(grep -n "END RSA" $TMPLOC/vst.pem |cut -f 1 -d:) -else - key_start=$(grep -n "BEGIN PRIVATE KEY" $TMPLOC/vst.pem |cut -f 1 -d:) - key_end=$(grep -n "END PRIVATE KEY" $TMPLOC/vst.pem |cut -f 1 -d:) -fi - -# Adding SSL certificate -cd $TMPLOC -sed -n "1,${crt_end}p" $TMPLOC/vst.pem > $TMPLOC/$domain.crt -sed -n "$key_start,${key_end}p" $TMPLOC/vst.pem > $TMPLOC/$domain.key -chmod 666 $TMPLOC/* - -USER_DATA="/usr/local/vesta/data/users/$user"; -get_domain_values 'web' - -if [[ $SSL == 'no' ]] -then - #Configure SSL and install the cert - /usr/local/vesta/bin/v-add-web-domain-ssl $user $domain $TMPLOC "same" "$restart" -else - #Replace the existing cert with the new one - /usr/local/vesta/bin/v-change-web-domain-sslcert $user $domain $TMPLOC "$restart" -fi - -rm -rf $TMPLOC - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - - -exit diff --git a/bin/v-install-wordfence-cli b/bin/v-install-wordfence-cli deleted file mode 100644 index fc6ca0b5..00000000 --- a/bin/v-install-wordfence-cli +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# info: Script for installing WordFence CLI -# options: NONE - -if ! command -v git &> /dev/null; then - echo "= Git is not installed. Installing..." - apt-get update > /dev/null 2>&1 - apt-get install -y git -fi - -cd /root - -if [ ! -d "myvesta-wordfence-cli" ]; then - git clone https://github.com/isscbta/myvesta-wordfence-cli.git - cd ~/myvesta-wordfence-cli/ -else - cd ~/myvesta-wordfence-cli/ - git pull -fi - -echo "" -echo "----------------------------------------------------------------" -echo "" -echo "Which Docker container do you want to install for WordFence CLI?" -echo "1. WordFence CLI official Docker container" -echo "2. WordFence CLI Docker container maintained by myVesta" -read -r -p "Enter your choice: " choice < /dev/tty - -if [ "$choice" == "1" ]; then - bash wf-cli-install.sh -fi - -if [ "$choice" == "2" ]; then - bash wf-cli-install-our-image.sh -fi - -exit 0; diff --git a/bin/v-install-wordpress b/bin/v-install-wordpress deleted file mode 100644 index 25e38f3e..00000000 --- a/bin/v-install-wordpress +++ /dev/null @@ -1,188 +0,0 @@ -#!/bin/bash -# info: WordPress installer in one command line -# options: DOMAIN [DB_NAME] [EMAIL] -# -# Credits to Luka Paunović for wp-cli implememtation - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/db.sh -source /usr/local/vesta/conf/vesta.conf - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -if [[ $(is_package_full 'DATABASES') = *reached* ]]; then - echo "Database limit is reached. Delete database or upgrade user package." - exit -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN [DB_NAME] [EMAIL]' -is_format_valid 'domain' 'database' 'email' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -# take --parameters -source /usr/local/vesta/func/handle_parameters.sh - -if [ -z "$database" ]; then - if [ ! -z "$MAX_DBUSER_LEN" ] && [ "$MAX_DBUSER_LEN" -ge 80 ]; then - database=$(echo "$domain" | sed 's#\.#_#g') - else - database="wp" - fi -fi - -# Convert domain to IDN if available -if command -v idn2 >/dev/null 2>&1; then - database=$(idn2 "$database") - idn_domain=$(idn2 "$domain") -elif command -v idn >/dev/null 2>&1; then - database=$(idn "$database") - idn_domain=$(idn "$domain") -fi - -if [ -z "$email" ]; then - email="info@$idn_domain"; -fi - -if [ ! -d "/home/$user" ]; then - echo "= Error: Folder /home/$user doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "= Error: Folder /home/$user/web/$domain/public_html doesn't exist"; - exit 1; -fi - -DBUSERSUF="$database"; -DBUSERSUFB="$database"; -DBUSER=$user\_$DBUSERSUFB; -DB_EXISTS=$(check_if_database_exists "$user" "$DBUSER") - -if [ "$DB_EXISTS" = "yes" ]; then - i=1; - while [ $i -lt 99 ]; do - i=$((i+1)); - DBUSERSUF="${DBUSERSUFB}${i}"; - DBUSER=$user\_$DBUSERSUF; - DB_EXISTS=$(check_if_database_exists "$user" "$DBUSER") - if [ "$DB_EXISTS" = "no" ]; then - break; - fi - done -fi - -PASSWDDB=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1) - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -PROTOCOL='https' - -if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then - echo "== Trying to install LetsEncrypt for domain $domain" - /usr/local/vesta/bin/v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes" -fi - -if [ ! -z "$FORCE_HTTP" ]; then - # Switch to http:// only if --FORCE_HTTP parameter is set - echo "== Force http://" - PROTOCOL='http' -fi - -TPL_CHANGED=0; - -if [ "$WEB_SYSTEM" != 'nginx' ]; then - if [ "$PROTOCOL" = "https" ]; then - if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https-firewall-wordpress.stpl" ] && [ $TPL_CHANGED -eq 0 ]; then - TPL_CHANGED=1; - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "force-https-firewall-wordpress" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes" - fi - if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ] && [ $TPL_CHANGED -eq 0 ]; then - TPL_CHANGED=1; - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "force-https" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes" - fi - fi - if [ "$PROTOCOL" = "http" ]; then - if [ -f "/usr/local/vesta/data/templates/web/nginx/hosting-firewall-wordpress.stpl" ] && [ $TPL_CHANGED -eq 0 ]; then - TPL_CHANGED=1; - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "hosting-firewall-wordpress" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes" - fi - fi -fi - -/usr/local/vesta/bin/v-add-database "$user" "$DBUSERSUF" "$DBUSERSUF" "$PASSWDDB" "mysql" - -WORKINGDIR="/home/$user/web/$domain/public_html" -rm -rf $WORKINGDIR/* -cd $WORKINGDIR - -/usr/local/vesta/bin/v-run-wp-cli $domain core download -if [ ! -f "$WORKINGDIR/index.php" ]; then - echo "= WordPress installation failed: WordPress core download failed." - exit 1; -fi - -/usr/local/vesta/bin/v-run-wp-cli $domain core config --dbname=$DBUSER --dbuser=$DBUSER --dbpass=$PASSWDDB -if [ ! -f "$WORKINGDIR/wp-config.php" ]; then - echo "= WordPress installation failed: WordPress core config failed, wp-config.php not found." - exit 1; -fi - -password=$(LC_CTYPE=C tr -dc A-Za-z0-9_\!\@\#\$\%\^\&\*\(\)-+= < /dev/urandom | head -c 12) - -wpadmin=$(echo "$domain" | sed 's#\.#_#g')_4dm1n - -/usr/local/vesta/bin/v-run-wp-cli $domain core install --url="$domain" --title="$domain" --admin_user="$wpadmin" --admin_password="$password" --admin_email="$email" --path=$WORKINGDIR - -mysql -u$DBUSER -p$PASSWDDB -e "USE $DBUSER; update wp_options set option_value = '$PROTOCOL://$domain' where option_name = 'siteurl'; update wp_options set option_value = '$PROTOCOL://$domain' where option_name = 'home';" - -echo "=================================================================" -echo "Your WordPress installation is complete." -echo "" -echo "Website URL: $PROTOCOL://$domain/" -echo "" -echo "WordPress admin login: $PROTOCOL://$domain/wp-admin/" -echo "Username: $wpadmin" -echo "Password: $password" -echo "" -echo "=================================================================" - -chown -R $user:$user $WORKINGDIR - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -echo "v-install-wordpress: Done." - -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-install-wp-cli b/bin/v-install-wp-cli deleted file mode 100644 index 17df71e8..00000000 --- a/bin/v-install-wp-cli +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# info: Download WP CLI -# options: NONE - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -echo "= Installing WP CLI by downloading phar file..." -wget -nv https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -O /usr/local/bin/wp -chmod +x /usr/local/bin/wp - -if [ -f "/usr/local/bin/wp" ]; then - echo "= WP CLI installed successfully." - echo "= Usage: v-run-wp-cli DOMAIN WP_CLI_COMMAND" - exit 0; -else - echo "= WP CLI installation failed." - echo "= Please install it manually." - exit 1; -fi diff --git a/bin/v-install-wp-cli-myvesta b/bin/v-install-wp-cli-myvesta deleted file mode 100644 index b65479f6..00000000 --- a/bin/v-install-wp-cli-myvesta +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash -# info: Download myVesta WP CLI -# options: NONE - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -if [ ! -f "/usr/local/bin/composer" ]; then - echo "= Composer is not installed. Installing..." - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php --install-dir=/usr/local/bin --filename=composer - php -r "unlink('composer-setup.php');" - echo "= Composer installed successfully." -fi - -if [ -d "/usr/local/bin/wp-cli" ]; then - echo "= Removing old myVesta WP CLI..." - rm -rf /usr/local/bin/wp-cli -fi - -echo "= Installing myVesta WP CLI..." - -cd /usr/local/bin -git clone https://github.com/wp-cli/wp-cli.git - -chown -R www-data:www-data wp-cli - -ver_ge() { - # usage: ver_ge 7.2 5.6 --> returns true if $1 is greater than or equal to $2 - [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ] -} - -current_php_version=$(readlink -f /usr/bin/php | grep -oP 'php\K[0-9]+\.[0-9]+') - -php_versions=$(/usr/local/vesta/bin/v-list-php) -for php_version in $php_versions; do - if ver_ge "$php_version" "7.2"; then - oldest_allowed_php_version=$php_version - break - fi -done - -echo "= Setting PHP version to $oldest_allowed_php_version" -update-alternatives --set php /usr/bin/php$oldest_allowed_php_version - -cd wp-cli/ -sudo -H -u www-data composer install - -echo "= Installing search-replace-command package..." -sudo -H -u www-data WP_CLI_PACKAGES_DIR=/usr/local/bin/wp-cli/packages php /usr/local/bin/wp-cli/php/boot-fs.php package install wp-cli/search-replace-command - -echo "= Setting PHP version to $current_php_version" -update-alternatives --set php /usr/bin/php$current_php_version - -# Fix terminal columns issue for WP CLI -echo "= Fixing terminal columns issue for WP CLI..." -/usr/local/vesta/bin/v-sed '$columns = 80;' "if (file_exists('/usr/local/bin/wp-cli/COLUMNS')) \$columns=intval(file_get_contents('/usr/local/bin/wp-cli/COLUMNS')); else \$columns = 80;" '/usr/local/bin/wp-cli/vendor/wp-cli/php-cli-tools/lib/cli/Shell.php' - -echo "" - -if [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ]; then - echo "= myVesta WP CLI installed successfully." - echo "= Usage: v-run-wp-cli-myvesta DOMAIN WP_CLI_COMMAND" - exit 0; -else - echo "= myVesta WP CLI installation failed." - echo "= Please install it manually." - exit 1; -fi diff --git a/bin/v-list-dns-domain b/bin/v-list-dns-domain index c9c3f1ea..f72943f9 100755 --- a/bin/v-list-dns-domain +++ b/bin/v-list-dns-domain @@ -71,7 +71,6 @@ csv_list() { #----------------------------------------------------------# check_args '2' "$#" 'USER DOMAIN [FORMAT]' -is_format_valid 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'dns' 'DOMAIN' "$domain" diff --git a/bin/v-list-letsencrypt-user b/bin/v-list-letsencrypt-user index f6e2c774..cded9600 100755 --- a/bin/v-list-letsencrypt-user +++ b/bin/v-list-letsencrypt-user @@ -23,8 +23,7 @@ json_list() { "EMAIL": "'$EMAIL'", "EXPONENT": "'$EXPONENT'", "MODULUS": "'$MODULUS'", - "THUMB": "'$THUMB'", - "KID": "'$KID'" + "THUMB: "'$THUMB'" }' echo '}' } @@ -36,18 +35,17 @@ shell_list() { echo "THUMB: $THUMB" echo "EXPONENT: $EXPONENT" echo "MODULUS: $MODULUS" - echo "KID: $KID" } # PLAIN list function plain_list() { - echo -e "$user\t$EMAIL\t$EXPONENT\t$MODULUS\t$THUMB\t$KID" + echo -e "$user\t$EMAIL\t$EXPONENT\t$MODULUS\t$THUMB" } # CSV list function csv_list() { - echo "USER,EMAIL,EXPONENT,MODULUS,THUMB,KID" - echo "$user,$EMAIL,$EXPONENT,$MODULUS,$THUMB,$KID" + echo "USER,EMAIL,EXPONENT,MODULUS,THUMB" + echo "$user,$EMAIL,$EXPONENT,$MODULUS,$THUMB" } @@ -56,7 +54,6 @@ csv_list() { #----------------------------------------------------------# check_args '1' "$#" 'USER [FORMAT]' -is_format_valid 'user' is_object_valid 'user' 'USER' "$user" if [ ! -e "$USER_DATA/ssl/le.conf" ]; then check_result $E_NOTEXIST "LetsEncrypt user account doesn't exist" diff --git a/bin/v-list-mail-domain-dkim-dns b/bin/v-list-mail-domain-dkim-dns index d9f9d5ba..d7b3e2a6 100755 --- a/bin/v-list-mail-domain-dkim-dns +++ b/bin/v-list-mail-domain-dkim-dns @@ -57,7 +57,6 @@ csv_list() { #----------------------------------------------------------# check_args '2' "$#" 'USER DOMAIN [FORMAT]' -is_format_valid 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'mail' 'DOMAIN' "$domain" @@ -68,7 +67,7 @@ is_object_valid 'mail' 'DOMAIN' "$domain" # Parsing domain keys if [ -e "$USER_DATA/mail/$domain.pub" ]; then - pub=$(cat $USER_DATA/mail/$domain.pub |grep -v "KEY-----" |tr -d "\n\r") + pub=$(cat $USER_DATA/mail/$domain.pub |grep -v "KEY-----") pub=$(echo "$pub" |sed ':a;N;$!ba;s/\n/\\n/g') else pub="DKIM-SUPPORT-IS-NOT-ACTIVATED" diff --git a/bin/v-list-php b/bin/v-list-php deleted file mode 100644 index 846e40de..00000000 --- a/bin/v-list-php +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# info: list of installed php versions -# options: [FORMAT] -# -# The function for obtaining the list of installed PHP versions. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -format=${1-shell} - -# Includes -source $VESTA/func/main.sh - -# JSON list function -json_list() { - counter=$(echo "$phpversions" | wc -l) - i=1 - echo '[' - for phpversion in $phpversions; do - if [ "$i" -lt "$counter" ]; then - echo -e "\t\"$phpversion\"," - else - echo -e "\t\"$phpversion\"" - fi - (( ++i)) - done - echo "]" -} - -# shell list function -shell_list() { - for phpversion in $phpversions; do - echo "$phpversion" - done -} - -# PLAIN list function -plain_list() { - for phpversion in $phpversions; do - echo "$phpversion" - done -} - -# CSV list function -csv_list() { - for phpversion in $phpversions; do - echo "$phpversion" - done -} - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Obtaining the list of installed PHP-FPM versions -phpversions=$(find /etc/php/ -type d -name 'fpm' | sed "s|/etc/php/||" | sed "s|/fpm||" | sort) - -# Listing data -case $format in - json) json_list ;; - plain) plain_list ;; - csv) csv_list ;; - shell) shell_list ;; -esac - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit diff --git a/bin/v-list-php-apache b/bin/v-list-php-apache deleted file mode 100644 index e2e431b1..00000000 --- a/bin/v-list-php-apache +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash -# info: list of installed php versions that have Apache template. -# options: [FORMAT] -# -# The function obtains the list of installed PHP versions that have Apache template. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -format=${1-shell} - -# Includes -source $VESTA/func/main.sh - -# JSON list function -json_list() { - counter=$(echo "$phpversions" | wc -l) - i=1 - echo '[' - for phpversion in $phpversions; do - if [ "$i" -lt "$counter" ]; then - echo -e "\t\"$phpversion\"," - else - echo -e "\t\"$phpversion\"" - fi - (( ++i)) - done - echo "]" -} - -# shell list function -shell_list() { - for phpversion in $phpversions; do - echo "$phpversion" - done -} - -# PLAIN list function -plain_list() { - for phpversion in $phpversions; do - echo "$phpversion" - done -} - -# CSV list function -csv_list() { - for phpversion in $phpversions; do - echo "$phpversion" - done -} - -echo_phpversions_list() { - for element in "${phpversions_list[@]}"; do - echo "$element" - done -} - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Obtaining the list of installed PHP-FPM versions -fpmphpversions=$(/usr/local/vesta/bin/v-list-php) - -for phpversion in $fpmphpversions; do - phpversiontpl=${phpversion//./} - tpl="/usr/local/vesta/data/templates/web/apache2/PHP-FPM-$phpversiontpl.tpl" - if [ -f "$tpl" ]; then - phpversions_list+=("$phpversion") - fi -done - -phpversions=$(echo_phpversions_list) - -# Listing data -case $format in - json) json_list ;; - plain) plain_list ;; - csv) csv_list ;; - shell) shell_list ;; -esac - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit diff --git a/bin/v-list-sys-config b/bin/v-list-sys-config index a0fdbbbc..879c3ab3 100755 --- a/bin/v-list-sys-config +++ b/bin/v-list-sys-config @@ -51,11 +51,7 @@ json_list() { "MAIL_URL": "'$MAIL_URL'", "DB_PMA_URL": "'$DB_PMA_URL'", "DB_PGA_URL": "'$DB_PGA_URL'", - "SOFTACULOUS": "'$SOFTACULOUS'", - "MAX_DBUSER_LEN": "'$MAX_DBUSER_LEN'", - "MAIL_CERTIFICATE": "'$MAIL_CERTIFICATE'", - "VESTA_CERTIFICATE": "'$VESTA_CERTIFICATE'", - "DISABLE_IP_CHECK": "'$DISABLE_IP_CHECK'" + "SOFTACULOUS": "'$SOFTACULOUS'" } }' } @@ -142,12 +138,6 @@ shell_list() { if [ ! -z "$LANGUAGE" ] && [ "$LANGUAGE" != 'en' ]; then echo "Language: $LANGUAGE" fi - if [ ! -z "$MAIL_CERTIFICATE" ]; then - echo "Mail SSL: $MAIL_CERTIFICATE" - fi - if [ ! -z "$VESTA_CERTIFICATE" ]; then - echo "Vesta SSL: $VESTA_CERTIFICATE" - fi echo "Version: $VERSION" } @@ -161,8 +151,7 @@ plain_list() { echo -ne "$CRON_SYSTEM\t$DISK_QUOTA\t$FIREWALL_SYSTEM\t" echo -ne "$FIREWALL_EXTENSION\t$FILEMANAGER_KEY\t$SFTPJAIL_KEY\t" echo -ne "$REPOSITORY\t$VERSION\t$LANGUAGE\t$BACKUP_GZIP\t$BACKUP\t" - echo -ne "$MAIL_URL\t$DB_PMA_URL\t$DB_PGA_URL\t$MAIL_CERTIFICATE\t" - echo -e "$VESTA_CERTIFICATE" + echo -e "$MAIL_URL\t$DB_PMA_URL\t$DB_PGA_URL" } @@ -176,8 +165,7 @@ csv_list() { echo -n "'CRON_SYSTEM','DISK_QUOTA','FIREWALL_SYSTEM'," echo -n "'FIREWALL_EXTENSION','FILEMANAGER_KEY','SFTPJAIL_KEY'," echo -n "'REPOSITORY','VERSION','LANGUAGE','BACKUP_GZIP','BACKUP'," - echo -n "'MAIL_URL','DB_PMA_URL','DB_PGA_URL', 'SOFTACULOUS'," - echo -n "'MAIL_CERTIFICATE','VESTA_CERTIFICATE'" + echo -n "'MAIL_URL','DB_PMA_URL','DB_PGA_URL'" echo echo -n "'$WEB_SYSTEM','$WEB_RGROUPS','$WEB_PORT','$WEB_SSL'," echo -n "'$WEB_SSL_PORT','$WEB_BACKEND','$PROXY_SYSTEM','$PROXY_PORT'," @@ -188,7 +176,6 @@ csv_list() { echo -n "'$FIREWALL_EXTENSION','$FILEMANAGER_KEY','$SFTPJAIL_KEY'," echo -n "'$REPOSITORY','$VERSION','$LANGUAGE','$BACKUP_GZIP','$BACKUP'," echo -n "'$MAIL_URL','$DB_PMA_URL','$DB_PGA_URL', '$SOFTACULOUS'" - echo -n "'$MAIL_CERTIFICATE','$VESTA_CERTIFICATE'" echo } @@ -200,7 +187,7 @@ csv_list() { # Listing data case $format in json) json_list ;; - plain) plain_list ;; + plain) shell_list ;; csv) csv_list ;; shell) shell_list ;; esac diff --git a/bin/v-list-sys-info b/bin/v-list-sys-info index 0072b82b..dabd3160 100755 --- a/bin/v-list-sys-info +++ b/bin/v-list-sys-info @@ -56,18 +56,17 @@ csv_list() { HOSTNAME=$(hostname) # Check OS/Release -if [ -d '/etc/sysconfig' ]; then - if [ -e '/etc/redhat-release' ]; then +if [ -e '/etc/redhat-release' ]; then + if [ ! -z "$(grep CentOS /etc/redhat-release)" ]; then OS='CentOS' - VERSION=$(cat /etc/redhat-release |tr ' ' '\n' |grep [0-9]) else - OS="Amazon" - VERSION=$(cat /etc/issue |tr ' ' '\n' |grep [0-9]) + OS="RHEL" fi + VERSION=$(cat /etc/redhat-release| tr ' ' '\n' |grep [0-9]) else if [ "$(lsb_release -si)" == "Ubuntu" ] && [ -e '/etc/debian_version' ]; then OS="Ubuntu" - VERSION=$(grep DISTRIB_RELEASE /etc/lsb-release |cut -f 2 -d '=') + VERSION=$(grep DISTRIB_RELEASE /etc/lsb-release| cut -f 2 -d '=') else distro=$(head -n1 /etc/issue |cut -f 1 -d ' ') if [ "$distro" = 'Debian' ]; then diff --git a/bin/v-list-sys-mail-ssl b/bin/v-list-sys-mail-ssl deleted file mode 100755 index 5da74e08..00000000 --- a/bin/v-list-sys-mail-ssl +++ /dev/null @@ -1,135 +0,0 @@ -#!/bin/bash -# info: list mail ssl certificate -# options: [FORMAT] -# -# The function of obtaining mail ssl files. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -format=${1-shell} - -# Includes -source $VESTA/func/main.sh - -# JSON list function -json_list() { - echo '{' - echo -e "\t\"MAIL\": {" - echo " \"CRT\": \"$crt\"," - echo " \"KEY\": \"$key\"," - echo " \"CA\": \"$ca\"," - echo " \"SUBJECT\": \"$subj\"," - echo " \"ALIASES\": \"$alt_dns\"," - echo " \"NOT_BEFORE\": \"$before\"," - echo " \"NOT_AFTER\": \"$after\"," - echo " \"SIGNATURE\": \"$signature\"," - echo " \"PUB_KEY\": \"$pub_key\"," - echo " \"ISSUER\": \"$issuer\"" - echo -e "\t}\n}" -} - -# SHELL list function -shell_list() { - if [ ! -z "$crt" ]; then - echo -e "$crt" - fi - if [ ! -z "$key" ]; then - echo -e "\n$key" - fi - if [ ! -z "$crt" ]; then - echo - echo - echo "SUBJECT: $subj" - if [ ! -z "$alt_dns" ]; then - echo "ALIASES: ${alt_dns//,/ }" - fi - echo "VALID FROM: $before" - echo "VALID TIL: $after" - echo "SIGNATURE: $signature" - echo "PUB_KEY: $pub_key" - echo "ISSUER: $issuer" - fi -} - -# PLAIN list function -plain_list() { - if [ ! -z "$crt" ]; then - echo -e "$crt" - fi - if [ ! -z "$key" ]; then - echo -e "\n$key" - fi - if [ ! -z "$ca" ]; then - echo -e "\n$ca" - fi - if [ ! -z "$crt" ]; then - echo "$subj" - echo "${alt_dns//,/ }" - echo "$before" - echo "$after" - echo "$signature" - echo "$pub_key" - echo "$issuer" - fi - -} - -# CSV list function -csv_list() { - echo -n "CRT,KEY,CA,SUBJECT,ALIASES,NOT_BEFORE,NOT_AFTER,SIGNATURE," - echo "PUB_KEY,ISSUER" - echo -n "\"$crt\",\"$key\",\"$ca\",\"$subj\",\"${alt_dns//,/ }\"," - echo "\"$before\",\"$after\",\"$signature\",\"$pub_key\",\"$issuer\"" -} - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -# Parsing SSL certificate -if [ ! -e "$VESTA/ssl/mail.crt" ] || [ ! -e "$VESTA/ssl/mail.key" ]; then - exit -fi - -crt=$(cat $VESTA/ssl/mail.crt |sed ':a;N;$!ba;s/\n/\\n/g') -key=$(cat $VESTA/ssl/mail.key |sed ':a;N;$!ba;s/\n/\\n/g') - - -# Parsing SSL certificate details without CA -info=$(openssl x509 -text -in $VESTA/ssl/mail.crt) -subj=$(echo "$info" |grep Subject: |cut -f 2 -d =) -before=$(echo "$info" |grep Before: |sed -e "s/.*Before: //") -after=$(echo "$info" |grep "After :" |sed -e "s/.*After : //") -signature=$(echo "$info" |grep "Algorithm:" |head -n1 ) -signature=$(echo "$signature"| sed -e "s/.*Algorithm: //") -pub_key=$(echo "$info" |grep Public-Key: |cut -f2 -d \( | tr -d \)) -issuer=$(echo "$info" |grep Issuer: |sed -e "s/.*Issuer: //") -alt_dns=$(echo "$info" |grep DNS |sed -e 's/DNS:/\n/g' |tr -d ',') -alt_dns=$(echo "$alt_dns" |tr -d ' ' |sed -e "/^$/d") -alt_dns=$(echo "$alt_dns" |sed -e ':a;N;$!ba;s/\n/,/g') - -# Listing data -case $format in - json) json_list ;; - plain) plain_list ;; - csv) csv_list ;; - shell) shell_list ;; -esac - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit diff --git a/bin/v-list-sys-services b/bin/v-list-sys-services index d23a92a7..f2622795 100755 --- a/bin/v-list-sys-services +++ b/bin/v-list-sys-services @@ -18,8 +18,6 @@ source $VESTA/conf/vesta.conf export PATH=$PATH:/sbin -debug=0 - # JSON list function json_list() { IFS=$'\n' @@ -52,9 +50,6 @@ shell_list() { echo "---- ----- --- --- ------" while read str; do eval $str - if [ "$STATE" = "stopped" ]; then - STATE='off' - fi echo "$NAME $STATE $CPU $MEM $RTIME" done < <(echo -e "$data" |grep NAME) } @@ -82,17 +77,8 @@ csv_list() { get_srv_state() { srv=$1 name=${2-$1} - procfolder=$4 - procfile=$5 state='running' - mem=0 - cpu=0 - rtime="0" - if [ $debug -eq 1 ]; then - echo "---------------------" - echo "$srv = $name" - fi # Searching related pids if [ -z $3 ]; then pids=$(pidof $name |tr ' ' '|') @@ -102,23 +88,10 @@ get_srv_state() { if [ -z "$pids" ] && [ "$name" != 'nginx' ]; then pids=$(pgrep $name |tr '\n' '|') fi - if [ "$name" = 'elasticsearch' ]; then - pids=$(ps -Af | grep 'elasticsearch' | grep -v 'grep' | awk '{print $2}' | tr '\n' '|') - fi - if [ "$name" = 'vesta-nginx' ]; then - pids=$(ps -Af | grep 'vesta/nginx' | grep -v 'grep' | awk '{print $2}' | tr '\n' '|') - fi - if [ "$name" = 'vesta-php' ]; then - pids=$(ps -Af | grep 'vesta/php' | grep -v 'grep' | awk '{print $2}' | tr '\n' '|') - fi - if [ $debug -eq 1 ]; then - echo "pids = $pids" - fi # Checking pid - if [ -n "$pids" ]; then + if [ ! -z "$pids" ]; then pid=$(echo "$pids" |cut -f 1 -d '|') - pids=${pids%|} pids=$(egrep "$pids" $tmp_file) # Calculating CPU usage @@ -130,22 +103,7 @@ get_srv_state() { # Searching pid file pid_file='' - if [ ! -z "$procfolder" ]; then - if [ -f "/var/run/$procfolder/$srv.pid" ]; then - pid_file="/var/run/$procfolder/$srv.pid" - fi - fi - if [ -z "$pid_file" ] && [ ! -z "$procfolder" ] && [ ! -z "$procfile" ]; then - if [ -f "/var/run/$procfolder/$procfile.pid" ]; then - pid_file="/var/run/$procfolder/$procfile.pid" - fi - fi - if [ -z "$pid_file" ] && [ -z "$procfolder" ] && [ ! -z "$procfile" ]; then - if [ -f "/var/run/$procfile.pid" ]; then - pid_file="/var/run/$procfile.pid" - fi - fi - if [ -z "$pid_file" ] && [ -e "/var/run/$srv.pid" ]; then + if [ -e "/var/run/$srv.pid" ]; then pid_file="/var/run/$srv.pid" fi if [ -z "$pid_file" ] && [ -e "/var/run/$srv/$srv.pid" ]; then @@ -154,31 +112,18 @@ get_srv_state() { if [ -z "$pid_file" ] && [ -e "/var/run/$name/$name.pid" ]; then pid_file="/var/run/$name/$name.pid" fi - if [ -z "$pid_file" ] && [ -f "/var/run/$name.pid" ]; then - pid_file="/var/run/$name.pid" - fi if [ -z "$pid_file" ] && [ -e "/proc/$pid" ]; then pid_file="/proc/$pid" fi - if [ $debug -eq 1 ]; then - echo "$srv = $name = $pid_file" - fi # Calculating uptime - if [ -n "$pid_file" ]; then + if [ ! -z "$pid_file" ]; then mtime=$(stat -c "%Y" $pid_file) rtime=$((ctime - mtime)) rtime=$((rtime / 60)) else rtime=0 fi - if [ "$pid_file" = "/proc/$pid" ]; then - if [ $debug -eq 1 ]; then - echo "getting pid lifetime via ps" - fi - rtime=$(ps -p $pid -o etimes | tail -n 1 | awk '{print $1}') - rtime=$((rtime / 60)) - fi else state='stopped' mem=0 @@ -206,6 +151,14 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'remote' ]; then data="$data MEM='$mem' RTIME='$rtime'" fi +# Checking WEB Backend +if [ ! -z "$WEB_BACKEND" ] && [ "$WEB_BACKEND" != 'remote' ]; then + proc_name=$(ls /usr/sbin/php*fpm* | rev | cut -d'/' -f 1 | rev) + get_srv_state $proc_name + data="$data\nNAME='$WEB_BACKEND' SYSTEM='backend server' STATE='$state'" + data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" +fi + # Checking WEB Proxy if [ ! -z "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" != 'remote' ]; then get_srv_state $PROXY_SYSTEM @@ -213,18 +166,6 @@ if [ ! -z "$PROXY_SYSTEM" ] && [ "$PROXY_SYSTEM" != 'remote' ]; then data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" fi -# Checking WEB Backend -if [ "$WEB_BACKEND" != 'remote' ]; then - php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||') - for version in $php_versions; do - proc_name="php-fpm${version}" - service_name="php${version}-fpm" - get_srv_state "$service_name" "$proc_name" '' 'php' - data="$data\nNAME='$service_name' SYSTEM='backend server' STATE='$state'" - data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" - done -fi - # DNS service=$DNS_SYSTEM if [ ! -z "$service" ] && [ "$service" != 'remote' ]; then @@ -236,29 +177,21 @@ fi # Checking MAIL system if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'remote' ]; then - if [ "$MAIL_SYSTEM" = "exim4" ]; then - get_srv_state "$MAIL_SYSTEM" "$MAIL_SYSTEM" '' 'exim4' 'exim' - else - get_srv_state $MAIL_SYSTEM - fi + get_srv_state $MAIL_SYSTEM data="$data\nNAME='$MAIL_SYSTEM' SYSTEM='mail server' STATE='$state'" data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" fi # Checking MAIL IMAP if [ ! -z "$IMAP_SYSTEM" ] && [ "$IMAP_SYSTEM" != 'remote' ]; then - if [ "$IMAP_SYSTEM" = "dovecot" ]; then - get_srv_state "$IMAP_SYSTEM" "$IMAP_SYSTEM" '' 'dovecot' 'master' - else - get_srv_state $IMAP_SYSTEM - fi + get_srv_state $IMAP_SYSTEM data="$data\nNAME='$IMAP_SYSTEM' SYSTEM='pop/imap server' STATE='$state'" data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" fi # Checking MAIL ANTIVIRUS if [ ! -z "$ANTIVIRUS_SYSTEM" ] && [ "$ANTIVIRUS_SYSTEM" != 'remote' ]; then - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then if [ "$ANTIVIRUS_SYSTEM" == 'clamav' ];then ANTIVIRUS_SYSTEM='clamd' fi @@ -267,19 +200,11 @@ if [ ! -z "$ANTIVIRUS_SYSTEM" ] && [ "$ANTIVIRUS_SYSTEM" != 'remote' ]; then if [ "$ANTIVIRUS_SYSTEM" == 'clamav-daemon' ];then proc_name='clamd' fi - get_srv_state $ANTIVIRUS_SYSTEM $proc_name '' 'clamav' 'clamd' + get_srv_state $ANTIVIRUS_SYSTEM $proc_name fi data="$data\nNAME='$ANTIVIRUS_SYSTEM' SYSTEM='email antivirus'" data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'" proc_name='' - if [ ! -d "/etc/sysconfig" ]; then - if [ "$ANTIVIRUS_SYSTEM" == 'clamav-daemon' ];then - get_srv_state "clamav-freshclam" "freshclam" - data="$data\nNAME='clamav-freshclam' SYSTEM='email antivirus updater'" - data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'" - proc_name='' - fi - fi fi # Checking MAIL ANTISPAM @@ -295,17 +220,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'remote' ]; then proc_name='' service="$db" if [ "$service" = 'mysql' ]; then - proc_name='mysqld' - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - if [ "$release" -gt 10 ] && [ ! -f "/etc/apt/sources.list.d/mysql.list" ]; then - service='mariadb' - proc_name='mariadbd' - fi - if [ -f "/etc/apt/sources.list.d/mariadb.list" ]; then - service='mariadb' - proc_name='mariadbd' - fi - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then service='mysqld' proc_name='mysqld' if [ -e "/usr/lib/systemd/system/mariadb.service" ]; then @@ -316,14 +231,14 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'remote' ]; then if [ "$service" == 'pgsql' ]; then service='postgresql' proc_name='postmaster' - if [ ! -d "/etc/sysconfig" ]; then + if [ ! -e "/etc/redhat-release" ]; then proc_name='postgres' fi if [ ! -e '/etc/init.d/postgresql' ]; then proc_name='postgres' fi fi - get_srv_state $service $proc_name '' 'mysqld' 'mysqld' + get_srv_state $service $proc_name data="$data\nNAME='$service' SYSTEM='database server' STATE='$state'" data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" proc_name='' @@ -339,28 +254,11 @@ fi # Checking CRON system if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'remote' ]; then - get_srv_state "$CRON_SYSTEM" "$CRON_SYSTEM" '' '' 'crond' + get_srv_state $CRON_SYSTEM data="$data\nNAME='$CRON_SYSTEM' SYSTEM='job scheduler' STATE='$state'" data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" fi -# Checking SSH daemon -if [ -e "/etc/ssh/sshd_config" ]; then - get_srv_state 'ssh' 'ssh' '' '' 'sshd' - data="$data\nNAME='ssh' SYSTEM='SSH Access' STATE='$state'" - data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" -fi - -# Checking Vesta nginx -get_srv_state 'vesta' 'vesta-nginx' '' '' 'vesta-nginx' -data="$data\nNAME='vesta-nginx' SYSTEM='Vesta nginx service' STATE='$state'" -data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" - -# Checking Vesta php-fpm -get_srv_state 'vesta' 'vesta-php' '' '' 'vesta-php' -data="$data\nNAME='vesta-php' SYSTEM='Vesta php service' STATE='$state'" -data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" - # Checking FIREWALL system if [ ! -z "$FIREWALL_SYSTEM" ] && [ "$FIREWALL_SYSTEM" != 'remote' ]; then state="stopped" @@ -374,33 +272,11 @@ fi # Checking FIREWALL Fail2ban extention if [ ! -z "$FIREWALL_EXTENSION" ]; then - get_srv_state "$FIREWALL_EXTENSION" 'fail2ban-server' 'script' + get_srv_state $FIREWALL_EXTENSION fail2ban-server script data="$data\nNAME='$FIREWALL_EXTENSION' SYSTEM='brute-force monitor'" data="$data STATE='$state' CPU='$cpu' MEM='$mem' RTIME='$rtime'" fi -# Checking ElasticSearch -if [ -d "/etc/elasticsearch" ]; then - get_srv_state 'elasticsearch' - data="$data\nNAME='elasticsearch' SYSTEM='ElasticSearch' STATE='$state'" - data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" -fi - -# Checking Redis -if [ -d "/etc/redis" ]; then - get_srv_state 'redis' 'redis-server' '' 'redis' 'redis-server' - data="$data\nNAME='redis' SYSTEM='Redis' STATE='$state'" - data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" -fi - -# Checking Memcached -if [ -f "/etc/memcached.conf" ]; then - get_srv_state 'memcached' - data="$data\nNAME='memcached' SYSTEM='Memcached' STATE='$state'" - data="$data CPU='$cpu' MEM='$mem' RTIME='$rtime'" -fi - - # Listing data case $format in json) json_list ;; diff --git a/bin/v-list-sys-vesta-updates b/bin/v-list-sys-vesta-updates index acec8840..dcd40990 100755 --- a/bin/v-list-sys-vesta-updates +++ b/bin/v-list-sys-vesta-updates @@ -61,10 +61,10 @@ shell_list() { #----------------------------------------------------------# # Checking official latest version -latest=$(wget -q -T 3 -t 1 http://c.myvestacp.com/latest.txt?check -O -) +latest=$(wget -q -T 1 -t 1 http://c.vestacp.com/latest.txt -O -) # Checking installed vesta version -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then rpm_format="VERSION='%{VERSION}'" rpm_format="$rpm_format RELEASE='%{RELEASE}'" rpm_format="$rpm_format ARCH='%{ARCH}'" @@ -78,10 +78,6 @@ else ARCH=$(echo "$dpkg_data"|grep Architecture |cut -f 2 -d ' ') VERSION=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 1 -d \-) RELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 2 -d \-) - SUBRELEASE=$(echo "$dpkg_data"|grep ^Version |cut -f 2 -d ' '|cut -f 3 -d \-) - if [ ! -z "$SUBRELEASE" ]; then - RELEASE="$RELEASE-$SUBRELEASE" - fi DATE=$(date -d @$pkg_date +"%F") TIME=$(date -d @$pkg_date +"%T") fi @@ -93,7 +89,7 @@ data="NAME='vesta' VERSION='$VERSION' RELEASE='$RELEASE' ARCH='$ARCH'" data="$data UPDATED='$UPDATED' DESCR='core package' TIME='$TIME' DATE='$DATE'" # Checking installed vesta-php version -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then eval $(rpm --queryformat="$rpm_format" -q vesta-php) DATE=$(date -d @$UTIME +%F) TIME=$(date -d @$UTIME +%T) @@ -111,7 +107,7 @@ data="$data ARCH='$ARCH' UPDATED='$UPDATED' DESCR='php interpreter'" data="$data TIME='$TIME' DATE='$DATE'" # Checking installed vesta-nginx version -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then eval $(rpm --queryformat="$rpm_format" -q vesta-nginx) DATE=$(date -d @$UTIME +%F) TIME=$(date -d @$UTIME +%T) @@ -130,7 +126,7 @@ data="$data TIME='$TIME' DATE='$DATE'" # Checking installed vesta-ioncube version if [ "$SOFTACULOUS" = 'yes' ]; then - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then eval $(rpm --queryformat="$rpm_format" -q vesta-ioncube) DATE=$(date -d @$UTIME +%F) TIME=$(date -d @$UTIME +%T) @@ -150,7 +146,7 @@ fi # Checking installed vesta-softaculous version if [ "$SOFTACULOUS" = 'yes' ]; then - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then eval $(rpm --queryformat="$rpm_format" -q vesta-softaculous) DATE=$(date -d @$UTIME +%F) TIME=$(date -d @$UTIME +%T) diff --git a/bin/v-list-sys-web-status b/bin/v-list-sys-web-status index a380deff..eb58c81c 100755 --- a/bin/v-list-sys-web-status +++ b/bin/v-list-sys-web-status @@ -28,17 +28,17 @@ fi # Displaying proxy status if [ "$PROXY_SYSTEM" = 'nginx' ]; then echo "

$PROXY_SYSTEM STATUS

"| tr '[:lower:]' '[:upper:]' - curl -fsSL --max-time 10 http://localhost:8084/ + wget -qO- http://localhost:8084/ echo "


" fi # Displaying web server status echo "

$WEB_SYSTEM STATUS

"| tr '[:lower:]' '[:upper:]' if [ "$WEB_SYSTEM" != 'nginx' ]; then - curl -fsSL --max-time 10 http://localhost:8081/server-status/ |\ + wget -qO- http://localhost:8081/server-status/ |\ egrep -v "html|DOCTYPE|h1>|title|head" else - curl -fsSL --max-time 10 http://localhost:8084/ + wget -qO- http://localhost:8084/ fi diff --git a/bin/v-list-user b/bin/v-list-user index 57b48bb3..05649f91 100755 --- a/bin/v-list-user +++ b/bin/v-list-user @@ -154,7 +154,6 @@ csv_list() { #----------------------------------------------------------# check_args '1' "$#" 'USER [FORMAT]' -is_format_valid 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-list-user-backup b/bin/v-list-user-backup index 8ee8a41b..2e0a98d0 100755 --- a/bin/v-list-user-backup +++ b/bin/v-list-user-backup @@ -75,7 +75,6 @@ csv_list() { #----------------------------------------------------------# check_args '2' "$#" 'USER BACKUP [FORMAT]' -is_format_valid 'user' is_object_valid 'user' 'USER' "$user" is_object_valid 'backup' 'BACKUP' "$backup" diff --git a/bin/v-list-user-backups b/bin/v-list-user-backups index 7e7e284e..813ee687 100755 --- a/bin/v-list-user-backups +++ b/bin/v-list-user-backups @@ -22,7 +22,7 @@ json_list() { i=1 objects=$(grep BACKUP $USER_DATA/backup.conf |wc -l) echo "{" - while read -r str; do + while read str; do eval $str echo -n ' "'$BACKUP'": { "TYPE": "'$TYPE'", diff --git a/bin/v-list-user-log b/bin/v-list-user-log index 6be9f9ae..f8581341 100755 --- a/bin/v-list-user-log +++ b/bin/v-list-user-log @@ -12,7 +12,6 @@ # Argument definition user=$1 format=${2-shell} -limit=${3-300} # Includes source $VESTA/func/main.sh @@ -24,10 +23,7 @@ json_list() { objects=$(echo "$logs" |wc -l) echo "{" for str in $logs; do - ID=$(echo "$str" |cut -f 2 -d \') - DATE=$(echo "$str" |cut -f 4 -d \') - TIME=$(echo "$str" |cut -f 6 -d \') - CMD=$(echo "$str" |cut -f 8 -d \') + eval $str CMD=${CMD//\"/\\\"} echo -n ' "'$ID'": { "CMD": "'$CMD'", @@ -35,9 +31,6 @@ json_list() { "TIME": "'$TIME'", "DATE": "'$DATE'" }' - if [ "$limit" -gt 0 ] && [ "$i" = "$limit" ]; then - break; - fi if [ "$i" -lt "$objects" ]; then echo ',' else @@ -53,9 +46,13 @@ shell_list() { echo "DATE~TIME~CMD" echo "----~----~---" for str in $logs; do - DATE=$(echo "$str" |cut -f 4 -d \') - TIME=$(echo "$str" |cut -f 6 -d \') - CMD=$(echo "$str" |cut -f 8 -d \') + eval $str + if [ -z "$DATE" ]; then + DATE='no' + fi + if [ -z "$TIME" ]; then + TIME='no' + fi echo "$DATE~$TIME~$CMD" done } @@ -64,9 +61,7 @@ shell_list() { plain_list() { IFS=$'\n' for str in $logs; do - DATE=$(echo "$str" |cut -f 4 -d \') - TIME=$(echo "$str" |cut -f 6 -d \') - CMD=$(echo "$str" |cut -f 8 -d \') + eval $str echo -e "$ID\t$CMD\t$UNDO\t$TIME\t$DATE" done } @@ -76,9 +71,7 @@ csv_list() { IFS=$'\n' echo "ID,CMD,UNDO,TIME,DATE" for str in $logs; do - DATE=$(echo "$str" |cut -f 4 -d \') - TIME=$(echo "$str" |cut -f 6 -d \') - CMD=$(echo "$str" |cut -f 8 -d \') + eval $str echo "$ID,\"$CMD\",\"$UNDO\",$TIME,$DATE" done } @@ -87,7 +80,7 @@ csv_list() { # Verifications # #----------------------------------------------------------# -check_args '1' "$#" 'USER [FORMAT] [LIMIT]' +check_args '1' "$#" 'USER [FORMAT]' is_format_valid 'user' is_object_valid 'user' 'USER' "$user" @@ -97,7 +90,7 @@ is_object_valid 'user' 'USER' "$user" #----------------------------------------------------------# # Parsing history log -logs=$(tail -n $limit $USER_DATA/history.log | tac) +logs=$(tail -n 300 $USER_DATA/history.log 2>/dev/null) case $format in json) json_list ;; diff --git a/bin/v-list-user-stats b/bin/v-list-user-stats index 0fa7dc90..11b867af 100755 --- a/bin/v-list-user-stats +++ b/bin/v-list-user-stats @@ -115,7 +115,6 @@ csv_list() { #----------------------------------------------------------# check_args '1' "$#" 'USER [FORMAT]' -is_format_valid 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-list-users b/bin/v-list-users index 32a94736..14a6d007 100755 --- a/bin/v-list-users +++ b/bin/v-list-users @@ -15,14 +15,9 @@ format=${1-shell} # JSON list function json_list() { echo '{' + object_count=$(grep '@' /etc/passwd |wc -l) i=1 while read USER; do - if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then - continue; - fi - if [ $i -gt 1 ]; then - echo "," - fi source $VESTA/data/users/$USER/user.conf echo -n ' "'$USER'": { "FNAME": "'$FNAME'", @@ -79,8 +74,14 @@ json_list() { "TIME": "'$TIME'", "DATE": "'$DATE'" }' + if [ "$i" -lt "$object_count" ]; then + echo ',' + else + echo + fi ((i++)) done < <(grep '@' /etc/passwd |cut -f1 -d:) + echo '}' } @@ -89,9 +90,6 @@ shell_list() { echo "USER PKG WEB DNS MAIL DB DISK BW SPND DATE" echo "---- --- --- --- --- -- ---- -- ---- ----" while read USER; do - if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then - continue; - fi source $VESTA/data/users/$USER/user.conf echo -n "$USER $PACKAGE $U_WEB_DOMAINS $U_DNS_DOMAINS $U_MAIL_DOMAINS" echo " $U_DATABASES $U_DISK $U_BANDWIDTH $SUSPENDED $DATE" @@ -101,9 +99,6 @@ shell_list() { # PLAIN list function plain_list() { while read USER; do - if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then - continue; - fi source $VESTA/data/users/$USER/user.conf echo -ne "$USER\t$FNAME\t$LNAME\t$PACKAGE\t$WEB_TEMPLATE\t" echo -ne "$BACKEND_TEMPLATE\t$PROXY_TEMPLATE\t$DNS_TEMPLATE\t" @@ -136,9 +131,6 @@ csv_list() { echo -n "U_MAIL_DOMAINS,U_MAIL_DKIM,U_MAIL_ACCOUNTS,U_DATABASES" echo "U_CRON_JOBS,U_BACKUPS,LANGUAGE,TIME,DATE" while read USER; do - if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then - continue; - fi source $VESTA/data/users/$USER/user.conf echo -n "$USER,\"$FNAME\",\"$LNAME\",$PACKAGE,$WEB_TEMPLATE," echo -n "$BACKEND_TEMPLATE,$PROXY_TEMPLATE,$DNS_TEMPLATE," @@ -159,9 +151,6 @@ csv_list() { # Raw list function raw_list() { while read USER; do - if [ ! -f "$VESTA/data/users/$USER/user.conf" ]; then - continue; - fi echo $VESTA/data/users/$USER/user.conf cat $VESTA/data/users/$USER/user.conf done < <(grep '@' /etc/passwd |cut -f1 -d:) diff --git a/bin/v-list-web-domain b/bin/v-list-web-domain index 7e33a4ab..e0f9492c 100755 --- a/bin/v-list-web-domain +++ b/bin/v-list-web-domain @@ -110,7 +110,6 @@ csv_list() { #----------------------------------------------------------# check_args '2' "$#" 'USER DOMAIN [FORMAT]' -is_format_valid 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" diff --git a/bin/v-list-web-domain-ssl b/bin/v-list-web-domain-ssl index d637cf89..c91a7cca 100755 --- a/bin/v-list-web-domain-ssl +++ b/bin/v-list-web-domain-ssl @@ -19,7 +19,6 @@ source $VESTA/func/main.sh # JSON list function json_list() { - issuer=$(echo "$issuer" |sed -e 's/"/\\"/g' -e "s/%quote%/'/g") echo '{' echo -e "\t\"$domain\": {" echo " \"CRT\": \"$crt\"," @@ -98,7 +97,6 @@ csv_list() { #----------------------------------------------------------# check_args '2' "$#" 'USER DOMAIN [FORMAT]' -is_format_valid 'user' 'domain' is_object_valid 'user' 'USER' "$user" is_object_valid 'web' 'DOMAIN' "$domain" diff --git a/bin/v-list-web-domains b/bin/v-list-web-domains index 23de5fb4..a31199fa 100755 --- a/bin/v-list-web-domains +++ b/bin/v-list-web-domains @@ -100,7 +100,6 @@ csv_list() { #----------------------------------------------------------# check_args '1' "$#" 'USER [FORMAT]' -is_format_valid 'user' is_object_valid 'user' 'USER' "$user" diff --git a/bin/v-lock-wordpress b/bin/v-lock-wordpress deleted file mode 100644 index 36852781..00000000 --- a/bin/v-lock-wordpress +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# info: Lock WordPress files if they are potentially infected (somewhere) by PHP malware, in order to stop further infection -# options: DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -unlock_folder() { - chown -R $user:$user $1/ - - # block .php execution inside folder - cat <$1/.htaccess -RewriteEngine on -RewriteRule ^.*\.(?:php[1-6]?|pht|phtml?)$ - [NC,F] -EOF - - chown root:root $1/.htaccess -} - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Domain doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -cd /home/$user/web/$domain - -# lock files -chown -R www-data:www-data public_html/ - -# set correct chmod just in case -find public_html/ -type d -exec chmod 755 {} + -find public_html/ -type f -exec chmod 644 {} + - -# unlock /wp-content/uploads/ for uploading -if [ -d "/home/$user/web/$domain/public_html/wp-content/uploads" ]; then - unlock_folder "public_html/wp-content/uploads" -fi - -# unlock /wp-content/cache/ for caching -if [ -d "/home/$user/web/$domain/public_html/wp-content/cache" ]; then - unlock_folder "public_html/wp-content/cache" -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -echo "v-lock-wordpress: Done." - -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-log-failed-login b/bin/v-log-failed-login deleted file mode 100644 index 66b9b808..00000000 --- a/bin/v-log-failed-login +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -# info: log failed login attempt -# options: USER [IP] -# -# The function log failed login attempt - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -user=$1 -ip=${2-127.0.0.1} - -time_n_date=$(date +'%T %F') -time=$(echo "$time_n_date" |cut -f 1 -d \ ) -date=$(echo "$time_n_date" |cut -f 2 -d \ ) - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit 0 diff --git a/bin/v-make-ip-ssl b/bin/v-make-ip-ssl deleted file mode 100644 index 25c1b10f..00000000 --- a/bin/v-make-ip-ssl +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -# info: Copy host SSL as IP SSL -# options: USER DOMAIN -# -# The function check if specific (sub)domain is marked as main host for specific IP, get its SSL and put it as IP SSL in /usr/local/vesta/ssl/ - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Argument definition -user=$1 -domain=$2 - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '2' "$#" 'USER DOMAIN' -is_format_valid 'user' 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ ! -f "/etc/exim4/virtual/helo_data" ]; then - exit 1 -fi - -echo "Script ran with: $user $domain" >> /usr/local/vesta/log/v-make-ip-ssl.log - -grepr=$(grep -c ": $domain$" /etc/exim4/virtual/helo_data) -if [ $grepr -ge 1 ]; then - ip=$(grep ": $domain$" /etc/exim4/virtual/helo_data | awk -F: '{print $1}') - if [ ! -z "$ip" ]; then - echo "Processinng $domain" >> /usr/local/vesta/log/v-make-ip-ssl.log - echo "IP = $ip" >> /usr/local/vesta/log/v-make-ip-ssl.log - cp /home/$user/conf/web/ssl.$domain.pem /usr/local/vesta/ssl/$ip.crt - cp /home/$user/conf/web/ssl.$domain.key /usr/local/vesta/ssl/$ip.key - - exim_user="exim"; - check_exim_username=$(grep -c '^Debian-exim:' /etc/passwd) - if [ "$check_exim_username" -eq 1 ]; then - exim_user="Debian-exim" - fi - - # Assign exim permissions - chown $exim_user:mail /usr/local/vesta/ssl/$ip.crt - chown $exim_user:mail /usr/local/vesta/ssl/$ip.key - - service exim4 restart - service dovecot restart - echo "Done." >> /usr/local/vesta/log/v-make-ip-ssl.log - fi -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-make-main-apache-log b/bin/v-make-main-apache-log deleted file mode 100644 index 6a6dfadd..00000000 --- a/bin/v-make-main-apache-log +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -touch /var/log/apache2/time.log -# truncate -s 0 /var/log/apache2/time.log -chmod 0640 /var/log/apache2/time.log -chown root:adm /var/log/apache2/time.log -find /home/*/conf/web/ -type f \( -name "apache2.conf" -or -name "sapache2.conf" -or -name "*.apache2.conf" -or -name "*.apache2.ssl.conf" \) -exec grep -L "time\.log" {} \; | xargs sed -i 's|ServerName |CustomLog /var/log/apache2/time.log time\n ServerName |g' -find /usr/local/vesta/data/templates/web/apache2 -type f \( -name "*.tpl" -or -name "*.stpl" \) -exec grep -L "time\.log" {} \; | xargs sed -i 's|ServerName |CustomLog /var/log/apache2/time.log time\n ServerName |g' -if ! /usr/local/vesta/bin/v-grep 'LogFormat "%t %v %a %D %r %>s \"%{User-Agent}i\"" time' '/etc/apache2/apache2.conf' '-q'; then - sed -i 's|LogFormat "%b" bytes|LogFormat "%b" bytes\nLogFormat "%t %v %a %D %r %>s \\\"%{User-Agent}i\\\" pid=%P" time|g' /etc/apache2/apache2.conf -fi -systemctl restart apache2 - -wget -nv http://dl.myvestacp.com/vesta/apache_requests_analyzer/analyze-traffic.php -O /root/analyze-traffic.php diff --git a/bin/v-make-separated-ip-for-email b/bin/v-make-separated-ip-for-email deleted file mode 100644 index 15e42c05..00000000 --- a/bin/v-make-separated-ip-for-email +++ /dev/null @@ -1,234 +0,0 @@ - #!/bin/bash - -# info: add new ip and makes email to be sent via that IP only for SMTP authenticated users -# options: MAIL_HOSTNAME MAIL_IP -# -# The function add new ip, add new host for mail, try to generate letsencrypt for it, and makes email to be sent via that IP only for SMTP authenticated users - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh - -MAIL_HOSTNAME=$1 -MAIL_IP=$2 - -if [ $# -gt 2 ]; then - NETMASK=$3 -else - NETMASK='255.255.255.192' -fi - -if [ $# -gt 3 ]; then - INTERFACE=$4 -else - INTERFACE='eth0' -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '2' "$#" 'MAIL_HOSTNAME MAIL_IP [NETMASK] [INTERFACE]' -is_domain_format_valid "$MAIL_HOSTNAME" -is_ip_format_valid "$MAIL_IP" - -HOST_USER=$($VESTA/bin/v-search-domain-owner "$HOSTNAME") -if [ -z "$HOST_USER" ]; then - echo "Error: hostname $HOSTNAME is not created as web domain" - exit 4 -fi - -HOST_IP=$($VESTA/bin/v-list-web-domain "$HOST_USER" "$HOSTNAME" | grep 'IP:' | awk '{print $2}') - -echo "HOSTNAME : $HOSTNAME" -echo "HOSTNAME IP : $HOST_IP" -echo "MAIL HOSTNAME: $MAIL_HOSTNAME" -echo "MAIL_IP : $MAIL_IP" -if [ $# -gt 2 ]; then - echo "NETMASK : $NETMASK" -fi -if [ $# -gt 3 ]; then - echo "INTERFACE : $INTERFACE" -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ ! -f "/usr/local/vesta/data/ips/$MAIL_IP" ]; then - echo "=== Adding IP $MAIL_IP with netmask $NETMASK on interface $INTERFACE" - $VESTA/bin/v-add-sys-ip "$MAIL_IP" "$NETMASK" "$INTERFACE" 'admin' 'dedicated' '' '' -fi - -MAIL_USER=$($VESTA/bin/v-search-domain-owner "$MAIL_HOSTNAME") -if [ -z "$MAIL_USER" ]; then - MAIL_USER=$HOST_USER - echo "=== Creating (sub)domain $MAIL_HOSTNAME" - $VESTA/bin/v-add-domain "$MAIL_USER" "$MAIL_HOSTNAME" "$MAIL_IP" 'yes' - echo "=== Deleting www from (sub)domain $MAIL_HOSTNAME" - www_host="www.$MAIL_HOSTNAME" - $VESTA/bin/v-delete-web-domain-alias "$MAIL_USER" "$MAIL_HOSTNAME" "$www_host" 'no' - $VESTA/bin/v-delete-dns-on-web-alias "$MAIL_USER" "$MAIL_HOSTNAME" "$www_host" 'no' -else - CURRENT_MAIL_IP=$($VESTA/bin/v-list-web-domain "$MAIL_USER" "$MAIL_HOSTNAME" | grep 'IP:' | awk '{print $2}') - if [ "$CURRENT_MAIL_IP" != "$MAIL_IP" ]; then - echo "=== Switching (sub)domain $MAIL_HOSTNAME to IP: $MAIL_IP" - $VESTA/bin/v-change-web-domain-ip "$MAIL_USER" "$MAIL_HOSTNAME" "$MAIL_IP" 'yes' - $VESTA/bin/v-change-dns-domain-ip "$MAIL_USER" "$MAIL_HOSTNAME" "$MAIL_IP" 'yes' - fi -fi - -if [ -f "/home/$MAIL_USER/conf/web/ssl.$MAIL_HOSTNAME.ca" ]; then - echo "=== Signed SSL already installed" -else - echo "=== Installing LetsEncrypt for (sub)domain $MAIL_HOSTNAME" - $VESTA/bin/v-add-letsencrypt-domain "$MAIL_USER" "$MAIL_HOSTNAME" "" "yes" - if [ $? -ne 0 ]; then - echo "=== LetsEncrypt installation failed" - fi -fi - -if [ ! -d "/etc/exim4/virtual" ]; then - echo "=== Creating /etc/exim4/virtual directory" - mkdir -p /etc/exim4/virtual - echo "$HOST_IP: $HOSTNAME" > /etc/exim4/virtual/helo_data - echo "$HOSTNAME: $HOST_IP" > /etc/exim4/virtual/interfaces - length=$(wc -c /dev/null 2>&1 - length=$(wc -c /dev/null 2>&1 -fi -check_grep1=$(grep -c "^$MAIL_IP:" /etc/exim4/virtual/helo_data) -check_grep2=$(grep -c ": $MAIL_HOSTNAME" /etc/exim4/virtual/helo_data) -if [ "$check_grep1" -eq 0 ] && [ "$check_grep2" -eq 0 ]; then - echo "=== Adding $MAIL_IP: $MAIL_HOSTNAME to /etc/exim4/virtual/helo_data" - echo "" >> /etc/exim4/virtual/helo_data - echo "$MAIL_IP: $MAIL_HOSTNAME" >> /etc/exim4/virtual/helo_data - length=$(wc -c /dev/null 2>&1 -fi -check_grep1=$(grep -c "^$MAIL_HOSTNAME:" /etc/exim4/virtual/interfaces) -check_grep2=$(grep -c ": $MAIL_IP" /etc/exim4/virtual/interfaces) -if [ "$check_grep1" -eq 0 ] && [ "$check_grep2" -eq 0 ]; then - echo "=== Adding $MAIL_HOSTNAME: $MAIL_IP to /etc/exim4/virtual/interfaces" - echo "" >> /etc/exim4/virtual/interfaces - echo "$MAIL_HOSTNAME: $MAIL_IP" >> /etc/exim4/virtual/interfaces - length=$(wc -c /dev/null 2>&1 -fi - -echo "=== Generating IP SSL for hostname $HOSTNAME" -$VESTA/bin/v-make-ip-ssl "$HOST_USER" "$HOSTNAME" -echo "=== Generating IP SSL for mail hostname $MAIL_HOSTNAME" -$VESTA/bin/v-make-ip-ssl "$MAIL_USER" "$MAIL_HOSTNAME" - -check_grep=$(grep -c 'smtp_active_hostname' /etc/exim4/exim4.conf.template) -if [ "$check_grep" -eq 0 ]; then - echo "=== patching exim4.conf.template" - mv /etc/exim4/exim4.conf.template /etc/exim4/exim4.conf.template-backup - cp /usr/local/vesta/install/debian/12/exim/exim4.conf.template /etc/exim4/exim4.conf.template - - eximversion=$(exim4 --version | grep '^Exim version ' | awk '{print $3}') - if (( $(echo "$eximversion < 4.96" | bc -l) )); then - cp /usr/local/vesta/install/debian/12/exim/exim4.conf.template.without-srs /etc/exim4/exim4.conf.template - sed -i "s|message_linelength_limit|#message_linelength_limit|g" /etc/exim4/exim4.conf.template - fi - - if (( $(echo "$eximversion < 4.94" | bc -l) )); then - sed -i "s|smtputf8_advertise_hosts|#smtputf8_advertise_hosts|g" /etc/exim4/exim4.conf.template - fi - - sed -i "s|FIRSTIP|$HOST_IP|g" /etc/exim4/exim4.conf.template - sed -i "s|SECONDIP|$MAIL_IP|g" /etc/exim4/exim4.conf.template - sed -i "s|FIRSTHOST|$HOSTNAME|g" /etc/exim4/exim4.conf.template - sed -i "s|SECONDHOST|$MAIL_HOSTNAME|g" /etc/exim4/exim4.conf.template - sed -i "s|#local_interfaces|local_interfaces|g" /etc/exim4/exim4.conf.template - sed -i "s|#smtp_active_hostname|smtp_active_hostname|g" /etc/exim4/exim4.conf.template - sed -i "s|#smtp_banner|smtp_banner|g" /etc/exim4/exim4.conf.template - sed -i "s|#interface =|interface =|g" /etc/exim4/exim4.conf.template - sed -i "s|#helo_data =|helo_data =|g" /etc/exim4/exim4.conf.template - /usr/local/vesta/bin/v-sed 'tls_certificate = /usr/local/vesta/ssl/certificate.crt' 'tls_certificate = /usr/local/vesta/ssl/$received_ip_address.crt' '/etc/exim4/exim4.conf.template' - /usr/local/vesta/bin/v-sed 'tls_privatekey = /usr/local/vesta/ssl/certificate.key' 'tls_privatekey = /usr/local/vesta/ssl/$received_ip_address.key' '/etc/exim4/exim4.conf.template' - touch /etc/exim4/limit_per_email_account_max_sent_emails_per_hour - touch /etc/exim4/limit_per_email_account_max_recipients - touch /etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour - touch /etc/exim4/limit_per_hosting_account_max_recipients - check_grep=$(grep -c '#SPAMASSASSIN' /etc/exim4/exim4.conf.template-backup) - if [ "$check_grep" -eq 0 ]; then - sed -i "s|#SPAMASSASSIN|SPAMASSASSIN|g" /etc/exim4/exim4.conf.template - fi - check_grep=$(grep -c '#SPAM_SCORE' /etc/exim4/exim4.conf.template-backup) - if [ "$check_grep" -eq 0 ]; then - sed -i "s|#SPAM_SCORE|SPAM_SCORE|g" /etc/exim4/exim4.conf.template - fi - check_grep=$(grep -c '#CLAMD' /etc/exim4/exim4.conf.template-backup) - if [ "$check_grep" -eq 0 ]; then - sed -i "s|#CLAMD|CLAMD|g" /etc/exim4/exim4.conf.template - fi - systemctl restart exim4 - if [ $? -ne 0 ]; then - systemctl status exim4 - cp /etc/exim4/exim4.conf.template-backup /etc/exim4/exim4.conf.template - systemctl restart exim4 - echo "=== Patching failed, old exim conf returned, exim4 restarted again." - exit 1 - fi - echo "=== Patching successful" -else - echo "=== exim4.conf.template already patched" -fi - -check_grep=$(grep -c 'v-make-ip-ssl' /usr/local/vesta/conf/vesta.conf) -if [ "$check_grep" -eq 0 ]; then - echo "=== Set UPDATE_SSL_SCRIPT to 'v-make-ip-ssl'" - echo "UPDATE_SSL_SCRIPT='/usr/local/vesta/bin/v-make-ip-ssl'" >> /usr/local/vesta/conf/vesta.conf -else - echo "=== Value UPDATE_SSL_SCRIPT is already 'v-make-ip-ssl'" -fi - -check_grep=$(grep -c "ip4:$MAIL_IP" /usr/local/vesta/data/templates/dns/default.tpl) -if [ "$check_grep" -eq 0 ]; then - echo "=== Adding IP to SPF" - sed -i "s|ip4:%ip%|ip4:%ip% ip4:$MAIL_IP|g" /usr/local/vesta/data/templates/dns/default.tpl - NOTFOUNDVAL="ip4:$MAIL_IP" - OLDVAL="ip4:$HOST_IP" - NEWVAL="ip4:$HOST_IP ip4:$MAIL_IP" - find /usr/local/vesta/data/users/*/dns/ -type f -exec grep -L "$NOTFOUNDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /home/*/conf/dns/ -type f -exec grep -L "$NOTFOUNDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - service bind9 reload -fi - -echo "=== Done!" - -ptr=$(dig +short -x $MAIL_IP) -ptr_len=${#ptr} -ptr_len=$((ptr_len-1)) -ptr=${ptr:0:ptr_len} -if [ "$ptr" != "$MAIL_HOSTNAME" ]; then - echo "==============================================================================" - echo "WARNING:" - echo "PTR record (reverse DNS) for IP $MAIL_IP is $ptr" - echo "PTR record (reverse DNS) for IP $MAIL_IP should be $MAIL_HOSTNAME" - echo "==============================================================================" -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-make-separated-ip-for-email-domain b/bin/v-make-separated-ip-for-email-domain deleted file mode 100644 index 8f92e6d0..00000000 --- a/bin/v-make-separated-ip-for-email-domain +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# info: Switch domain to send emails from desired IP -# options: DOMAIN IP -# -# The function switch domain to send emails from desired IP - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh - -DOMAIN=$1 -IP=$2 - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '2' "$#" 'DOMAIN IP' -is_domain_format_valid "$DOMAIN" -is_ip_format_valid "$IP" - -if [ ! -d "/etc/exim4/virtual" ]; then - /usr/local/vesta/bin/v-make-separated-ip-for-email "$DOMAIN" "$IP" -fi - -HOST_USER=$($VESTA/bin/v-search-domain-owner "$HOSTNAME") -if [ -z "$HOST_USER" ]; then - echo "Error: hostname $HOSTNAME is not created as web domain" - exit 2 -fi - -HOST_IP=$($VESTA/bin/v-list-web-domain "$HOST_USER" "$HOSTNAME" | grep 'IP:' | awk '{print $2}') - -# echo "HOSTNAME : $HOSTNAME" -# echo "HOSTNAME IP : $HOST_IP" - -check_grep=$(grep -c "^$IP:" /etc/exim4/virtual/helo_data) -if [ "$check_grep" -eq 0 ]; then - /usr/local/vesta/bin/v-make-separated-ip-for-email "$DOMAIN" "$IP" -fi - -USER=$($VESTA/bin/v-search-domain-owner "$DOMAIN") -if [ -z "$USER" ]; then - echo "Error: hostname $DOMAIN is not created as web domain" - exit 4 -fi - -echo "=== patching exim4.conf.template" -NEWVALUE=" interface = \${lookup{\$sender_address_domain}lsearch{/etc/exim4/virtual/interfaces} {\$value}{$HOST_IP}}" -sed -i "s#^ interface = .*#$NEWVALUE#g" /etc/exim4/exim4.conf.template -NEWVALUE=" helo_data = \"\${lookup{\$sending_ip_address}lsearch{/etc/exim4/virtual/helo_data}{\$value}{$HOSTNAME}}\"" -sed -i "s#^ helo_data = .*#$NEWVALUE#g" /etc/exim4/exim4.conf.template - -service exim4 restart - -check_grep=$(grep -c "^$DOMAIN:" /etc/exim4/virtual/interfaces) -if [ "$check_grep" -eq 1 ]; then - echo "=== Changing $DOMAIN: $IP in /etc/exim4/virtual/interfaces" - sed -i "s#^$DOMAIN: .*#$DOMAIN: $IP#g" /etc/exim4/virtual/interfaces -else - echo "=== Adding $DOMAIN: $IP to /etc/exim4/virtual/interfaces" - echo "" >> /etc/exim4/virtual/interfaces - echo "$DOMAIN: $IP" >> /etc/exim4/virtual/interfaces - length=$(wc -c /dev/null 2>&1 - echo "=== Done!" -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-migrate-site-to-https b/bin/v-migrate-site-to-https deleted file mode 100644 index c15a521e..00000000 --- a/bin/v-migrate-site-to-https +++ /dev/null @@ -1,185 +0,0 @@ -#!/bin/bash -# info: migrate site to https -# options: DOMAIN [--DATABASE_NAME=...] [--DATABASE_USERNAME=...] [--DATABASE_PASSWORD=...] -# -# Tool that will replace http to https URLs in database, install SSL and switch to force-https proxy template -# Automatic detection of CMS, automaticaly read DB user, DB name and DB pass. - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -if [ -z "$user" ]; then - echo "domain $domain doesn't exist" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/db.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN [--DATABASE_NAME=...] [--DATABASE_USERNAME=...] [--DATABASE_PASSWORD=...]' -is_format_valid 'domain' 'user' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - - -FROM_DATABASE_NAME='' -FROM_DATABASE_USERNAME='' -FROM_DATABASE_PASSWORD='' - -FROM_DOMAIN=$domain -FROM_USER=$user - -r=$(/usr/local/vesta/bin/v-get-database-credentials-of-domain $FROM_DOMAIN) -# echo $r -eval $r - -source /usr/local/vesta/func/handle_parameters.sh - -FROM_CONFIG_FILE=$CONFIG_FILE -FROM_CONFIG_FILE_FULL_PATH=$CONFIG_FILE_FULL_PATH -if [ ! -f "$FROM_CONFIG_FILE_FULL_PATH" ]; then - echo "Error: CONFIG_FILE_FULL_PATH $FROM_CONFIG_FILE_FULL_PATH does not exists" - exit 2 -fi - -IT_IS_WP=0 -if [ "$CMS_TYPE" = "wordpress" ]; then - IT_IS_WP=1 -fi - -if [ -z "$FROM_DATABASE_NAME" ]; then - FROM_DATABASE_NAME=$DATABASE_NAME -fi -if [ -z "$FROM_DATABASE_USERNAME" ]; then - FROM_DATABASE_USERNAME=$DATABASE_USERNAME -fi -if [ -z "$FROM_DATABASE_PASSWORD" ]; then - FROM_DATABASE_PASSWORD=$DATABASE_PASSWORD -fi - -if [ -z "$FROM_DATABASE_NAME" ]; then - echo "Error: DATABASE_NAME is empty" - exit 3 -fi -if [ -z "$FROM_DATABASE_USERNAME" ]; then - echo "Error: DATABASE_USERNAME is empty" - exit 4 -fi -if [ -z "$FROM_DATABASE_PASSWORD" ]; then - echo "Error: DATABASE_PASSWORD is empty" - exit 5 -fi - -DB_EXISTS=$(check_if_database_exists "$user" "$FROM_DATABASE_NAME") -if [ "$DB_EXISTS" = "no" ]; then - echo "Error: database $FROM_DATABASE_NAME does not exists" - exit 6 -fi - -phpver=$(/usr/local/vesta/bin/v-get-php-version-of-domain "$FROM_DOMAIN") - -# ----------- CHECK ------------- - -FROM_REPLACE1="http://$FROM_DOMAIN" -TO_REPLACE1="https://$FROM_DOMAIN" -FROM_REPLACE2="http://www.$FROM_DOMAIN" -TO_REPLACE2="https://www.$FROM_DOMAIN" - -if [ $IT_IS_WP -eq 0 ]; then - if [ ! -f "/root/Search-Replace-DB/srdb.cli.php" ]; then - if [ ! -f "/usr/bin/git" ]; then - apt-get update > /dev/null 2>&1 - apt-get -y install git > /dev/null 2>&1 - fi - cd /root - git clone https://github.com/interconnectit/Search-Replace-DB.git - fi -fi - - -# ----------- PRINT ------------- - - -echo "===============================================================================" -echo "FROM_REPLACE1 = $FROM_REPLACE1" -echo "TO_REPLACE1 = $TO_REPLACE1" -echo "FROM_REPLACE2 = $FROM_REPLACE2" -echo "TO_REPLACE2 = $TO_REPLACE2" -echo "----" -echo "DOMAIN = $FROM_DOMAIN" -echo "USER = $FROM_USER" -echo "SITE_FOLDER = $SITE_FOLDER" -echo "IT_IS_WP = $IT_IS_WP" -echo "CONFIG_FILE_FULL_PATH = $FROM_CONFIG_FILE_FULL_PATH" -echo "DATABASE_NAME = $FROM_DATABASE_NAME" -echo "DATABASE_USERNAME = $FROM_DATABASE_USERNAME" -echo "DATABASE_PASSWORD = $FROM_DATABASE_PASSWORD" -echo "===============================================================================" -read -p "=== Press Enter to continue ===" - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ ! -f "/home/$user/conf/web/ssl.$domain.ca" ]; then - /usr/local/vesta/bin/v-add-letsencrypt-domain "$user" "$domain" "www.$domain" "yes" -fi -if [ -f "/home/$user/conf/web/ssl.$domain.ca" ]; then - if [ -f "/usr/local/vesta/data/templates/web/nginx/force-https.stpl" ]; then - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$user" "$domain" "force-https" "jpeg,jpg,png,gif,bmp,ico,svg,tif,tiff,css,js,ttf,otf,webp,txt,csv,rtf,doc,docx,xls,xlsx,ppt,pptx,odf,odp,ods,odt,pdf,psd,ai,eot,eps,ps,zip,tar,tgz,gz,rar,bz2,7z,aac,m4a,mp3,mp4,ogg,wav,wma,3gp,avi,flv,m4v,mkv,mov,mpeg,mpg,wmv,exe,iso,dmg,swf,woff,woff2" "yes" - fi -else - echo "Error: Can not generate SSL." - exit 9 -fi - -echo "=== Replacing $FROM_REPLACE1 to $TO_REPLACE1 in folder $TO_FOLDER" -grep -rl "$FROM_DOMAIN" $SITE_FOLDER | xargs sed -i "s#$FROM_REPLACE1#$TO_REPLACE1#g" - -echo "=== Replacing $FROM_REPLACE2 to $TO_REPLACE2 in folder $TO_FOLDER" -grep -rl "$FROM_DOMAIN" $SITE_FOLDER | xargs sed -i "s#$FROM_REPLACE2#$TO_REPLACE2#g" - -if [ $IT_IS_WP -eq 0 ]; then - echo "=== Replacing $FROM_REPLACE1 to $TO_REPLACE1 in database $FROM_DATABASE_NAME" - php /root/Search-Replace-DB/srdb.cli.php -h localhost -n "$FROM_DATABASE_NAME" -u "$FROM_DATABASE_USERNAME" -p "$FROM_DATABASE_PASSWORD" -s "$FROM_REPLACE1" -r "$TO_REPLACE1" - echo "=== Replacing $FROM_REPLACE2 to $TO_REPLACE2 in database $FROM_DATABASE_NAME" - php /root/Search-Replace-DB/srdb.cli.php -h localhost -n "$FROM_DATABASE_NAME" -u "$FROM_DATABASE_USERNAME" -p "$FROM_DATABASE_PASSWORD" -s "$FROM_REPLACE2" -r "$TO_REPLACE2" -else - cd $SITE_FOLDER - echo "=== Replacing $FROM_REPLACE1 to $TO_REPLACE1 in database $FROM_DATABASE_NAME" - /usr/local/vesta/bin/v-run-wp-cli $FROM_DOMAIN search-replace "$FROM_REPLACE1" "$TO_REPLACE1" --precise --all-tables --skip-columns=guid --skip-plugins --skip-themes; - echo "=== Replacing $FROM_REPLACE2 to $TO_REPLACE2 in database $FROM_DATABASE_NAME" - /usr/local/vesta/bin/v-run-wp-cli $FROM_DOMAIN search-replace "$FROM_REPLACE2" "$TO_REPLACE2" --precise --all-tables --skip-columns=guid --skip-plugins --skip-themes; -fi - -echo "===== DONE ====" -echo "You can visit $TO_REPLACE1" - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-move-domain-and-database-to-account b/bin/v-move-domain-and-database-to-account deleted file mode 100644 index 383fd26e..00000000 --- a/bin/v-move-domain-and-database-to-account +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash -# info: change domain and database owner -# options: DOMAIN USER -# -# The function of changing domain and database ownership. - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Argument definition -domain=$1 -user=$2 - -# Importing system environment -source /etc/profile - -# Includes -source /usr/local/vesta/func/main.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '2' "$#" 'DOMAIN USER' -is_format_valid 'domain' 'user' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" -owner=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -if [ -z "$owner" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi -if [ "$owner" = "$user" ]; then - exit -fi - -USER_DATA=$VESTA/data/users/$owner -is_object_unsuspended 'user' 'USER' "$owner" -USER_DATA=$VESTA/data/users/$user - -USER_TO=$user - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -RET=$OK - -echo "=================================" -r=$(/usr/local/vesta/bin/v-get-database-credentials-of-domain $domain) -echo $r -eval $r -echo "=================================" - -if [ ! -z "$DATABASE_NAME" ]; then - echo "=== v-change-database-owner $DATABASE_NAME $USER_TO" - /usr/local/vesta/bin/v-change-database-owner $DATABASE_NAME $USER_TO - if [ $? -ne 0 ]; then - echo "=== v-change-database-owner failed" - RET=$E_NOTEXIST - fi - - if [ ! -z "$DATABASE_USERNAME" ] && [ ! -z "$CONFIG_FILE_FULL_PATH" ]; then - replace_php_config_value "${DATABASE_NAME}" "${USER_TO}_${DATABASE_NAME_WITHOUT_USER_PREFIX}" "$CONFIG_FILE_FULL_PATH" "yes" - replace_php_config_value "${DATABASE_USERNAME}" "${USER_TO}_${DATABASE_USERNAME_WITHOUT_USER_PREFIX}" "$CONFIG_FILE_FULL_PATH" "yes" - else - if [ -z "$DATABASE_USERNAME" ]; then - echo "=== DATABASE_USERNAME is empty, so we will not change config file" - fi - if [ -z "$CONFIG_FILE_FULL_PATH" ]; then - echo "=== CONFIG_FILE_FULL_PATH is empty, so we will not change config file" - fi - fi -else - echo "=== DATABASE_NAME is empty, so we will not move database" -fi - -echo "=== v-change-domain-owner $domain $USER_TO" -/usr/local/vesta/bin/v-change-domain-owner $domain $USER_TO -if [ $? -ne 0 ]; then - echo "=== v-change-domain-owner failed" - RET=$E_NOTEXIST -fi - -#----------------------------------------------------------# -# Update Wordfence WAF Path # -#----------------------------------------------------------# - -filepath="/home/USER_TO/web/$domain/public_html/.user.ini" -filename=$(basename $filepath) - -# Check if file exists -if [ -f "$filepath" ]; then - echo "Updating $filename with new user path..." - - # Temporary file for modification - tmp_file=$(mktemp) - - # Change path from old USER to new USER_TO - sed "s|/home/$owner/public_html|/home/$USER_TO/public_html|g" "$filepath" > "$tmp_file" - - # Check if replacement was successful and update file - if [ $? -eq 0 ]; then - mv "$tmp_file" "$filepath" - echo "$filename updated successfully." - else - echo "Failed to update $filename file." - rm "$tmp_file" # Deletes temporary file - fi -fi - -filepath="/home/USER_TO/web/$domain/public_html/wordfence-waf.php" -filename=$(basename $filepath) - -# Check if file exists -if [ -f "$filepath" ]; then - echo "Updating $filename with new user path..." - - # Temporary file for modification - tmp_file=$(mktemp) - - # Change path from old USER to new USER_TO - sed "s|/home/$owner/public_html|/home/$USER_TO/public_html|g" "$filepath" > "$tmp_file" - - # Check if replacement was successful and update file - if [ $? -eq 0 ]; then - mv "$tmp_file" "$filepath" - echo "$filename updated successfully." - else - echo "Failed to update $filename file." - rm "$tmp_file" # Deletes temporary file - fi -fi - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -log_event "$RET" "$ARGUMENTS" - -exit diff --git a/bin/v-move-folder-and-make-symlink b/bin/v-move-folder-and-make-symlink deleted file mode 100644 index ccd66b7c..00000000 --- a/bin/v-move-folder-and-make-symlink +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/bash - -# info: -# This script will move a folder to the new destination and make a symlink from the old path to the new destination - -# options: FROMFOLDER TOFOLDER - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ] && [ "$whoami" != "admin" ] ; then - echo "You must be root or admin to execute this script"; - exit 1; -fi - -# Argument definition -FROMFOLDER=$1 -TOFOLDER=$2 - -echo "Executing: v-move-folder-and-make-symlink $1 $2" - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -if [ -z "$FROMFOLDER" ]; then - echo "First parameter is empty, aborting" - exit 1 -fi - -if [ -z "$TOFOLDER" ]; then - echo "Second parameter is empty, aborting" - exit 1 -fi - -# Trimming the ending slash, just in case -FROMFOLDER=$(echo "$FROMFOLDER" | sed 's:/*$::') -TOFOLDER=$(echo "$TOFOLDER" | sed 's:/*$::') - -if [ ! -d "$FROMFOLDER" ]; then - echo "Folder $FROMFOLDER does not exists, aborting" - exit 1 -fi - -if [ -L "$FROMFOLDER" ]; then - echo "Folder $FROMFOLDER is already symlink, aborting" - exit 1 -fi - -if [ -d "$TOFOLDER" ]; then - echo "Folder $TOFOLDER already exists, aborting" - exit 1 -fi - -if [ -L "$TOFOLDER" ]; then - echo "Folder $TOFOLDER already exists (as symlink), aborting" - exit 1 -fi - -USER=$(stat -c '%U' "$FROMFOLDER") -GROUP=$(stat -c '%G' "$FROMFOLDER") -PARENTFOLDER=$(dirname "$TOFOLDER") - -if [ ! -d "$PARENTFOLDER" ]; then - PUSER=$(stat -c '%U' "$PARENTFOLDER") - PGROUP=$(stat -c '%G' "$PARENTFOLDER") - echo "= Creating parent folder..." - mkdir -p "$PARENTFOLDER" - chown $PUSER:$PGROUP "$PARENTFOLDER" -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -if [ "$FROMFOLDER" = "/home/$USER" ] && [ -d "$FROMFOLDER/conf" ]; then - # if we are moving myVesta home folder, we must remove immutable attribute from conf/ files - chattr -R -i "$FROMFOLDER/conf/" > /dev/null 2>&1 - # with slashes on the end of the path of the folder -fi - -# rsync -a "$FROMFOLDER/" "$TOFOLDER/" -# with slashes on the end of the path of both folders - -mv "$FROMFOLDER" "$TOFOLDER" -if [ "$?" -ne 0 ]; then - echo "Error happened, aborting" - exit 1 -fi - -rm -rf "$FROMFOLDER" -# without slash on the end of the path of the folder - -ln -s "$TOFOLDER" "$FROMFOLDER" -# without slashes on the end of the path of both folders - -chown -h $USER:$GROUP $FROMFOLDER -# without slash on the end of the path of the folder - -#----------------------------------------------------------# -# Log and print result # -#----------------------------------------------------------# - -echo "Done, folder $FROMFOLDER moved to $TOFOLDER and symlinked" - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-normalize-restored-user b/bin/v-normalize-restored-user deleted file mode 100644 index 91ef29c9..00000000 --- a/bin/v-normalize-restored-user +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash - -# info: -# Normalize NS1, NS2 and IP of account that is backuped on other server and restored on this server. -# After restoring, user will have DNS that contains NS1, NS2 and IP from original server -# This script will put NS1, NS2 and IP of current server - -# options: user - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ] && [ "$whoami" != "admin" ] ; then - echo "You must be root or admin to execute this script"; - exit 1; -fi - - -# Argument definition -user=$1 - -# Includes -source $VESTA/func/main.sh - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'USER' -is_format_valid 'user' -is_object_valid 'user' 'USER' "$user" - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -source $VESTA/data/packages/default.pkg - -arrNS=(${NS//,/ }) -NEWNS1=${arrNS[0]} -NEWNS2=${arrNS[1]} - -for domain in $(/usr/local/vesta/bin/v-list-web-domains $user plain |cut -f 1); do - if [ -f "/usr/local/vesta/data/users/$user/dns/$domain.conf" ]; then - NEWIPV4=$(/usr/local/vesta/bin/v-list-dns-domain "$user" "$domain" | grep 'IP:' | awk '{print $2}') - res=$(grep "'www'" /usr/local/vesta/data/users/$user/dns/$domain.conf) - eval $res - OLDIPV4=$VALUE - fi - if [ ! -z "$NEWIPV4" ] && [ ! -z "$OLDIPV4" ]; then - break; - fi -done - - -source /usr/local/vesta/data/users/$user/user.conf -arrNS=(${NS//,/ }) -OLDNS1=${arrNS[0]} -OLDNS2=${arrNS[1]} - -echo "user = $user" -echo "old ns1 = $OLDNS1" -echo "old ns2 = $OLDNS2" -echo "new ns1 = $NEWNS1" -echo "new ns2 = $NEWNS2" -echo "old ip = $OLDIPV4" -echo "new ip = $NEWIPV4" - -find /home/$user/conf/dns/ -type f -exec sed -i "s#$OLDIPV4#$NEWIPV4#g" {} \; -find /home/$user/conf/dns/ -type f -exec sed -i "s#$OLDNS1#$NEWNS1#g" {} \; -find /home/$user/conf/dns/ -type f -exec sed -i "s#$OLDNS2#$NEWNS2#g" {} \; -find /usr/local/vesta/data/users/$user/dns/ -type f -exec sed -i "s#$OLDIPV4#$NEWIPV4#g" {} \; -find /usr/local/vesta/data/users/$user/dns/ -type f -exec sed -i "s#$OLDNS1#$NEWNS1#g" {} \; -find /usr/local/vesta/data/users/$user/dns/ -type f -exec sed -i "s#$OLDNS2#$NEWNS2#g" {} \; -sed -i "s#$OLDIPV4#$NEWIPV4#g" /usr/local/vesta/data/users/$user/dns.conf -sed -i "s#$OLDNS1#$NEWNS1#g" /usr/local/vesta/data/users/$user/dns.conf -sed -i "s#$OLDNS1#$NEWNS1#g" /usr/local/vesta/data/users/$user/user.conf -sed -i "s#$OLDNS2#$NEWNS2#g" /usr/local/vesta/data/users/$user/user.conf -systemctl reload bind9 - -echo "Done!" - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-open-fs-config b/bin/v-open-fs-config index 720df86a..6a4f54fd 100755 --- a/bin/v-open-fs-config +++ b/bin/v-open-fs-config @@ -35,11 +35,6 @@ if [ ! -z "$src_file" ]; then echo "Error: invalid source path $src_file" exit 2 fi - spath=$(echo "$rpath" |egrep "/etc|/var/lib") - if [ -z "$spath" ]; then - echo "Error: invalid source path $src_file" - exit 2 - fi fi # Reading conf diff --git a/bin/v-php-func b/bin/v-php-func deleted file mode 100644 index 925cc91e..00000000 --- a/bin/v-php-func +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# info: calling myVesta PHP functions -# options: FUNCTION -# -# The function is calling myVesta or standard PHP functions directly from bash - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - - -if [ "$1" == "--stdin" ] && [ -p /dev/stdin ]; then - STDIN=$(cat -) - if [ ! -z "$STDIN" ]; then - echo "$STDIN" | php /usr/local/vesta/func/bash-to-php-interpreter.php "$@" - exit $? - fi -fi - -php /usr/local/vesta/func/bash-to-php-interpreter.php "$@" -exit $? diff --git a/bin/v-rebuild-web-domains b/bin/v-rebuild-web-domains index 2094d19c..d28a943d 100755 --- a/bin/v-rebuild-web-domains +++ b/bin/v-rebuild-web-domains @@ -37,7 +37,7 @@ is_object_unsuspended 'user' 'USER' "$user" #----------------------------------------------------------# # Deleting old web configs -sed -i "/.*\/$user\/conf\/web\//d" /etc/$WEB_SYSTEM/conf.d/vesta.conf +sed -i "/.*\/$user\//d" /etc/$WEB_SYSTEM/conf.d/vesta.conf if [ -e "$HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf" ]; then rm $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf fi @@ -47,7 +47,7 @@ fi # Deleting old proxy configs if [ ! -z "$PROXY_SYSTEM" ]; then - sed -i "/.*\/$user\/conf\/web\//d" /etc/$PROXY_SYSTEM/conf.d/vesta.conf + sed -i "/.*\/$user\//d" /etc/$PROXY_SYSTEM/conf.d/vesta.conf if [ -e "$HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf" ]; then rm $HOMEDIR/$user/conf/web/$PROXY_SYSTEM.conf diff --git a/bin/v-restart-dns b/bin/v-restart-dns index f96937a1..4e7712a7 100755 --- a/bin/v-restart-dns +++ b/bin/v-restart-dns @@ -55,10 +55,9 @@ if [ -z "$DNS_SYSTEM" ] || [ "$DNS_SYSTEM" = 'remote' ] ; then fi # Restart system -systemctl reset-failed $DNS_SYSTEM -systemctl reload $DNS_SYSTEM >/dev/null 2>&1 +service $DNS_SYSTEM reload >/dev/null 2>&1 if [ $? -ne 0 ]; then - systemctl restart $DNS_SYSTEM >/dev/null 2>&1 + service $DNS_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report check_result $E_RESTART "$DNS_SYSTEM restart failed" diff --git a/bin/v-restart-proxy b/bin/v-restart-proxy old mode 100644 new mode 100755 index ca63c16d..25ab20bf --- a/bin/v-restart-proxy +++ b/bin/v-restart-proxy @@ -49,52 +49,19 @@ if [ -z "$PROXY_SYSTEM" ] || [ "$PROXY_SYSTEM" = 'remote' ]; then exit fi -if [ -f "/usr/local/vesta/web/inc/nginx_proxy" ]; then - - # if vesta is behind default nginx, restart in background with 15 sec delay - # background restart - if [ "$1" = 'background' ]; then - # Restart system - sleep 25 - service $PROXY_SYSTEM restart >/dev/null 2>&1 - if [ $? -ne 0 ]; then - send_email_report - check_result $E_RESTART "$PROXY_SYSTEM restart failed" - fi - - # Update restart queue - if [ -e "$VESTA/data/queue/restart.pipe" ]; then - sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe - fi - - exit; - fi - - # try to reload to get changes faster - service $PROXY_SYSTEM reload - - # send to background process - nohup $BIN/v-restart-proxy 'background' &>/dev/null & - -else - - # Default behaviour - # Restart system - # service $PROXY_SYSTEM restart > /dev/null 2>&1 - systemctl reset-failed $PROXY_SYSTEM - systemctl restart $PROXY_SYSTEM > /dev/null 2>&1 - if [ $? -ne 0 ]; then - send_email_report - check_result $E_RESTART "$PROXY_SYSTEM restart failed" - fi - - # Update restart queue - if [ -e "$VESTA/data/queue/restart.pipe" ]; then - sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe - fi - +# Restart system +service $PROXY_SYSTEM restart >/dev/null 2>&1 +if [ $? -ne 0 ]; then + send_email_report + check_result $E_RESTART "$PROXY_SYSTEM restart failed" fi +# Update restart queue +if [ -e "$VESTA/data/queue/restart.pipe" ]; then + sed -i "/$SCRIPT/d" $VESTA/data/queue/restart.pipe +fi + + #----------------------------------------------------------# # Vesta # #----------------------------------------------------------# diff --git a/bin/v-restart-web b/bin/v-restart-web index 2b17ad9f..ab1afe6c 100755 --- a/bin/v-restart-web +++ b/bin/v-restart-web @@ -64,9 +64,7 @@ fi # Resart web system if reload didn't work if [ "$rc" -ne 0 ]; then - # service $WEB_SYSTEM restart >/dev/null 2>&1 - systemctl reset-failed $WEB_SYSTEM - systemctl restart $WEB_SYSTEM >/dev/null 2>&1 + service $WEB_SYSTEM restart >/dev/null 2>&1 if [ $? -ne 0 ]; then send_email_report check_result $E_RESTART "$WEB_SYSTEM restart failed" diff --git a/bin/v-restart-web-backend b/bin/v-restart-web-backend index e1d8ebe9..b18f6abc 100755 --- a/bin/v-restart-web-backend +++ b/bin/v-restart-web-backend @@ -50,7 +50,7 @@ if [ -z "$WEB_BACKEND" ] || [ "$WEB_BACKEND" = 'remote' ]; then fi # Restart system -php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d / |head -n 1) +php_fpm=$(ls /etc/init.d/php*-fpm* 2>/dev/null |cut -f 4 -d /) if [ -z "$php_fpm" ]; then service $WEB_BACKEND restart >/dev/null 2>&1 else diff --git a/bin/v-restore-user b/bin/v-restore-user index a2dab574..accad1d4 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -28,11 +28,6 @@ if [ -z "$BACKUP" ]; then BACKUP=/backup fi -# Allow to specify full path to backup file -if [[ $backup == "/backup/"* ]]; then - backup="${backup:8}" -fi - # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh @@ -41,10 +36,6 @@ source $VESTA/func/db.sh source $VESTA/func/rebuild.sh source $VESTA/conf/vesta.conf -if [ ! -z "$OVERRIDE_BACKUP_PATH" ]; then - BACKUP=$OVERRIDE_BACKUP_PATH -fi - # Check backup ownership function is_backup_available() { passed=false @@ -238,12 +229,8 @@ while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do (( ++i)) done -if [ -z "$BACKUP_TEMP" ]; then - BACKUP_TEMP=$BACKUP -fi - # Creating temporary directory -tmpdir=$(mktemp -p $BACKUP_TEMP -d) +tmpdir=$(mktemp -p /tmp -d) if [ "$?" -ne 0 ]; then echo "Can't create tmp dir $tmpdir" |$SENDMAIL -s "$subj" $email $notify sed -i "/ $user /d" $VESTA/data/queue/backup.pipe @@ -298,7 +285,7 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then if [ -z "$web" ] || [ "$web" = '*' ]; then domains="$backup_domains" else - echo "$web" | tr ',' '\n' | sed -e "s/^/^/" > $tmpdir/selected.txt + echo "$web" |tr ',' '\n' > $tmpdir/selected.txt domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt) fi @@ -386,10 +373,8 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then # Copying ssl certificates if [ "$SSL" = 'yes' ]; then - certificates=$(ls $tmpdir/web/$domain/conf| grep ssl) - certificates=$(echo "$certificates" |grep $domain) - for crt in $certificates; do - crt=$(echo $crt|sed -e "s/ssl.//") + for crt in $(ls $tmpdir/web/$domain/conf |grep ssl); do + crt=$(echo "$crt" |sed "s/ssl.//") cp -f $tmpdir/web/$domain/conf/ssl.$crt $USER_DATA/ssl/$crt done fi @@ -415,22 +400,15 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then fi # Restoring web domain data - chown $user $tmpdir - chmod u+w $HOMEDIR/$user/web/$domain - chmod 0755 $tmpdir/web/$domain - sudo -u $user tar -xzpf $tmpdir/web/$domain/domain_data.tar.gz \ - -C $HOMEDIR/$user/web/$domain/ --exclude=./logs/* \ - 2> $HOMEDIR/$user/web/$domain/restore_errors.log - if [ -e "$HOMEDIR/$user/web/$domain/restore_errors.log" ]; then - chown $user:$user $HOMEDIR/$user/web/$domain/restore_errors.log + tar -xzpf $tmpdir/web/$domain/domain_data.tar.gz \ + -C $HOMEDIR/$user/web/$domain/ + if [ "$?" -ne 0 ]; then + rm -rf $tmpdir + error="can't unpack $domain data tarball" + echo "$error" |$SENDMAIL -s "$subj" $email $notify + sed -i "/ $user /d" $VESTA/data/queue/backup.pipe + check_result "$E_PARSING" "$error" fi - #if [ "$?" -ne 0 ]; then - # rm -rf $tmpdir - # error="can't unpack $domain data tarball" - # echo "$error" |$SENDMAIL -s "$subj" $email $notify - # sed -i "/ $user /d" $VESTA/data/queue/backup.pipe - # check_result "$E_PARSING" "$error" - #fi # Applying Fix for tar < 1.24 find $HOMEDIR/$user/web/$domain -type d \ @@ -441,15 +419,6 @@ if [ "$web" != 'no' ] && [ ! -z "$WEB_SYSTEM" ]; then find $HOMEDIR/$user/web/$domain/ -user $old_uid \ -exec chown -h $user:$user {} \; fi - - # Restoring php-fpm pool.d conf files - if [ -d "$tmpdir/web/$domain/php" ]; then - fpmver=$(ls $tmpdir/web/$domain/php/) - cp -r $tmpdir/web/$domain/php/$fpmver/ /etc/php/ - systemctl reset-failed php$fpmver-fpm - systemctl restart php$fpmver-fpm - fi - done # Adding user to traff queue @@ -477,7 +446,7 @@ if [ "$dns" != 'no' ] && [ ! -z "$DNS_SYSTEM" ]; then if [ -z "$dns" ] || [ "$dns" = '*' ]; then domains="$backup_domains" else - echo "$dns" | tr ',' '\n' | sed -e "s/^/^/" > $tmpdir/selected.txt + echo "$dns" |tr ',' '\n' > $tmpdir/selected.txt domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt) fi @@ -557,7 +526,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then if [ -z "$mail" ] || [ "$mail" = '*' ]; then domains="$backup_domains" else - echo "$mail" | tr ',' '\n' | sed -e "s/^/^/" > $tmpdir/selected.txt + echo "$mail" |tr ',' '\n' > $tmpdir/selected.txt domains=$(echo "$backup_domains" |egrep -f $tmpdir/selected.txt) fi @@ -611,16 +580,13 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then # Rebuilding mail config rebuild_mail_domain_conf - + domain_idn=$domain format_domain_idn # Restoring emails if [ -e "$tmpdir/mail/$domain/accounts.tar.gz" ]; then - chown $user $tmpdir - chmod u+w $HOMEDIR/$user/mail/$domain_idn - chmod 0755 $tmpdir/mail/$domain - sudo -u $user tar -xzpf $tmpdir/mail/$domain/accounts.tar.gz \ + tar -xzpf $tmpdir/mail/$domain/accounts.tar.gz \ -C $HOMEDIR/$user/mail/$domain_idn/ if [ "$?" -ne 0 ]; then rm -rf $tmpdir @@ -655,7 +621,7 @@ if [ "$db" != 'no' ] && [ ! -z "$DB_SYSTEM" ]; then if [ -z "$db" ] || [ "$db" = '*' ]; then databases="$backup_databases" else - echo "$db" |tr ',' '\n' | sed -e "s/$/$/" > $tmpdir/selected.txt + echo "$db" |tr ',' '\n' > $tmpdir/selected.txt databases=$(echo "$backup_databases" |egrep -f $tmpdir/selected.txt) fi @@ -783,11 +749,6 @@ if [ "$udir" != 'no' ]; then fi fi -# Create tmp/ -mkdir -p $HOMEDIR/$user/tmp -chmod 700 $HOMEDIR/$user/tmp -chown -R $user:$user $HOMEDIR/$user/tmp - # Sending mail notification subj="$user → restore has been completed" cat $tmpdir/restore.log |$SENDMAIL -s "$subj" $email $notify diff --git a/bin/v-run-wp-cli b/bin/v-run-wp-cli deleted file mode 100644 index b1e4e6aa..00000000 --- a/bin/v-run-wp-cli +++ /dev/null @@ -1,146 +0,0 @@ -#!/bin/bash -# info: Run WP CLI command for a specific domain -# options: DOMAIN WP_CLI_COMMAND - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -SILENT_MODE=1 - -# Argument definition -domain=$1 -wp_command=${@:2} - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/domain.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -VERBOSE_MODE=1 - -check_args '2' "$#" 'DOMAIN WP_CLI_COMMAND' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" -is_object_unsuspended 'web' 'DOMAIN' "$domain" - -if [ ! -d "/home/$user" ]; then - echo "= User doesn't exist"; - exit 1; -fi - -if [[ "$wp_command" != core\ download* ]] && [[ "$wp_command" != core\ config* ]] && [ ! -f "/home/$user/web/$domain/public_html/wp-config.php" ]; then - echo '= Please install WordPress first.' - exit 1; -fi - -wpcli="" - -if [ ! -f "/usr/local/bin/wp" ]; then - echo "= WP CLI is not installed. Installing..." - /usr/local/vesta/bin/v-install-wp-cli -fi - -if [ -z "$USE_WP_CLI_MYVESTA" ]; then - if [ -f "/usr/local/bin/wp" ]; then - # Get current time and file ctime in seconds since epoch - current_time=$(date +%s) - file_ctime=$(stat -c %Z /usr/local/bin/wp) - # Calculate age in days - age_days=$(( (current_time - file_ctime) / 86400 )) - if [ "$age_days" -gt 30 ]; then - echo "= The /usr/local/bin/wp file is older than 30 days (based on CTime)." - echo "= Updating WP CLI..." - /usr/local/vesta/bin/v-install-wp-cli - fi - fi -fi - -if [ -t 1 ]; then - output='terminal' -else - output='file' -fi - -if [ -f "/usr/local/bin/wp" ]; then - wpcli="/usr/local/bin/wp" - WP_CLI_PACKAGES_DIR="" -fi - -if [ ! -z "$USE_WP_CLI_MYVESTA" ] && [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ] && [ -d "/usr/local/bin/wp-cli/packages/vendor/wp-cli/search-replace-command" ] && [ "$output" == "terminal" ]; then - wpcli="/usr/local/bin/wp-cli/php/boot-fs.php" - COLUMNS=$(/usr/bin/env stty size 2>/dev/null | awk '{print $2}') - echo $COLUMNS > /usr/local/bin/wp-cli/COLUMNS - WP_CLI_PACKAGES_DIR="WP_CLI_PACKAGES_DIR=/usr/local/bin/wp-cli/packages" -fi - -if [ -z "$wpcli" ]; then - echo "= WP CLI is not installed. Please install it manually." - exit 1; -fi - -mkdir -p /home/$user/.wp-cli -chown $user:$user /home/$user/.wp-cli - -if [ -z "$PHP" ]; then - phpver=$(/usr/local/vesta/bin/v-get-php-version-of-domain "$domain") -else - phpver=$PHP -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -cd /home/$USER/web/$domain/public_html - -if [ -z "$OPEN_BASEDIR" ]; then - OPEN_BASEDIR="/home/$user/web/$domain:/home/$user/.wp-cli:/home/$user/tmp:/usr/local/bin:/tmp" -fi - -if [ -z "$DISABLE_FUNCTIONS" ]; then - DISABLE_FUNCTIONS="pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,exec,system,passthru,shell_exec,proc_open,popen" -fi - -if [ -z "$SHOW_ERRORS" ]; then - sudo -u $USER $WP_CLI_PACKAGES_DIR /usr/bin/php$phpver -d disable_functions=$DISABLE_FUNCTIONS -d open_basedir=$OPEN_BASEDIR $wpcli --path=/home/$user/web/$domain/public_html/ $wp_command 2>/home/$user/web/$domain/wp-cli-error.log -else - sudo -u $USER $WP_CLI_PACKAGES_DIR /usr/bin/php$phpver -d disable_functions=$DISABLE_FUNCTIONS -d open_basedir=$OPEN_BASEDIR $wpcli --path=/home/$user/web/$domain/public_html/ $wp_command -fi - -return_code=$? - -if [ -f "/usr/local/bin/wp-cli/COLUMNS" ]; then - rm /usr/local/bin/wp-cli/COLUMNS -fi - -if [ -z "$SHOW_ERRORS" ]; then - if grep -q "PHP Fatal error" /home/$user/web/$domain/wp-cli-error.log || [ $return_code -ne 0 ]; then - cat /home/$user/web/$domain/wp-cli-error.log - fi -fi -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit $return_code; diff --git a/bin/v-run-wp-cli-myvesta b/bin/v-run-wp-cli-myvesta deleted file mode 100644 index 5947edfa..00000000 --- a/bin/v-run-wp-cli-myvesta +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -if [ ! -f "/usr/local/bin/wp-cli/php/boot-fs.php" ]; then - echo "= myVesta WP CLI is not installed. Installing..." - /usr/local/vesta/bin/v-install-wp-cli-myvesta -fi - -if [ -f "/usr/local/bin/wp-cli/php/boot-fs.php" ]; then - # Get current time and file ctime in seconds since epoch - current_time=$(date +%s) - file_ctime=$(stat -c %Z /usr/local/bin/wp-cli/php/boot-fs.php) - # Calculate age in days - age_days=$(( (current_time - file_ctime) / 86400 )) - if [ "$age_days" -gt 30 ]; then - echo "= The /usr/local/bin/wp-cli/php/boot-fs.php file is older than 30 days (based on CTime)." - echo "= Updating myVesta WP CLI..." - /usr/local/vesta/bin/v-install-wp-cli-myvesta - fi -fi - -USE_WP_CLI_MYVESTA=1 /usr/local/vesta/bin/v-run-wp-cli "$@" diff --git a/bin/v-schedule-user-backup b/bin/v-schedule-user-backup index da8dd62b..dcbcedb6 100755 --- a/bin/v-schedule-user-backup +++ b/bin/v-schedule-user-backup @@ -35,7 +35,7 @@ is_backup_scheduled 'backup' # Adding backup task to the queue log=$VESTA/log/backup.log -echo "nice -n 19 ionice -c 3 $BIN/v-backup-user $user yes >> $log 2>&1" >>\ +echo "$BIN/v-backup-user $user yes >> $log 2>&1" >>\ $VESTA/data/queue/backup.pipe diff --git a/bin/v-schedule-user-restore b/bin/v-schedule-user-restore index 2da94b01..031b024e 100755 --- a/bin/v-schedule-user-restore +++ b/bin/v-schedule-user-restore @@ -43,7 +43,7 @@ is_backup_scheduled 'restore' # Adding restore task to the queue log=$VESTA/log/restore.log options="'$web' '$dns' '$mail' '$db' '$cron' '$udir'" -echo "nice -n 19 ionice -c 3 $BIN/v-restore-user $user $backup $options yes >> $log 2>&1" >>\ +echo "$BIN/v-restore-user $user $backup $options yes >> $log 2>&1" >>\ $VESTA/data/queue/backup.pipe diff --git a/bin/v-search-domain-owner b/bin/v-search-domain-owner index f807ebd2..5b88f495 100755 --- a/bin/v-search-domain-owner +++ b/bin/v-search-domain-owner @@ -9,8 +9,6 @@ # Variable&Function # #----------------------------------------------------------# -SILENT_MODE=1 - # Argument definition domain=$(idn -t --quiet -u "$1" ) type=${2-any} diff --git a/bin/v-search-ssl-certificates b/bin/v-search-ssl-certificates deleted file mode 100755 index c9208830..00000000 --- a/bin/v-search-ssl-certificates +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# info: search ssl certificates -# options: [FORMAT] -# -# The function to obtain the list of available ssl certificates. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Argument definition -format=${1-shell} - -# Includes -source $VESTA/func/main.sh - -# JSON list function -json_list() { - IFS=$'\n' - objects=$(echo "$search_cmd" |wc -l) - i=1 - echo '[' - for str in $search_cmd; do - eval $str - if [ "$i" -lt "$objects" ]; then - echo -e "\t\"$USER:$DOMAIN\"," - else - echo -e "\t\"$USER:$DOMAIN\"" - fi - (( ++i)) - done - echo "]" -} - -# SHELL list function -shell_list() { - IFS=$'\n' - echo "USER DOMAIN" - echo "---- ------" - for str in $search_cmd; do - eval $str - echo "$USER $DOMAIN" - done -} - -# PLAIN list function -plain_list() { - IFS=$'\n' - for str in $search_cmd; do - eval $str - echo -e "$USER\t$DOMAIN" - done -} - -# CSV list function -csv_list() { - IFS=$'\n' - echo "USER,DOMAIN" - for str in $search_cmd; do - eval $str - echo "$USER,$DOMAIN" - done -} - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -search_cmd=$(grep -H "SSL='yes'" $VESTA/data/users/*/web.conf |\ - cut -f 1 -d ' ' |\ - sed -e "s|$VESTA/data/users/|USER='|" -e "s|/web.conf:|' |") - -# Listing data -case $format in - json) json_list ;; - plain) plain_list ;; - csv) csv_list ;; - shell) shell_list |column -t ;; -esac - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -exit diff --git a/bin/v-sed b/bin/v-sed deleted file mode 100644 index 16e8ad2b..00000000 --- a/bin/v-sed +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# info: calling myvesta_sed PHP function -# options: PARAMETERS -# -# The function is calling myVesta PHP replacement for GNU 'sed' command (but without regular expression) - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - - -if [ "$1" == "--stdin" ] && [ -p /dev/stdin ]; then - STDIN=$(cat -) - if [ ! -z "$STDIN" ]; then - shift; - echo "$STDIN" | php /usr/local/vesta/func/bash-to-php-interpreter.php '--stdin' 'myvesta_sed' "$@" - exit $? - fi -fi - -if [ "$1" == "--stdin" ]; then - shift; - php /usr/local/vesta/func/bash-to-php-interpreter.php '--stdin' 'myvesta_sed' "$@" -else - php /usr/local/vesta/func/bash-to-php-interpreter.php 'myvesta_sed' "$@" -fi -exit $? diff --git a/bin/v-sign-letsencrypt-csr b/bin/v-sign-letsencrypt-csr new file mode 100755 index 00000000..414eb8b3 --- /dev/null +++ b/bin/v-sign-letsencrypt-csr @@ -0,0 +1,110 @@ +#!/bin/bash +# info: sing letsencrypt csr +# options: USER DOMAIN CSR_DIR [FORMAT] +# +# The function signs certificate request using LetsEncript API + + +#----------------------------------------------------------# +# Variable&Function # +#----------------------------------------------------------# + +# Argument definition +user=$1 +domain=$2 +csr="$3/$domain.csr" +format=$4 + +# Includes +source $VESTA/func/main.sh +source $VESTA/conf/vesta.conf + +# encode base64 +encode_base64() { + cat |base64 |tr '+/' '-_' |tr -d '\r\n=' +} + + +#----------------------------------------------------------# +# Verifications # +#----------------------------------------------------------# + +check_args '3' "$#" 'USER DOMAIN CSR' +is_format_valid 'user' 'domain' +is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM' +is_object_valid 'user' 'USER' "$user" +is_object_unsuspended 'user' 'USER' "$user" +if [ ! -e "$USER_DATA/ssl/le.conf" ]; then + check_result $E_NOTEXIST "LetsEncrypt key doesn't exist" +fi +check_domain=$(grep -w "$domain'" $USER_DATA/web.conf) +if [ -z "$check_domain" ]; then + check_result $E_NOTEXIST "domain $domain doesn't exist" +fi +if [ ! -e "$csr" ]; then + check_result $E_NOTEXIST "$csr doesn't exist" +fi + + +#----------------------------------------------------------# +# Action # +#----------------------------------------------------------# + +source $USER_DATA/ssl/le.conf +api='https://acme-v01.api.letsencrypt.org' +key="$USER_DATA/ssl/user.key" +exponent="$EXPONENT" +modulus="$MODULUS" +thumb="$THUMB" + +# Defining JWK header +header='{"e":"'$exponent'","kty":"RSA","n":"'"$modulus"'"}' +header='{"alg":"RS256","jwk":'"$header"'}' + +# Requesting nonce +nonce=$(curl -s -I "$api/directory" |grep Nonce |cut -f2 -d \ |tr -d '\r\n') +protected=$(echo -n '{"nonce":"'"$nonce"'"}' |encode_base64) + +# Defining ACME query (request challenge) +csr=$(openssl req -in $csr -outform DER |encode_base64) +query='{"resource":"new-cert","csr":"'$csr'"}' +payload=$(echo -n "$query" |encode_base64) +signature=$(printf "%s" "$protected.$payload" |\ + openssl dgst -sha256 -binary -sign "$key" |encode_base64) +data='{"header":'"$header"',"protected":"'"$protected"'",' +data=$data'"payload":"'"$payload"'","signature":"'"$signature"'"}' + +# Sending request to LetsEncrypt API +answer=$(mktemp) +curl -s -d "$data" "$api/acme/new-cert" -o $answer +if [ ! -z "$(grep Error $answer)" ]; then + detail="$(cat $answer |tr ',' '\n' |grep detail |cut -f 4 -d \")" + detail=$(echo "$detail" |awk -F "::" '{print $2}') + rm $answer + check_result $E_LIMIT "$detail" +fi + +# Printing certificate +crt=$(cat "$answer" |openssl base64 -e) +rm $answer +if [ "$format" != 'json' ]; then + echo "-----BEGIN CERTIFICATE-----" + echo "$crt" + echo "-----END CERTIFICATE-----" +else + echo -e "{\n\t\"$domain\": {\n\t\t\"CRT\":\"" + echo -n '-----BEGIN CERTIFICATE-----\n' + echo -n "$crt" |sed ':a;N;$!ba;s/\n/\\n/g' + echo -n '-----END CERTIFICATE-----' + echo -e "\"\n\t\t}\n\t}" +fi + + +#----------------------------------------------------------# +# Vesta # +#----------------------------------------------------------# + +# Logging +log_event "$OK" "$ARGUMENTS" + +exit diff --git a/bin/v-stop-firewall b/bin/v-stop-firewall index 2cd653a6..4087190d 100755 --- a/bin/v-stop-firewall +++ b/bin/v-stop-firewall @@ -56,7 +56,7 @@ bash $tmp 2>/dev/null rm -f $tmp # Saving rules to the master iptables file -if [ -d "/etc/sysconfig" ]; then +if [ -e "/etc/redhat-release" ]; then /sbin/iptables-save > /etc/sysconfig/iptables if [ -z "$(ls /etc/rc3.d/S*iptables 2>/dev/null)" ]; then /sbin/chkconfig iptables off diff --git a/bin/v-suspend-dns-domain b/bin/v-suspend-dns-domain index bfe30f0b..b42e2e99 100755 --- a/bin/v-suspend-dns-domain +++ b/bin/v-suspend-dns-domain @@ -41,16 +41,6 @@ is_object_unsuspended 'dns' 'DOMAIN' "$domain" # Action # #----------------------------------------------------------# -# Deleting system configs -if [[ "$DNS_SYSTEM" =~ named|bind ]]; then - if [ -e '/etc/named.conf' ]; then - dns_conf='/etc/named.conf' - else - dns_conf='/etc/bind/named.conf' - fi - - sed -i "/\/$user\/conf\/dns\/$domain.db\"/d" $dns_conf -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-suspend-firewall-rule b/bin/v-suspend-firewall-rule index 9191fed0..67f14cec 100755 --- a/bin/v-suspend-firewall-rule +++ b/bin/v-suspend-firewall-rule @@ -32,21 +32,12 @@ is_object_unsuspended '../../data/firewall/rules' 'RULE' "$rule" # Action # #----------------------------------------------------------# -oldvalues=$(grep "RULE='$rule'" $VESTA/data/firewall/rules.conf) - # Suspending rule update_object_value ../../data/firewall/rules RULE $rule '$SUSPENDED' yes # Updating system firewall $BIN/v-update-firewall -if [ "$WEB_SYSTEM" == 'nginx' ] || [ "$PROXY_SYSTEM" == 'nginx' ]; then - parse_object_kv_list_non_eval "$oldvalues" - if [ "$PORT" == "80,443" ] && [ "$ACTION" == "DROP" ]; then - sed -i "\#$IP#d" /etc/nginx/conf.d/block-firewall.conf - systemctl restart nginx - fi -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-suspend-web-domain b/bin/v-suspend-web-domain index c9120122..7bd658ce 100755 --- a/bin/v-suspend-web-domain +++ b/bin/v-suspend-web-domain @@ -17,10 +17,6 @@ domain=$2 domain_idn=$2 restart=$3 -if [ -z "$restart" ]; then - restart='yes' -fi - # Includes source $VESTA/func/main.sh source $VESTA/func/domain.sh @@ -84,14 +80,12 @@ fi update_object_value 'web' 'DOMAIN' "$domain" '$SUSPENDED' 'yes' increase_user_value "$user" '$SUSPENDED_WEB' -if [ "$restart" = "yes" ]; then - # Restarting web server - $BIN/v-restart-web $restart - check_result $? "Web restart failed" >/dev/null - - $BIN/v-restart-proxy $restart - check_result $? "Proxy restart failed" >/dev/null -fi +# Restarting web server +$BIN/v-restart-web $restart +check_result $? "Web restart failed" >/dev/null + +$BIN/v-restart-proxy $restart +check_result $? "Proxy restart failed" >/dev/null # Logging log_event "$OK" "$ARGUMENTS" diff --git a/bin/v-unlock-wordpress b/bin/v-unlock-wordpress deleted file mode 100644 index 4a2c42c3..00000000 --- a/bin/v-unlock-wordpress +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash -# info: Unlock previously locked WordPress files if they were potentially infected (somewhere) by PHP malware -# options: DOMAIN - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Argument definition -domain=$1 - -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -USER=$user - -# Includes -source /usr/local/vesta/func/main.sh - -if [ -z "$user" ]; then - check_result $E_NOTEXIST "domain $domain doesn't exist" -fi - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -check_args '1' "$#" 'DOMAIN' -is_format_valid 'domain' -is_object_valid 'user' 'USER' "$user" -is_object_unsuspended 'user' 'USER' "$user" - -if [ ! -d "/home/$user" ]; then - echo "User doesn't exist"; - exit 1; -fi - -if [ ! -d "/home/$user/web/$domain/public_html" ]; then - echo "Domain doesn't exist"; - exit 1; -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -cd /home/$user/web/$domain - -# lock files -chown -R $user:$user public_html/ - -rm public_html/wp-content/uploads/.htaccess - -/usr/local/vesta/bin/v-fix-website-permissions $domain - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -echo "v-unlock-wordpress: Done." - -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-unsuspend-dns-domain b/bin/v-unsuspend-dns-domain index 38008d2f..bc8de6ee 100755 --- a/bin/v-unsuspend-dns-domain +++ b/bin/v-unsuspend-dns-domain @@ -40,21 +40,7 @@ is_object_suspended 'dns' 'DOMAIN' "$domain" # Action # #----------------------------------------------------------# -# Creating system configs -if [[ "$DNS_SYSTEM" =~ named|bind ]]; then - if [ -e '/etc/named.conf' ]; then - dns_conf='/etc/named.conf' - dns_group='named' - else - dns_conf='/etc/bind/named.conf' - dns_group='bind' - fi - # Adding zone in named.conf - named="zone \"$domain_idn\" {type master; file" - named="$named \"$HOMEDIR/$user/conf/dns/$domain.db\";};" - echo "$named" >> $dns_conf -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-unsuspend-firewall-rule b/bin/v-unsuspend-firewall-rule index f0e00c96..be6320d4 100755 --- a/bin/v-unsuspend-firewall-rule +++ b/bin/v-unsuspend-firewall-rule @@ -32,25 +32,12 @@ is_object_suspended '../../data/firewall/rules' 'RULE' "$rule" # Action # #----------------------------------------------------------# -oldvalues=$(grep "RULE='$rule'" $VESTA/data/firewall/rules.conf) - # Suspending rule update_object_value ../../data/firewall/rules RULE $rule '$SUSPENDED' no # Updating system firewall $BIN/v-update-firewall -if [ "$WEB_SYSTEM" == 'nginx' ] || [ "$PROXY_SYSTEM" == 'nginx' ]; then - parse_object_kv_list_non_eval "$oldvalues" - if [ "$PORT" == "80,443" ] && [ "$ACTION" == "DROP" ]; then - touch /etc/nginx/conf.d/block-firewall.conf - if ! grep -q "deny $IP;" /etc/nginx/conf.d/block-firewall.conf; then - echo "deny $IP;" >> /etc/nginx/conf.d/block-firewall.conf - systemctl restart nginx - fi - fi -fi - #----------------------------------------------------------# # Vesta # diff --git a/bin/v-unsuspend-mail-account b/bin/v-unsuspend-mail-account index 57e54af5..314c13bc 100755 --- a/bin/v-unsuspend-mail-account +++ b/bin/v-unsuspend-mail-account @@ -48,9 +48,6 @@ is_object_suspended "mail/$domain" 'ACCOUNT' "$account" if [[ "$MAIL_SYSTEM" =~ exim ]]; then md5=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$MD5') quota=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$QUOTA') - if [ "$quota" = 'unlimited' ]; then - quota=0 - fi sed -i "/^$account:/d" $HOMEDIR/$user/conf/mail/$domain/passwd str="$account:$md5:$user:mail::$HOMEDIR/$user:$quota" echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd diff --git a/bin/v-update-dns-templates b/bin/v-update-dns-templates index 8b128a3d..31361d00 100755 --- a/bin/v-update-dns-templates +++ b/bin/v-update-dns-templates @@ -25,7 +25,7 @@ source $VESTA/conf/vesta.conf tmpdir=$(mktemp -d --dry-run) mkdir $tmpdir cd $tmpdir -wget https://c.myvestacp.com/debian/10/templates.tar.gz -q +wget http://c.vestacp.com/rhel/7/templates.tar.gz -q if [ "$?" -ne 0 ]; then echo "Error: can't download template.tar.gz" log_event "$E_CONNECT" "$ARGUMENTS" diff --git a/bin/v-update-document-errors-files b/bin/v-update-document-errors-files deleted file mode 100644 index c044a80a..00000000 --- a/bin/v-update-document-errors-files +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# info: fix website permissions for all websites -# options: -# -# The command is used for fixing website permissions for all websites on the server. - - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -# Importing system variables -source /etc/profile - -# Includes -source $VESTA/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then - continue; - fi - - for domain in $(/usr/local/vesta/bin/v-list-web-domains $user plain |cut -f 1); do - cp /usr/local/vesta/data/templates/web/skel/document_errors/403.html /home/$user/web/$domain/document_errors/403.html - cp /usr/local/vesta/data/templates/web/skel/document_errors/404.html /home/$user/web/$domain/document_errors/404.html - cp /usr/local/vesta/data/templates/web/skel/document_errors/50x.html /home/$user/web/$domain/document_errors/50x.html - sed -i "s/%domain%/$domain/g" /home/$user/web/$domain/document_errors/403.html - sed -i "s/%domain%/$domain/g" /home/$user/web/$domain/document_errors/404.html - sed -i "s/%domain%/$domain/g" /home/$user/web/$domain/document_errors/50x.html - chown $user:$user /home/$user/web/$domain/document_errors/* - chmod 644 /home/$user/web/$domain/document_errors/* - done - -done - - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -# Logging -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-update-firewall b/bin/v-update-firewall index 6d359f07..ccea7f3f 100755 --- a/bin/v-update-firewall +++ b/bin/v-update-firewall @@ -51,9 +51,7 @@ if [ $? -ne 0 ]; then conntrack_ftp='no' fi - -# Checking custom OpenSSH port -# Taken from HestiaCP +# Checking custom OpenSSH port sshport=$(grep '^Port ' /etc/ssh/sshd_config | head -1 | cut -d ' ' -f 2) if [[ "$sshport" =~ ^[0-9]+$ ]] && [ "$sshport" -ne "22" ]; then sed -i "s/PORT='22'/PORT=\'$sshport\'/" $rules @@ -67,7 +65,7 @@ echo "$iptables -P INPUT ACCEPT" >> $tmp echo "$iptables -F INPUT" >> $tmp # Enabling stateful support -if [ "$FIREWALL_STATEFUL" == "yes" ] || [ "$conntrack" != 'no' ] || grep --quiet container=lxc /proc/1/environ; then +if [ "$conntrack" != 'no' ]; then str="$iptables -A INPUT -m state" str="$str --state ESTABLISHED,RELATED -j ACCEPT" echo "$str" >> $tmp @@ -79,11 +77,6 @@ for ip in $(ls $VESTA/data/ips); do done echo "$iptables -A INPUT -s 127.0.0.1 -j ACCEPT" >> $tmp -# Triger for custom iptables commands -if [ -x "/root/update_firewall_custom.sh" ]; then - /root/update_firewall_custom.sh "$tmp" "1" -fi - # Pasring iptables rules IFS=$'\n' for line in $(sort -r -n -k 2 -t \' $rules); do @@ -164,12 +157,12 @@ if [ ! -z "$FIREWALL_EXTENSION" ]; then fi # Saving rules to the master iptables file -# if [ -d "/etc/sysconfig" ]; then -# /sbin/iptables-save > /etc/sysconfig/iptables -# if [ -z "$(ls /etc/rc3.d/S*iptables 2>/dev/null)" ]; then -# /sbin/chkconfig iptables on -# fi -# else +if [ -e "/etc/redhat-release" ]; then + /sbin/iptables-save > /etc/sysconfig/iptables + if [ -z "$(ls /etc/rc3.d/S*iptables 2>/dev/null)" ]; then + /sbin/chkconfig iptables on + fi +else /sbin/iptables-save > /etc/iptables.rules preup="/etc/network/if-pre-up.d/iptables" if [ ! -e "$preup" ]; then @@ -178,7 +171,7 @@ fi echo "exit 0" >> $preup chmod +x $preup fi -# fi +fi # Worarkound for OpenVZ if [ -e "/proc/vz/veinfo" ]; then diff --git a/bin/v-update-host-certificate b/bin/v-update-host-certificate index 9da49aca..0f3324b9 100755 --- a/bin/v-update-host-certificate +++ b/bin/v-update-host-certificate @@ -11,11 +11,12 @@ #----------------------------------------------------------# whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 +if [ "$whoami" != "root" ] && [ "$whoami" != "admin" ] ; then + echo "You must be root or admin to execute this script"; + exit 1; fi + # Argument definition user=$1 hostname=$2 @@ -71,16 +72,11 @@ chown $exim_user:mail $VESTA/ssl/certificate.crt chown $exim_user:mail $VESTA/ssl/certificate.key # Restart exim, dovecot & vesta -$BIN/v-restart-mail -if [ ! -z "$IMAP_SYSTEM" ]; then - $BIN/v-restart-service "$IMAP_SYSTEM" -fi -if [ ! -z "$FTP_SYSTEM" ]; then - $BIN/v-restart-service "$FTP_SYSTEM" -fi -if [ -f "/var/run/vesta-nginx.pid" ]; then - kill -HUP $(cat /var/run/vesta-nginx.pid) -fi +v-restart-mail +v-restart-service dovecot +v-restart-service vesta + + #----------------------------------------------------------# # Vesta # diff --git a/bin/v-update-letsencrypt-ssl b/bin/v-update-letsencrypt-ssl index 819e9846..93fe9023 100755 --- a/bin/v-update-letsencrypt-ssl +++ b/bin/v-update-letsencrypt-ssl @@ -22,69 +22,42 @@ source $VESTA/conf/vesta.conf # Action # #----------------------------------------------------------# -lecounter=0 -hostname=$(hostname) +# Defining user list +users=$($BIN/v-list-users | tail -n+3 | awk '{ print $1 }') -echo "[$(date)] : -----------------------------------------------------------------------------------" >> /usr/local/vesta/log/letsencrypt_cron.log - -# Checking user certificates -for user in $($BIN/v-list-users plain |cut -f 1); do +# Checking users +for user in $users; do USER_DATA=$VESTA/data/users/$user - + # Checking user certificates for domain in $(search_objects 'web' 'LETSENCRYPT' 'yes' 'DOMAIN'); do - - limit_check=1 - fail_counter=$(get_web_counter "$user" "$domain" 'LETSENCRYPT_FAIL_COUNT') - # proxy_tpl=$(/usr/local/vesta/bin/v-list-web-domain "$user" "$domain" "shell" | grep 'PROXY:' | cut -d ' ' -f11-) - # if [ "$proxy_tpl" = "forward" ]; then - # echo "[$(date)] : $domain is using forward proxy, skipping" >> /usr/local/vesta/log/letsencrypt_cron.log - # continue; - # fi - - if [[ "$hostname" = "$domain" ]]; then - if [[ "$fail_counter" -eq 7 ]]; then - limit_check=0 - fi - if [[ "$fail_counter" -eq 8 ]]; then - fail_counter=$(alter_web_counter "$user" "$domain" 'LETSENCRYPT_FAIL_COUNT') - send_email_to_admin "LetsEncrypt renewing hostname $hostname" "Warning: hostname $domain failed for LetsEncrypt renewing" - fi - fi - - if [[ "$fail_counter" -ge 7 ]] && [[ "$limit_check" -eq 1 ]]; then - # echo "$domain failed $fail_counter times for LetsEncrypt renewing, skipping" - echo "[$(date)] : $domain failed $fail_counter times for LetsEncrypt renewing, skipping" >> /usr/local/vesta/log/letsencrypt_cron.log - continue; - fi - crt_data=$(openssl x509 -text -in $USER_DATA/ssl/$domain.crt) - not_after=$(echo "$crt_data" |grep "Not After" |cut -f 2,3,4 -d :) - expiration=$(date -d "$not_after" +%s) + crt="$VESTA/data/users/$user/ssl/$domain.crt" + crt_data=$(openssl x509 -text -in "$crt") + expire=$(echo "$crt_data" |grep "Not After") + expire=$(echo "$expire" |cut -f 2,3,4 -d :) + expire=$(date -d "$expire" +%s) now=$(date +%s) - seconds_valid=$((expiration - now)) - days_valid=$((seconds_valid / 86400)) - if [[ "$days_valid" -lt 31 ]]; then - if [ $lecounter -gt 0 ]; then - sleep 120 - fi - ((lecounter++)) + expire=$((expire - now)) + expire=$((expire / 86400)) + domain=$(basename $crt |sed -e "s/.crt$//") + if [[ "$expire" -lt 31 ]]; then aliases=$(echo "$crt_data" |grep DNS:) - aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//g") + aliases=$(echo "$aliases" |sed -e "s/DNS://g" -e "s/,//") aliases=$(echo "$aliases" |tr ' ' '\n' |sed "/^$/d") - aliases=$(echo "$aliases" |egrep -v "^$domain,?$") - aliases=$(echo "$aliases" |sed -e ':a;N;$!ba;s/\n/,/g') - msg=$($BIN/v-add-letsencrypt-domain $user $domain $aliases) - if [ $? -ne 0 ]; then - if [[ $msg == *"is suspended" ]]; then - echo "[$(date)] : SUSPENDED: $domain $msg" >> /usr/local/vesta/log/letsencrypt_cron.log - else - echo "[$(date)] : $domain $msg" >> /usr/local/vesta/log/letsencrypt_cron.log + aliases=$(echo "$aliases" |grep -v "^$domain$") + if [ ! -z "$aliases" ]; then + aliases=$(echo "$aliases" |sed -e ':a;N;$!ba;s/\n/,/g') + msg=$($BIN/v-add-letsencrypt-domain $user $domain $aliases) + if [ $? -ne 0 ]; then + echo "$domain $msg" + fi + else + msg==$($BIN/v-add-letsencrypt-domain $user $domain) + if [ $? -ne 0 ]; then echo "$domain $msg" - fail_counter=$(alter_web_counter "$user" "$domain" 'LETSENCRYPT_FAIL_COUNT') - echo "[$(date)] : fail_counter = $fail_counter" >> /usr/local/vesta/log/letsencrypt_cron.log - echo "fail_counter = $fail_counter" fi fi + sleep 10 fi done done diff --git a/bin/v-update-mail-domain-disk b/bin/v-update-mail-domain-disk index be5502e7..451dbd37 100755 --- a/bin/v-update-mail-domain-disk +++ b/bin/v-update-mail-domain-disk @@ -49,8 +49,7 @@ dom_diks=0 for account in $(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT'); do home_dir=$HOMEDIR/$user/mail/$domain/$account if [ -e "$home_dir" ]; then - cd $home_dir - udisk=$(nice -n 19 du -shm ./ | cut -f 1 ) + udisk=$(nice -n 19 du -shm $home_dir | cut -f 1 ) else udisk=0 fi diff --git a/bin/v-update-mail-domains-disk b/bin/v-update-mail-domains-disk index 807218e3..ca93627f 100755 --- a/bin/v-update-mail-domains-disk +++ b/bin/v-update-mail-domains-disk @@ -35,14 +35,13 @@ fi #----------------------------------------------------------# # Starting loop -for domain in $(list_objects 'mail' 'DOMAIN'); do +for domain in $(search_objects 'mail' 'SUSPENDED' "no" 'DOMAIN'); do dom_diks=0 - accounts=$(list_objects "mail/$domain" 'ACCOUNT') + accounts=$(search_objects "mail/$domain" 'SUSPENDED' "no" 'ACCOUNT') for account in $accounts; do home_dir=$HOMEDIR/$user/mail/$domain/$account if [ -e "$home_dir" ]; then - cd $home_dir - udisk=$(nice -n 19 du -shm ./ | cut -f 1 ) + udisk=$(nice -n 19 du -shm $home_dir | cut -f 1 ) else udisk=0 fi diff --git a/bin/v-update-myvesta b/bin/v-update-myvesta deleted file mode 100644 index c3eaf337..00000000 --- a/bin/v-update-myvesta +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# info: Get the very latest build of myVesta -# options: NONE -# -# The function is downloading the very latest build of myVesta - -#----------------------------------------------------------# -# Verifications & Variable & Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Includes -source /usr/local/vesta/func/main.sh - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -rm /var/cache/apt/archives/vesta_* > /dev/null 2>&1 -apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" > /usr/local/vesta/log/update-$package.log 2>&1 -apt-get install --reinstall vesta - -#----------------------------------------------------------# -# Vesta # -#----------------------------------------------------------# - -echo "=== myVesta updated ===" - -log_event "$OK" "$ARGUMENTS" - -exit diff --git a/bin/v-update-sys-ip b/bin/v-update-sys-ip index 0186a394..ab7bc129 100755 --- a/bin/v-update-sys-ip +++ b/bin/v-update-sys-ip @@ -1,6 +1,6 @@ #!/bin/bash # info: update system ip -# options: [NONE] +# options: [USER] [IP_STATUS] # # The function scans configured ip in the system and register them with vesta # internal database. This call is intended for use on vps servers, where ip is @@ -11,10 +11,12 @@ # Variable&Function # #----------------------------------------------------------# -# Importing system variables -source /etc/profile +# Argument definition +user=${1-admin} +ip_status=${2-shared} # Includes +source /etc/profile.d/vesta.sh source $VESTA/func/main.sh source $VESTA/func/ip.sh source $VESTA/conf/vesta.conf @@ -24,84 +26,87 @@ source $VESTA/conf/vesta.conf # Verifications # #----------------------------------------------------------# +check_args '0' "$#" '[USER] [IP_STATUS]' +is_format_valid 'user' 'ip_status' +is_object_valid 'user' 'USER' "$user" "$user" + #----------------------------------------------------------# # Action # #----------------------------------------------------------# -# Listing system ip addresses -ips=$(/sbin/ip addr |grep 'inet ' |grep global |awk '{print $2}' |cut -f1 -d/) -v_ips=$(ls $VESTA/data/ips/) -ip_num=$(echo "$ips" |wc -l) -v_ip_num=$(echo "$v_ips" |wc -l) +# Get list of ip addresses +ip_list=$(/sbin/ip addr|grep 'inet '|grep global|awk '{print $2}') +ip_list=$(echo "$ip_list"|cut -f 1 -d /) +ip_num=$(echo "$ip_list" | wc -l) -# Checking primary IP change -if [[ "$ip_num" -eq '1' ]] && [[ "$v_ip_num" -eq 1 ]]; then - if [ "$ips" != "$v_ips" ]; then - new=$ips - old=$v_ips - fi -fi +# WorkAround for DHCP IP address +vst_ip_list=$(ls $VESTA/data/ips/) +vst_ip_num=$(echo "$vst_ip_list" | wc -l) -# Updating configs -if [ ! -z "$old" ]; then - mv $VESTA/data/ips/$old $VESTA/data/ips/$new - - # Updating PROXY - if [ ! -z "$PROXY_SYSTEM" ]; then - cd /etc/$PROXY_SYSTEM/conf.d - if [ -e "$old.conf" ]; then - mv $old.conf $new.conf - sed -i "s/$old/$new/g" $new.conf +if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then + if [ $ip_num -eq 1 ] && [ "$ip_list" != "$vst_ip_list" ]; then + new=$ip_list + old=$vst_ip_list + mv $VESTA/data/ips/$old $VESTA/data/ips/$new + if [ ! -z "$PROXY_SYSTEM" ]; then + mv /etc/$PROXY_SYSTEM/conf.d/$old.conf \ + /etc/$PROXY_SYSTEM/conf.d/$new.conf + sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf fi - fi + if [ ! -z "$WEB_SYSTEM" ]; then + mv /etc/$WEB_SYSTEM/conf.d/$old.conf \ + /etc/$WEB_SYSTEM/conf.d/$new.conf + sed -i "s/$old/$new/g" /etc/$WEB_SYSTEM/conf.d/$new.conf + sed -i "s/$old/$new/g" $VESTA/data/users/*/web.conf - # Updating WEB - if [ ! -z "$WEB_SYSTEM" ]; then - cd /etc/$WEB_SYSTEM/conf.d - if [ -e "$old.conf" ]; then - mv $old.conf $new.conf - sed -i "s/$old/$new/g" $new.conf + # Rebuild web domains + for user in $(ls $VESTA/data/users/); do + $BIN/v-rebuild-web-domains $user no + done fi - sed -i "s/$old/$new/g" $VESTA/data/users/*/web.conf - for user in $(ls $VESTA/data/users/); do - $BIN/v-rebuild-web-domains $user no - done - $BIN/v-restart-proxy + if [ ! -z "$FTP_SYSTEM" ];then + ftpd_conf_file=$(find /etc/ -maxdepth 2 -name $FTP_SYSTEM.conf) + sed -i "s/$old/$new/g" $ftpd_conf_file + fi + + # Restarting web server $BIN/v-restart-web - fi - # Updating DNS - if [ ! -z "$DNS_SYSTEM" ]; then - sed -i "s/$old/$new/g" $VESTA/data/users/*/dns.conf - sed -i "s/$old/$new/g" $VESTA/data/users/*/dns/*.conf - for user in $(ls $VESTA/data/users/); do - $BIN/v-rebuild-dns-domains $user no - done - $BIN/v-restart-dns - fi + # Restarting ftp server + $BIN/v-restart-ftp - # Updating FTP - if [ ! -z "$FTP_SYSTEM" ] && [ "$FTP_SYSTEM" = 'vsftpd' ]; then - conf=$(find /etc/ -maxdepth 2 -name $FTP_SYSTEM.conf) - if [ ! -z "$conf" ]; then - sed -i "s/$old/$new/g" $conf - $BIN/v-restart-ftp + # Restarting proxy server + if [ ! -z "$PROXY_SYSTEM" ]; then + $BIN/v-restart-proxy fi - fi - # Updating firewall - if [ ! -z "$FIREWALL_SYSTEM" ]; then - sed -i "s/$old/$new/g" $VESTA/data/firewall/*.conf - $BIN/v-update-firewall + # Restarting firewall + if [ ! -z "$FIREWALL_SYSTEM" ]; then + $BIN/v-update-firewall + fi + + if [ ! -z "$DNS_SYSTEM" ]; then + # Rebuild dns domains + for user in $(ls $VESTA/data/users/); do + sed -i "s/$old/$new/g" $VESTA/data/users/$user/dns.conf + sed -i "s/$old/$new/g" $VESTA/data/users/$user/dns/*.conf + $BIN/v-rebuild-dns-domains $user no + done + $BIN/v-restart-dns + check_result $? "dns restart failed" >/dev/null + fi + + # No further comparation is needed + exit fi fi -# Adding system IP -for ip in $ips; do +# Compare ips +for ip in $ip_list; do check_ifconfig=$(/sbin/ifconfig |grep "$ip") if [ ! -e "$VESTA/data/ips/$ip" ] && [ ! -z "$check_ifconfig" ]; then - interface=$(/sbin/ip addr |grep $ip |awk '{print $NF}' |uniq) + interface=$(/sbin/ip addr |grep $ip |awk '{print $NF}'|uniq) interface=$(echo "$interface" |cut -f 1 -d : |head -n 1) netmask=$(/sbin/ip addr |grep $ip |cut -f 2 -d / |cut -f 1 -d \ ) netmask=$(convert_cidr $netmask) @@ -109,15 +114,6 @@ for ip in $ips; do fi done -# Updating NAT -pub_ip=$(curl -4 -s https://scripts.myvestacp.com/ip.php) -if [ ! -e "$VESTA/data/ips/$pub_ip" ]; then - if [ -z "$(grep -R "$pub_ip" $VESTA/data/ips/)" ]; then - ip=$(ls -t $VESTA/data/ips/ |head -n1) - $BIN/v-change-sys-ip-nat $ip $pub_ip - fi -fi - #----------------------------------------------------------# # Vesta # diff --git a/bin/v-update-sys-rrd-la b/bin/v-update-sys-rrd-la index 860bdec6..c6343e3d 100755 --- a/bin/v-update-sys-rrd-la +++ b/bin/v-update-sys-rrd-la @@ -64,7 +64,7 @@ fi # Updating graph rrdtool graph $RRD/la/$period-la.png \ --imgformat PNG \ - --height="350" \ + --height="150" \ --width="670" \ --start "$start" \ --end "$end" \ @@ -74,7 +74,7 @@ rrdtool graph $RRD/la/$period-la.png \ -c "SHADEA#ffffff" \ -c "SHADEB#ffffff" \ -c "FONT#555555" \ - -c "CANVAS#F2F2F2" \ + -c "CANVAS#302c2d" \ -c "GRID#666666" \ -c "MGRID#AAAAAA" \ -c "FRAME#777777" \ @@ -82,7 +82,7 @@ rrdtool graph $RRD/la/$period-la.png \ DEF:la=$RRD/la/la.rrd:LA:AVERAGE \ DEF:pr=$RRD/la/la.rrd:PR:AVERAGE \ COMMENT:'\r' \ - AREA:la#00CD2E:"LA * 100"\ + AREA:la#C8EA2E:"LA * 100"\ GPRINT:la:'LAST: Current\:''%8.0lf' \ GPRINT:la:'MIN: Min\:''%8.0lf' \ GPRINT:la:'MAX: Max\:''%8.0lf\j' \ diff --git a/bin/v-update-sys-rrd-mysql b/bin/v-update-sys-rrd-mysql index 8c6bb75e..aa6734e9 100755 --- a/bin/v-update-sys-rrd-mysql +++ b/bin/v-update-sys-rrd-mysql @@ -14,7 +14,6 @@ period=${1-daily} # Includes source $VESTA/func/main.sh -source $VESTA/func/db.sh source $VESTA/conf/vesta.conf @@ -67,10 +66,23 @@ for host in $hosts; do fi if [ "$period" = 'daily' ]; then - mysql_connect $host - query='SHOW GLOBAL STATUS' - status=$(mysql_query "$query" 2>/dev/null) - if [ $? -ne 0 ]; then + # Defining host credentials + host_str=$(grep "HOST='$host'" $conf) + for key in $host_str; do + eval ${key%%=*}=${key#*=} + done + sql="mysql -h $HOST -u $USER -p$PASSWORD -e" + + # Checking empty vars + if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ]; then + echo "Error: config is broken" + log_event "$E_PARSING" "$ARGUMENTS" + exit $E_PARSING + fi + + # Parsing data + status=$($sql "SHOW GLOBAL STATUS" 2>/dev/null); code="$?" + if [ '0' -ne "$code" ]; then active=0 slow=0 else diff --git a/bin/v-update-sys-rrd-net b/bin/v-update-sys-rrd-net index d59eefd9..e9c642e4 100755 --- a/bin/v-update-sys-rrd-net +++ b/bin/v-update-sys-rrd-net @@ -35,15 +35,13 @@ if [ ! -d "$RRD/net" ]; then mkdir $RRD/net fi -find $RRD/net -name "veth*" -delete - # Parsing network interfaces ndev=$(cat /proc/net/dev) ifaces=$(echo "$ndev" |grep : |cut -f 1 -d : | sed "s/ //g") # Parsing excludes if [ -z "$RRD_IFACE_EXCLUDE" ]; then - RRD_IFACE_EXCLUDE='lo,' + RRD_IFACE_EXCLUDE='lo' fi for exclude in $(echo ${RRD_IFACE_EXCLUDE//,/ }); do ifaces=$(echo "$ifaces" |grep -vw "$exclude" ) @@ -64,8 +62,6 @@ for iface in $ifaces; do RRA:MAX:0.5:6:700 \ RRA:MAX:0.5:24:775 \ RRA:MAX:0.5:288:797 - else - touch $RRD/net/$iface.rrd fi # Parsing device stats @@ -116,8 +112,6 @@ for iface in $ifaces; do done -find $RRD/net -name "*.png" -mtime +1 -delete -find $RRD/net -name "*.rrd" -mtime +1 -delete #----------------------------------------------------------# # Vesta # diff --git a/bin/v-update-sys-rrd-pgsql b/bin/v-update-sys-rrd-pgsql index de2fec8f..6e15c9e8 100755 --- a/bin/v-update-sys-rrd-pgsql +++ b/bin/v-update-sys-rrd-pgsql @@ -85,7 +85,7 @@ for host in $hosts; do # Parsing data q='SELECT SUM(xact_commit + xact_rollback), SUM(numbackends) FROM pg_stat_database;' - status=$($sql psql -d postgres -c "$q" 2>/dev/null); code="$?" + status=$($sql plsql -d postgres -c "$q" 2>/dev/null); code="$?" if [ '0' -ne "$code" ]; then active=0 slow=0 diff --git a/bin/v-update-sys-vesta b/bin/v-update-sys-vesta index 8db9242d..a42e4d71 100755 --- a/bin/v-update-sys-vesta +++ b/bin/v-update-sys-vesta @@ -28,29 +28,12 @@ source $VESTA/conf/vesta.conf # Checking arg number check_args '1' "$#" 'PACKAGE' -valid=0 -if [ "$package" = "vesta" ]; then - valid=1 -fi -if [ "$package" = "vesta-nginx" ]; then - valid=1 -fi -if [ "$package" = "vesta-php" ]; then - valid=1 -fi -if [ "$package" = "vesta-softaculous" ]; then - valid=1 -fi -if [ $valid -eq 0 ]; then - echo "Package $package is not valid" - exit 1 -fi #----------------------------------------------------------# # Action # #----------------------------------------------------------# -if [ -n "$(command -v yum)" ]; then +if [ -e "/etc/redhat-release" ]; then # Clean yum chache yum -q clean all @@ -62,10 +45,11 @@ if [ -n "$(command -v yum)" ]; then check_result $? "$package update failed" $E_UPDATE else # Update repo - apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" > /usr/local/vesta/log/update-$package.log 2>&1 + apt-get update -o Dir::Etc::sourcelist="sources.list.d/vesta.list" \ + -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -qq # Update vesta package - apt-get -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" -o Dpkg::Options::="--force-confmiss" install $package >> /usr/local/vesta/log/update-$package.log 2>&1 + apt-get install $package -qq > /dev/null 2>&1 check_result $? "$package update failed" $E_UPDATE fi diff --git a/bin/v-update-sys-vesta-all b/bin/v-update-sys-vesta-all index cd3e677f..b43fc793 100755 --- a/bin/v-update-sys-vesta-all +++ b/bin/v-update-sys-vesta-all @@ -21,12 +21,8 @@ source $VESTA/conf/vesta.conf # Action # #----------------------------------------------------------# - -# Checking official latest version -latest=$(wget -q -T 10 -t 1 http://c.myvestacp.com/latest.txt?check_latest_version -O -) - # Starting update loop -for package in vesta vesta-nginx vesta-php; do +for package in vesta vesta-nginx vesta-php vesta-ioncube vesta-softaculous; do $BIN/v-update-sys-vesta "$package" done diff --git a/bin/v-update-user-counters b/bin/v-update-user-counters index b0f94430..5fcdd671 100755 --- a/bin/v-update-user-counters +++ b/bin/v-update-user-counters @@ -53,7 +53,6 @@ for user in $user_list; do IP_OWNED=0 U_USERS=0 U_DISK=0 - DISK=0 U_DISK_DIRS=$(get_user_value '$U_DISK_DIRS') if [ -z "$U_DISK_DIRS" ]; then U_DISK_DIRS=0 diff --git a/bin/v-update-user-quota b/bin/v-update-user-quota index 3483bca5..b0f376a2 100755 --- a/bin/v-update-user-quota +++ b/bin/v-update-user-quota @@ -33,7 +33,7 @@ is_object_valid 'user' 'USER' "$user" # Updating disk quota # Had quota equals package value. Soft quota equals 90% of package value for warnings. quota=$(get_user_value '$DISK_QUOTA') -soft=$(echo "$quota * 1024"|bc |cut -f 1 -d .) +soft=$(echo "$quota * 1024 * 0.90"|bc |cut -f 1 -d .) hard=$(echo "$quota * 1024"|bc |cut -f 1 -d .) # Searching home mount point diff --git a/bin/v-update-user-stats b/bin/v-update-user-stats index 23854328..f6b5ff56 100755 --- a/bin/v-update-user-stats +++ b/bin/v-update-user-stats @@ -67,9 +67,6 @@ TOTAL_USERS=0 # Updating user stats for user in $user_list; do - if [ ! -f "$VESTA/data/users/$user/user.conf" ]; then - continue; - fi USER_DATA=$VESTA/data/users/$user source $USER_DATA/user.conf next_month=$(date +'%m/01/%y' -d '+ 1 month') diff --git a/bin/v-update-web-domain-disk b/bin/v-update-web-domain-disk index 1bee4685..ac851b92 100755 --- a/bin/v-update-web-domain-disk +++ b/bin/v-update-web-domain-disk @@ -50,14 +50,6 @@ if [ -e "$home_dir" ]; then disk_usage=$(nice -n 19 du -shm $home_dir | cut -f 1 ) fi -# Defining hdd home directory -home_dir="/hdd$HOMEDIR/$user/web/$domain/" - -# Checking home directory exist -if [ -e "$home_dir" ] && [[ ! -L "$home_dir" ]]; then - disk_usage2=$(nice -n 19 du -shm $home_dir | cut -f 1 ) - disk_usage=$(( disk_usage + disk_usage2 )) -fi #----------------------------------------------------------# # Vesta # diff --git a/bin/v-update-web-domain-stat b/bin/v-update-web-domain-stat index c2c793e3..c77b750b 100755 --- a/bin/v-update-web-domain-stat +++ b/bin/v-update-web-domain-stat @@ -62,7 +62,7 @@ build_webalizer() { } build_awstats() { - if [ -d "/etc/sysconfig" ]; then + if [ -e "/etc/redhat-release" ]; then awstats="/usr/share/awstats/wwwroot/cgi-bin/awstats.pl" wwwroot="/usr/share/awstats/wwwroot" if [ ! -e "$awstats" ]; then diff --git a/bin/v-update-web-domains-disk b/bin/v-update-web-domains-disk index 5ee58abf..5951f289 100755 --- a/bin/v-update-web-domains-disk +++ b/bin/v-update-web-domains-disk @@ -32,16 +32,11 @@ is_object_valid 'user' 'USER' "$user" #----------------------------------------------------------# # Domain loop -for domain in $(list_objects 'web' 'DOMAIN'); do +for domain in $(search_objects 'web' 'SUSPENDED' "no" 'DOMAIN'); do home_dir="$HOMEDIR/$user/web/$domain/" if [ -e "$home_dir" ]; then disk_usage=$(nice -n 19 du -shm $home_dir | cut -f 1 ) fi - home_dir="/hdd$HOMEDIR/$user/web/$domain/" - if [ -e "$home_dir" ] && [[ ! -L "$home_dir" ]]; then - disk_usage2=$(nice -n 19 du -shm $home_dir | cut -f 1 ) - disk_usage=$(( disk_usage + disk_usage2 )) - fi update_object_value 'web' 'DOMAIN' "$domain" '$U_DISK' "$disk_usage" done diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates index 62daa141..3196c8b4 100755 --- a/bin/v-update-web-templates +++ b/bin/v-update-web-templates @@ -22,7 +22,7 @@ source $VESTA/conf/vesta.conf #----------------------------------------------------------# # Defining config host -chost='c.myvestacp.com' +chost='c.vestacp.com' # Detcing OS case $(head -n1 /etc/issue |cut -f 1 -d ' ') in @@ -33,17 +33,13 @@ esac # Detecting release if [ "$version" = 'rhel' ]; then - if [ -e '/etc/redhat-release' ]; then - release=$(grep -o "[0-9]" /etc/redhat-release |head -n1) - else - release=6 - fi + release=$(grep -o "[0-9]" /etc/redhat-release |head -n1) fi if [ "$version" = 'ubuntu' ]; then release=$(lsb_release -r |awk '{print $2}') fi if [ "$version" = 'debian' ]; then - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) + release=$(cat /etc/issue|grep -o [0-9]|head -n1) fi # Defining download url diff --git a/bin/v-whitelist-email-account b/bin/v-whitelist-email-account deleted file mode 100644 index 4a6e6329..00000000 --- a/bin/v-whitelist-email-account +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# info: Add a specific email address to SpamAssassin whitelist -# usage: v-whitelist-email-account EMAIL - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Determine Debian version and set SpamAssassin service name -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) -if [ "$release" -lt 12 ]; then - SPAMD_SERVICE="spamassassin.service" -else - SPAMD_SERVICE="spamd.service" -fi - -SPAMASSASSIN_FILE="/etc/spamassassin/local.cf" - -# Flags to track changes -SPAMASSASSIN_CHANGED=false - -# Function to check if an entry already exists in a file -check_entry_exists() { - local entry=$1 - local file=$2 - grep -qF "$entry" "$file" -} - -# Function to check if a domain/email is already blacklisted -check_blacklisted() { - local pattern=$1 - local file=$2 - grep -qE "blacklist_from.*${pattern}" "$file" -} - -# Function to add an entry to a file -add_entry_to_file() { - local entry=$1 - local file=$2 - echo "$entry" >> "$file" -} - -# Display usage if no arguments are provided -if [ $# -lt 1 ]; then - echo "Usage: v-whitelist-email-account EMAIL" - exit 1 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -EMAIL=$1 - -# Validate email format -if [[ ! "$EMAIL" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$ ]]; then - echo "Invalid email address format." - exit 1 -fi - -# Extract the domain from the email address -DOMAIN=$(echo "$EMAIL" | awk -F '@' '{print $2}') - -# Prepare entries for SpamAssassin -WHITELIST_ENTRY="whitelist_from $EMAIL" -BLACKLIST_ENTRY_MAIN="*@${DOMAIN}" -BLACKLIST_ENTRY_SUB="*.$DOMAIN" - -#----------------------------------------------------------# -# SpamAssassin Whitelist # -#----------------------------------------------------------# - -echo "Updating $SPAMASSASSIN_FILE..." - -# Check if the email address or its domain is already blacklisted -if check_blacklisted "$EMAIL" "$SPAMASSASSIN_FILE"; then - echo "Cannot whitelist $EMAIL. It is already blacklisted." - exit 1 -fi - -if check_blacklisted "$BLACKLIST_ENTRY_MAIN" "$SPAMASSASSIN_FILE"; then - echo "Cannot whitelist $EMAIL. The domain $DOMAIN is already blacklisted." - exit 1 -fi - -if check_blacklisted "$BLACKLIST_ENTRY_SUB" "$SPAMASSASSIN_FILE"; then - echo "Cannot whitelist $EMAIL. The subdomain of $DOMAIN is already blacklisted." - exit 1 -fi - -# Add the email to whitelist if not already present -if ! check_entry_exists "$WHITELIST_ENTRY" "$SPAMASSASSIN_FILE"; then - add_entry_to_file "$WHITELIST_ENTRY" "$SPAMASSASSIN_FILE" - echo "Added $WHITELIST_ENTRY to $SPAMASSASSIN_FILE." - SPAMASSASSIN_CHANGED=true -else - echo "$WHITELIST_ENTRY already exists in $SPAMASSASSIN_FILE." -fi - -# Restart SpamAssassin only if changes were made -if [ "$SPAMASSASSIN_CHANGED" == "true" ]; then - systemctl restart "$SPAMD_SERVICE" - echo "SpamAssassin service ($SPAMD_SERVICE) restarted." -fi - -#----------------------------------------------------------# -# Done # -#----------------------------------------------------------# - -exit 0 diff --git a/bin/v-whitelist-email-domain b/bin/v-whitelist-email-domain deleted file mode 100644 index 9d877ad4..00000000 --- a/bin/v-whitelist-email-domain +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# info: Add a domain to SpamAssassin whitelist -# usage: v-whitelist-email-domain DOMAIN SUBDOMAIN(YES/NO) - -#----------------------------------------------------------# -# Variable&Function # -#----------------------------------------------------------# - -whoami=$(whoami) -if [ "$whoami" != "root" ]; then - echo "You must be root to execute this script" - exit 1 -fi - -# Importing system environment -source /etc/profile - -# Determine Debian version and set SpamAssassin service name -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) -if [ "$release" -lt 12 ]; then - SPAMD_SERVICE="spamassassin.service" -else - SPAMD_SERVICE="spamd.service" -fi - -SPAMASSASSIN_FILE="/etc/spamassassin/local.cf" - -# Flags to track changes -SPAMASSASSIN_CHANGED=false - -# Function to check if a SpamAssassin whitelist entry already exists -check_whitelist_exists() { - local entry=$1 - local file=$2 - grep -qF "whitelist_from $entry" "$file" -} - -# Function to check if a domain/email is already blacklisted -check_blacklist_exists() { - local domain=$1 - local file=$2 - grep -qE "blacklist_from.*${domain}$" "$file" -} - -# Function to add whitelist entry to file -add_whitelist_to_file() { - local entry=$1 - local file=$2 - echo "whitelist_from $entry" >> "$file" -} - -# Display usage if no arguments are provided -if [ $# -lt 2 ]; then - echo "Usage: v-whitelist-email-domain DOMAIN SUBDOMAIN(YES/NO)" - exit 1 -fi - -#----------------------------------------------------------# -# Action # -#----------------------------------------------------------# - -DOMAIN=$1 -SUBDOMAIN=${2^^} # Convert to uppercase for consistency (YES/NO) - -# Validate SUBDOMAIN parameter -if [[ "$SUBDOMAIN" != "YES" && "$SUBDOMAIN" != "NO" ]]; then - echo "Invalid parameter for SUBDOMAIN. Use YES or NO." - exit 1 -fi - -# Prepare entries for SpamAssassin -WHITELIST_ENTRY_MAIN="*@${DOMAIN}" -WHITELIST_ENTRY_SUB="*.$DOMAIN" -BLACKLIST_ENTRY_MAIN="*@${DOMAIN}" -BLACKLIST_ENTRY_SUB="*.$DOMAIN" - -#----------------------------------------------------------# -# SpamAssassin Whitelist # -#----------------------------------------------------------# - -echo "Updating $SPAMASSASSIN_FILE..." - -# Check if the domain is already blacklisted -if check_blacklist_exists "$DOMAIN" "$SPAMASSASSIN_FILE"; then - echo "Cannot whitelist $DOMAIN. It is already blacklisted." - exit 1 -fi - -# Add the main entry -if ! check_whitelist_exists "$WHITELIST_ENTRY_MAIN" "$SPAMASSASSIN_FILE"; then - add_whitelist_to_file "$WHITELIST_ENTRY_MAIN" "$SPAMASSASSIN_FILE" - echo "Added whitelist_from $WHITELIST_ENTRY_MAIN to $SPAMASSASSIN_FILE." - SPAMASSASSIN_CHANGED=true -else - echo "whitelist_from $WHITELIST_ENTRY_MAIN already exists in $SPAMASSASSIN_FILE." -fi - -# Add the subdomain entry if needed -if [ "$SUBDOMAIN" == "YES" ]; then - if ! check_whitelist_exists "$WHITELIST_ENTRY_SUB" "$SPAMASSASSIN_FILE"; then - add_whitelist_to_file "$WHITELIST_ENTRY_SUB" "$SPAMASSASSIN_FILE" - echo "Added whitelist_from $WHITELIST_ENTRY_SUB to $SPAMASSASSIN_FILE." - SPAMASSASSIN_CHANGED=true - else - echo "whitelist_from $WHITELIST_ENTRY_SUB already exists in $SPAMASSASSIN_FILE." - fi -fi - -# Restart SpamAssassin only if changes were made -if [ "$SPAMASSASSIN_CHANGED" == "true" ]; then - systemctl restart "$SPAMD_SERVICE" - echo "SpamAssassin service ($SPAMD_SERVICE) restarted." -fi - -#----------------------------------------------------------# -# Done # -#----------------------------------------------------------# - -exit 0 diff --git a/func/bash-to-php-interpreter.php b/func/bash-to-php-interpreter.php deleted file mode 100644 index b437c3c9..00000000 --- a/func/bash-to-php-interpreter.php +++ /dev/null @@ -1,88 +0,0 @@ - $mysql_out 2>&1 if [ '0' -ne "$?" ]; then if [ "$notify" != 'no' ]; then - subj="Error: Connection to $HOST failed" - email=$($BIN/v-get-user-value admin CONTACT) - echo -e "Can't connect to MySQL $HOST\n$(cat $mysql_out)" |\ $SENDMAIL -s "$subj" $email fi @@ -41,34 +38,23 @@ mysql_connect() { exit $E_CONNECT fi mysql_ver=$(cat $mysql_out |tail -n1 |cut -f 1 -d -) - mysql_fork="mysql" - check_mysql_fork=$(grep "MariaDB" $mysql_out) - if [ ! -z "$check_mysql_fork" ]; then - mysql_fork="mariadb" - fi rm -f $mysql_out } mysql_query() { - sql_tmp=$(mktemp) - echo "$1" > $sql_tmp - mysql --defaults-file=$mycnf < "$sql_tmp" 2>/dev/null - rm -f "$sql_tmp" + mysql --defaults-file=$mycnf -e "$1" 2>/dev/null } mysql_dump() { err="/tmp/e.mysql" - mysqldump --defaults-file=$mycnf --complete-insert --force --quick --single-transaction --max-allowed-packet=1024MB -r $1 $2 2> $err + mysqldump --defaults-file=$mycnf --single-transaction -r $1 $2 2> $err if [ '0' -ne "$?" ]; then rm -rf $tmpdir if [ "$notify" != 'no' ]; then - subj="Error: dump $database failed" - email=$($BIN/v-get-user-value admin CONTACT) - echo -e "Can't dump database $database\n$(cat $err)" |\ $SENDMAIL -s "$subj" $email fi - echo "Error: dump $database failed\n$(cat $err)" + echo "Error: dump $database failed" log_event "$E_DB" "$ARGUMENTS" exit $E_DB fi @@ -88,9 +74,6 @@ psql_connect() { psql -h $HOST -U $USER -c "SELECT VERSION()" > /dev/null 2>/tmp/e.psql if [ '0' -ne "$?" ]; then if [ "$notify" != 'no' ]; then - subj="Error: Connection to $HOST failed" - email=$($BIN/v-get-user-value admin CONTACT) - echo -e "Can't connect to PostgreSQL $HOST\n$(cat /tmp/e.psql)" |\ $SENDMAIL -s "$subj" $email fi @@ -101,10 +84,7 @@ psql_connect() { } psql_query() { - sql_tmp=$(mktemp) - echo "$1" > $sql_tmp - psql -h $HOST -U $USER -f "$sql_tmp" 2>/dev/null - rm -f $sql_tmp + psql -h $HOST -U $USER -c "$1" 2>/dev/null } psql_dump() { @@ -112,9 +92,6 @@ psql_dump() { if [ '0' -ne "$?" ]; then rm -rf $tmpdir if [ "$notify" != 'no' ]; then - subj="Error: dump $database failed" - email=$($BIN/v-get-user-value admin CONTACT) - echo -e "Can't dump database $database\n$(cat /tmp/e.psql)" |\ $SENDMAIL -s "$subj" $email fi @@ -214,57 +191,21 @@ decrease_dbhost_values() { add_mysql_database() { mysql_connect $host - mysql_ver_sub=$(echo $mysql_ver |cut -d '.' -f1) - mysql_ver_sub_sub=$(echo $mysql_ver |cut -d '.' -f2) - query="CREATE DATABASE \`$database\` CHARACTER SET $charset" mysql_query "$query" > /dev/null - if [ "$mysql_fork" = "mysql" ] && [ "$mysql_ver_sub" -ge 8 ] ; then - query="CREATE USER \`$dbuser\`@\`%\` - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null + query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\` + IDENTIFIED BY '$dbpass'" + mysql_query "$query" > /dev/null - query="CREATE USER \`$dbuser\`@localhost - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null + query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost + IDENTIFIED BY '$dbpass'" + mysql_query "$query" > /dev/null - query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\`" - mysql_query "$query" > /dev/null - - query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost" - mysql_query "$query" > /dev/null + if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ]; then + md5=$(mysql_query "SHOW CREATE USER \`$dbuser\`" 2>/dev/null) + md5=$(echo "$md5" |grep password |cut -f8 -d \') else - query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@\`%\` - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null - - query="GRANT ALL ON \`$database\`.* TO \`$dbuser\`@localhost - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null - fi - - if [ "$mysql_fork" = "mysql" ]; then - # mysql - if [ "$mysql_ver_sub" -ge 8 ] || { [ "$mysql_ver_sub" -eq 5 ] && [ "$mysql_ver_sub_sub" -ge 7 ]; } then - if [ "$mysql_ver_sub" -ge 8 ]; then - # mysql >= 8 - md5=$(mysql_query "SHOW CREATE USER \`$dbuser\`" 2>/dev/null) - # echo $md5 - md5=$(echo "$md5" |grep password |cut -f4 -d \') - # echo $md5 - else - # mysql < 8 - md5=$(mysql_query "SHOW CREATE USER \`$dbuser\`" 2>/dev/null) - md5=$(echo "$md5" |grep password |cut -f8 -d \') - fi - else - # mysql < 5.7 - md5=$(mysql_query "SHOW GRANTS FOR \`$dbuser\`" 2>/dev/null) - md5=$(echo "$md5" |grep PASSW|tr ' ' '\n' |tail -n1 |cut -f 2 -d \') - fi - else - # mariadb md5=$(mysql_query "SHOW GRANTS FOR \`$dbuser\`" 2>/dev/null) md5=$(echo "$md5" |grep PASSW|tr ' ' '\n' |tail -n1 |cut -f 2 -d \') fi @@ -315,63 +256,22 @@ get_database_values() { # Change MySQL database password change_mysql_password() { mysql_connect $HOST + query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\` + IDENTIFIED BY '$dbpass'" + mysql_query "$query" > /dev/null + + query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost + IDENTIFIED BY '$dbpass'" + mysql_query "$query" > /dev/null - mysql_ver_sub=$(echo $mysql_ver |cut -d '.' -f1) - mysql_ver_sub_sub=$(echo $mysql_ver |cut -d '.' -f2) - - if [ "$mysql_fork" = "mysql" ]; then - # mysql - if [ "$mysql_ver_sub" -ge 8 ]; then - # mysql >= 8 - query="SET PASSWORD FOR \`$DBUSER\`@\`%\` = '$dbpass'" - mysql_query "$query" > /dev/null - query="SET PASSWORD FOR \`$DBUSER\`@localhost = '$dbpass'" - mysql_query "$query" > /dev/null - else - # mysql < 8 - query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\` - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null - - query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null - fi - else - # mariadb - query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\` - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null - - query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost - IDENTIFIED BY '$dbpass'" - mysql_query "$query" > /dev/null - fi - - if [ "$mysql_fork" = "mysql" ]; then - # mysql - if [ "$mysql_ver_sub" -ge 8 ] || { [ "$mysql_ver_sub" -eq 5 ] && [ "$mysql_ver_sub_sub" -ge 7 ]; } then - if [ "$mysql_ver_sub" -ge 8 ]; then - # mysql >= 8 - md5=$(mysql_query "SHOW CREATE USER \`$DBUSER\`" 2>/dev/null) - # echo $md5 - md5=$(echo "$md5" |grep password |cut -f4 -d \') - # echo $md5 - else - # mysql < 8 - md5=$(mysql_query "SHOW CREATE USER \`$DBUSER\`" 2>/dev/null) - md5=$(echo "$md5" |grep password |cut -f8 -d \') - fi - else - # mysql < 5.7 - md5=$(mysql_query "SHOW GRANTS FOR \`$DBUSER\`" 2>/dev/null) - md5=$(echo "$md5" |grep PASSW|tr ' ' '\n' |tail -n1 |cut -f 2 -d \') - fi - else - # mariadb - md5=$(mysql_query "SHOW GRANTS FOR \`$DBUSER\`" 2>/dev/null) - md5=$(echo "$md5" |grep PASSW|tr ' ' '\n' |tail -n1 |cut -f 2 -d \') - fi +if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ]; then + + md5=$(mysql_query "SHOW CREATE USER \`$DBUSER\`" 2>/dev/null) + md5=$(echo "$md5" |grep password |cut -f8 -d \') +else + md5=$(mysql_query "SHOW GRANTS FOR \`$DBUSER\`" 2>/dev/null) + md5=$(echo "$md5" |grep PASSW|tr ' ' '\n' |tail -n1 |cut -f 2 -d \') +fi } # Change PostgreSQL database password @@ -411,7 +311,7 @@ delete_pgsql_database() { psql_connect $HOST query="REVOKE ALL PRIVILEGES ON DATABASE $database FROM $DBUSER" - psql_query "$query" > /dev/null + psql_qyery "$query" > /dev/null query="DROP DATABASE $database" psql_query "$query" > /dev/null @@ -480,7 +380,7 @@ suspend_pgsql_database() { # Unsuspend MySQL database unsuspend_mysql_database() { mysql_connect $HOST - query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\`" + query="GRANT ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`" mysql_query "$query" > /dev/null query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@localhost" mysql_query "$query" > /dev/null @@ -553,27 +453,3 @@ delete_pgsql_user() { query="DROP ROLE $old_dbuser" psql_query "$query" > /dev/null } - -# Get database name without user prefix -get_database_name_without_user_prefix() { - user=$1 - db=$2 - user_len=${#user} - user_len=$((user_len+1)) - echo ${db:user_len} -} - -# Check if database exists -check_if_database_exists() { - USER_DATA_PATH=$VESTA/data/users/$1 - if [ ! -d "$USER_DATA_PATH" ]; then - echo "no" - return; - fi - counter=$(grep -c "DB='$2'" $USER_DATA_PATH/db.conf) - if [ "$counter" = "0" ]; then - echo "no" - else - echo "yes" - fi -} diff --git a/func/domain.sh b/func/domain.sh index f2a45e71..1d4b5479 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -215,20 +215,12 @@ add_web_config() { fi fi - trigger="${2/%.tpl/.sh}" - if [[ "$2" =~ stpl$ ]]; then - trigger="${2/%.stpl/.sh}" - fi - + trigger="${2/.*pl/.sh}" if [ -x "$WEBTPL/$1/$WEB_BACKEND/$trigger" ]; then $WEBTPL/$1/$WEB_BACKEND/$trigger \ $user $domain $local_ip $HOMEDIR \ $HOMEDIR/$user/web/$domain/public_html fi - - if [[ "$2" =~ ^PHP-FPM ]]; then - ensure_poold_folders_not_empty - fi } # Get config top and bottom line number @@ -277,7 +269,7 @@ replace_web_config() { fi } -# Delete web configuration +# Delete web configuartion del_web_config() { conf="$HOMEDIR/$user/conf/web/$domain.$1.conf" if [[ "$2" =~ stpl$ ]]; then @@ -293,16 +285,12 @@ del_web_config() { if [[ "$2" =~ stpl$ ]]; then conf="$HOMEDIR/$user/conf/web/s$1.conf" fi - if [ -e "$conf" ]; then - get_web_config_lines $WEBTPL/$1/$WEB_BACKEND/$2 $conf - sed -i "$top_line,$bottom_line d" $conf - fi - fi - # clean-up for both config styles if there is no more domains - web_domain=$(grep DOMAIN $USER_DATA/web.conf |wc -l) - if [ "$web_domain" -eq '0' ]; then - sed -i "/.*\/$user\/conf\/web\//d" /etc/$1/conf.d/vesta.conf - if [ -f "$conf" ]; then + get_web_config_lines $WEBTPL/$1/$WEB_BACKEND/$2 $conf + sed -i "$top_line,$bottom_line d" $conf + + web_domain=$(grep DOMAIN $USER_DATA/web.conf |wc -l) + if [ "$web_domain" -eq '0' ]; then + sed -i "/.*\/$user\/.*$1.conf/d" /etc/$1/conf.d/vesta.conf rm -f $conf fi fi @@ -347,7 +335,7 @@ is_web_domain_cert_valid() { check_result $E_FORBIDEN "SSL Key is protected (remove pass_phrase)" fi - openssl s_server -port 654321 -quiet -cert $ssl_dir/$domain.crt \ + openssl s_server -quiet -cert $ssl_dir/$domain.crt \ -key $ssl_dir/$domain.key >> /dev/null 2>&1 & pid=$! sleep 0.5 @@ -416,24 +404,6 @@ update_domain_zone() { VALUE=$(idn --quiet -a -t "$VALUE") fi - # Split long TXT entries into 255 chunks - if [ "$TYPE" = 'TXT' ]; then - txtlength=${#VALUE} - if [ $txtlength -gt 255 ]; then - already_chunked=0 - if [[ $VALUE == *"\" \""* ]] || [[ $VALUE == *"\"\""* ]]; then - already_chunked=1 - fi - if [ $already_chunked -eq 0 ]; then - if [[ ${VALUE:0:1} = '"' ]]; then - txtlength=$(( $txtlength - 2 )) - VALUE=${VALUE:1:txtlength} - fi - VALUE=$(echo $VALUE | fold -w 255 | xargs -I '$' echo -n '"$"') - fi - fi - fi - if [ "$SUSPENDED" != 'yes' ]; then eval echo -e "\"$fields\""|sed "s/%quote%/'/g" >> $zn_conf fi @@ -594,28 +564,3 @@ is_domain_new() { get_domain_values() { eval $(grep "DOMAIN='$domain'" $USER_DATA/$1.conf) } - -# Ensure that pool.d folders are not empty -ensure_poold_folders_not_empty () { - for D in /etc/php/*; do - if [ -d "${D}" ]; then - BD=$(basename ${D}) - POOLD="${D}/fpm/pool.d" - if [ -d "$POOLD" ]; then - # echo $POOLD - # service_to_check="php${BD}-fpm" - # service_exists=$(check_if_service_exists $service_to_check) - # if [ $service_exists -eq 1 ]; then - # echo "$BD = $service_to_check = $POOLD = $service_exists" - ls=$(ls $POOLD | grep -c '.conf') - if [ $ls -eq 0 ]; then - # echo "$BD = $POOLD = $ls" - if [ -f "/usr/local/vesta/src/deb/for-download/tools/default-pool.d/$BD/www.conf" ] && [ ! -f "/etc/php/$BD/fpm/pool.d/www.conf" ]; then - cp /usr/local/vesta/src/deb/for-download/tools/default-pool.d/$BD/www.conf /etc/php/$BD/fpm/pool.d/www.conf - fi - fi - # fi - fi - fi - done -} diff --git a/func/handle_parameters.sh b/func/handle_parameters.sh deleted file mode 100644 index 32e09312..00000000 --- a/func/handle_parameters.sh +++ /dev/null @@ -1,19 +0,0 @@ -# handle --parameters=val - -handle_parameter() { - origparam=$1 - searchstring="=" - paramminuses=${origparam:0:2} - if [ "$paramminuses" = "--" ]; then - var_without_minuses=${origparam:2} - var=${var_without_minuses%%=*} - val=${origparam#*$searchstring} - # echo "$var = $val" - printf -v "$var" '%s' "$val" - fi -} -numargs=$# -for ((i=1 ; i <= numargs ; i++)) -do - handle_parameter ${@:$i:1} -done diff --git a/func/ip.sh b/func/ip.sh index c99a3272..d78cfa73 100644 --- a/func/ip.sh +++ b/func/ip.sh @@ -26,7 +26,7 @@ get_ip_iface() { } -# Check ip address specific value +# Check ip address speciefic value is_ip_key_empty() { key="$1" string=$(cat $VESTA/data/ips/$ip) @@ -141,7 +141,7 @@ get_real_ip() { else nat=$(grep -H "^NAT='$1'" $VESTA/data/ips/*) if [ ! -z "$nat" ]; then - echo "$nat" |cut -f 1 -d : |cut -f 7 -d / |head -n 1 + echo "$nat" |cut -f 1 -d : |cut -f 7 -d / fi fi } diff --git a/func/main.php b/func/main.php deleted file mode 100644 index 4628c92a..00000000 --- a/func/main.php +++ /dev/null @@ -1,85 +0,0 @@ -/dev/null fi } @@ -156,7 +150,7 @@ generate_password() { matrix=0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz fi if [ -z "$lenght" ]; then - lenght=16 + lenght=10 fi i=1 while [ $i -le $lenght ]; do @@ -187,8 +181,7 @@ is_type_valid() { is_backup_enabled() { BACKUPS=$(grep "^BACKUPS=" $USER_DATA/user.conf | cut -f2 -d \') if [ -z "$BACKUPS" ] || [[ "$BACKUPS" -le '0' ]]; then - check_result 0 "user backup is disabled" - exit 0 + check_result $E_DISABLED "user backup is disabled" fi } @@ -219,9 +212,7 @@ is_object_new() { # Check if object is valid is_object_valid() { if [ $2 = 'USER' ]; then - is_user_format_valid $3 'user' - user_vst_dir=$(basename $3) - if [ ! -d "$VESTA/data/users/$user_vst_dir" ]; then + if [ ! -d "$VESTA/data/users/$3" ]; then check_result $E_NOTEXIST "$1 $3 doesn't exist" fi else @@ -254,9 +245,6 @@ is_object_unsuspended() { spnd=$(grep "$2='$3'" $USER_DATA/$1.conf |grep "SUSPENDED='yes'") fi if [ ! -z "$spnd" ]; then - if [ ! -z "$VERBOSE_MODE" ]; then - echo "Error: $(basename $1) $3 is suspended" - fi check_result $E_SUSPENDED "$(basename $1) $3 is suspended" fi } @@ -285,41 +273,11 @@ is_object_value_exist() { is_password_valid() { if [[ "$password" =~ ^/tmp/ ]]; then if [ -f "$password" ]; then - password="$(head -n1 $password)" + password=$(head -n1 $password) fi fi } -# Check if hash is transmitted via file -is_hash_valid() { - if [[ "$hash" =~ ^/tmp/ ]]; then - if [ -f "$hash" ]; then - hash="$(head -n1 $hash)" - fi - fi -} - -# Check if directory is a symlink -is_dir_symlink() { - if [[ -L "$1" ]]; then - check_result $E_FORBIDEN "$1 directory is a symlink" - fi -} - -# Check if file exists -if_file_exists() { - if [[ -f "$1" ]]; then - check_result $E_FORBIDEN "$1 file exists" - fi -} - -# Check if directory exists -if_dir_exists() { - if [[ -d "$1" ]]; then - check_result $E_FORBIDEN "$1 directory exists" - fi -} - # Get object value get_object_value() { object=$(grep "$2='$3'" $USER_DATA/$1.conf) @@ -362,17 +320,6 @@ search_objects() { IFS="$OLD_IFS" } -# List objects -list_objects() { - OLD_IFS="$IFS" - IFS=$'\n' - for line in $(cat $USER_DATA/$1.conf); do - eval $line - eval echo \$$2 - done - IFS="$OLD_IFS" -} - # Get user value get_user_value() { grep "^${1//$/}=" $USER_DATA/user.conf |awk -F "'" '{print $2}' @@ -558,7 +505,7 @@ is_user_format_valid() { check_result $E_INVALID "invalid $2 format :: $1" fi else - if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,64}[[:alnum:]]$ ]] + if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]] then check_result $E_INVALID "invalid $2 format :: $1" fi @@ -569,7 +516,7 @@ is_user_format_valid() { is_domain_format_valid() { object_name=${2-domain} exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|_|/|\|\"|'|;|%|\`| ]" - if [[ $1 =~ $exclude ]] || [[ $1 =~ ^[0-9]+$ ]] || [[ $1 =~ \.\. ]] || [[ $1 =~ $(printf '\t') ]]; then + if [[ $1 =~ $exclude ]] || [[ $1 =~ ^[0-9]+$ ]] || [[ $1 =~ "\.\." ]]; then check_result $E_INVALID "invalid $object_name format :: $1" fi } @@ -686,13 +633,9 @@ is_date_format_valid() { # Database user validator is_dbuser_format_valid() { exclude="[!|@|#|$|^|&|*|(|)|+|=|{|}|:|,|<|>|?|/|\|\"|'|;|%|\`| ]" - my_max_dbuser_len=16 - if [ ! -z "$MAX_DBUSER_LEN" ]; then - my_max_dbuser_len=$MAX_DBUSER_LEN - fi - if [ ${#1} -ge $my_max_dbuser_len ]; then - check_result $E_INVALID "mysql username can be up to $my_max_dbuser_len characters long" - fi + if [ 17 -le ${#1} ]; then + check_result $E_INVALID "mysql username can be up to 16 characters long" + fi if [[ "$1" =~ $exclude ]]; then check_result $E_INVALID "invalid $2 format :: $1" fi @@ -700,7 +643,7 @@ is_dbuser_format_valid() { # DNS record type validator is_dns_type_format_valid() { - known_dnstype='A,AAAA,NS,CNAME,MX,TXT,SRV,DNSKEY,KEY,IPSECKEY,PTR,SPF,TLSA,CAA' + known_dnstype='A,AAAA,NS,CNAME,MX,TXT,SRV,DNSKEY,KEY,IPSECKEY,PTR,SPF,TLSA' if [ -z "$(echo $known_dnstype |grep -w $1)" ]; then check_result $E_INVALID "invalid dns record type format :: $1" fi @@ -780,12 +723,8 @@ is_ip_status_format_valid() { # Cron validator is_cron_format_valid() { - limit=59 + limit=60 check_format='' - if [ "$2" = 'hour' ]; then - limit=23 - fi - if [ "$2" = 'day' ]; then limit=31 fi @@ -814,13 +753,9 @@ is_cron_format_valid() { fi done fi - crn_values=$(echo $1 |tr "," " " | tr "-" " ") - for crn_vl in $crn_values - do - if [[ "$crn_vl" =~ ^[0-9]+$ ]] && [ "$crn_vl" -le $limit ]; then - check_format='ok' - fi - done + if [[ "$1" =~ ^[0-9]+$ ]] && [ "$1" -le $limit ]; then + check_format='ok' + fi if [ "$check_format" != 'ok' ]; then check_result $E_INVALID "invalid $2 format :: $1" fi @@ -835,7 +770,7 @@ is_name_format_valid() { # Object validator is_object_format_valid() { - if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,64}[[:alnum:]]$ ]]; then + if ! [[ "$1" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then check_result $E_INVALID "invalid $2 format :: $1" fi } @@ -846,31 +781,6 @@ is_password_format_valid() { check_result $E_INVALID "invalid password format :: $1" fi } -# Missing function - -# Before: validate_format_shell -# After: is_format_valid_shell -is_format_valid_shell() { - if [ -z "$(grep -w $1 /etc/shells)" ]; then - echo "Error: shell $1 is not valid" - log_event "$E_INVALID" "$EVENT" - exit $E_INVALID - fi -} - -format_no_quotes() { - exclude="['|\"]" - if [[ "$1" =~ $exclude ]]; then - check_result "$E_INVALID" "Invalid $2 contains qoutes (\" or ') :: $1" - fi - is_no_new_line_format "$1" -} - -is_no_new_line_format() { - test=$(echo "$1" | head -n1 ); - if [[ "$test" != "$1" ]]; then - check_result "$E_INVALID" "invalid value :: $1" - fi -} # Format validation controller is_format_valid() { @@ -880,12 +790,11 @@ is_format_valid() { case $arg_name in account) is_user_format_valid "$arg" "$arg_name";; action) is_fw_action_format_valid "$arg";; - alias) is_alias_format_valid "$arg" ;; aliases) is_alias_format_valid "$arg" ;; antispam) is_boolean_format_valid "$arg" 'antispam' ;; antivirus) is_boolean_format_valid "$arg" 'antivirus' ;; autoreply) is_autoreply_format_valid "$arg" ;; - backup) is_object_format_valid "$arg" 'backup' ;; + backup) is_user_format_valid "$arg" 'backup' ;; charset) is_object_format_valid "$arg" "$arg_name" ;; charsets) is_common_format_valid "$arg" 'charsets' ;; comment) is_object_format_valid "$arg" 'comment' ;; @@ -906,7 +815,6 @@ is_format_valid() { host) is_object_format_valid "$arg" "$arg_name" ;; hour) is_cron_format_valid "$arg" $arg_name ;; id) is_int_format_valid "$arg" 'id' ;; - interface) is_interface_format_valid "$arg" ;; ip) is_ip_format_valid "$arg" ;; ip_name) is_domain_format_valid "$arg" 'IP name';; ip_status) is_ip_status_format_valid "$arg" ;; @@ -940,9 +848,7 @@ is_format_valid() { restart) is_boolean_format_valid "$arg" 'restart' ;; rtype) is_dns_type_format_valid "$arg" ;; rule) is_int_format_valid "$arg" "rule id" ;; - soa) is_domain_format_valid "$arg" 'SOA' ;; - #missing command: is_format_valid_shell - shell) is_format_valid_shell "$arg" ;; + soa) is_domain_format_valid "$arg" 'SOA' ;; stats_pass) is_password_format_valid "$arg" ;; stats_user) is_user_format_valid "$arg" "$arg_name" ;; template) is_object_format_valid "$arg" "$arg_name" ;; @@ -992,270 +898,7 @@ format_aliases() { aliases=$(echo "$aliases" |tr -s '.') aliases=$(echo "$aliases" |sed -e "s/[.]*$//g") aliases=$(echo "$aliases" |sed -e "s/^[.]*//") - aliases=$(echo "$aliases" |sed -e "/^$/d") + aliases=$(echo "$aliases" |grep -v www.$domain |sed -e "/^$/d") aliases=$(echo "$aliases" |tr '\n' ',' |sed -e "s/,$//") fi } - - -wait_for_backup_if_it_is_not_time_for_backup() { - # Checking load average - la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') - # i=0 - while [ "$la" -ge "$BACKUP_LA_LIMIT" ]; do - if [ "$i_am_in_backup_all_users" -eq 0 ]; then - echo -e "$(date "+%F %T") Load Average $la" - else - echo -e "$(date "+%F %T") Load Average $la" >> $log - fi - sleep 60 - # if [ "$i" -ge "15" ]; then - # la_error="LoadAverage $la is above threshold" - # echo "$la_error" |$SENDMAIL -s "$subj" $email $notify - # sed -i "/ $user /d" $VESTA/data/queue/backup.pipe - # check_result $E_LA "$la_error" - # fi - la=$(cat /proc/loadavg |cut -f 1 -d ' ' |cut -f 1 -d '.') - # (( ++i)) - done - - # block backup if current hour is after 6 AM - if [ -z "$ALLOW_BACKUP_ANYTIME" ]; then - WAIT_LOOP_ENTERED=0 - hour=$(date +"%H"); - while [ "$hour" -gt "6" ] || [ "$hour" -lt "1" ]; do - # if [ "$WAIT_LOOP_ENTERED" -eq 0 ]; then - # do something when enter sleeping state - # $BIN/v-restart-web-backend - # fi - WAIT_LOOP_ENTERED=1 - current_date_time="`date "+%Y-%m-%d %H:%M:%S"`"; - if [ "$i_am_in_backup_all_users" -eq 0 ]; then - echo "$current_date_time - wait to backup user $user - current hour is $hour" - else - echo "$current_date_time - wait to backup user $user - current hour is $hour" >> $log - fi - sleep 300 - hour=$(date +"%H"); - done - fi -} - -alter_web_counter() { - user=$1 - domain=$2 - USER_DATA=$VESTA/data/users/$user - - varc=$3 - vard="\$${varc}" - counter=$(get_object_value 'web' 'DOMAIN' "$domain" "$vard") - - if [ -z "$counter" ]; then - add_object_key "web" 'DOMAIN' "$domain" "$varc" "TIME" - counter=0 - fi - - ((counter++)) - backup_counter=$counter - - update_object_value 'web' 'DOMAIN' "$domain" "$vard" "$counter" - counter=$backup_counter - - echo $counter -} - -reset_web_counter() { - user=$1 - domain=$2 - USER_DATA=$VESTA/data/users/$user - - varc=$3 - vard="\$${varc}" - - update_object_value 'web' 'DOMAIN' "$domain" "$vard" "0" -} - -get_web_counter() { - user=$1 - domain=$2 - USER_DATA=$VESTA/data/users/$user - - varc=$3 - vard="\$${varc}" - counter=$(get_object_value 'web' 'DOMAIN' "$domain" "$vard") - - if [ -z "$counter" ]; then - counter=0 - fi - - echo $counter -} - -escape_shell_quote() { - local escape_shell_quoted=${1//\'/\'\\\'\'}; - printf "'%s'" "$escape_shell_quoted" -} - -replace_php_config_value() { - if [ ! -z "$4" ]; then - if [ "$4" = "yes" ] || [ "$4" = "true" ] || [ "$4" = "1" ] || [ $4 -eq 1 ]; then - echo "=== Replacing $1 to $2 in $3" - fi - fi - sed -i "s|'$1'|'$2'|g" $3 - sed -i "s|\"$1\"|\"$2\"|g" $3 - sed -i "s|=$1$|=$2|g" $3 - sed -i "s|= $1$|= $2|g" $3 -} - -# Defining password-gen function -vesta_generate_pass() { - MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' - LENGTH=32 - if [ $# -gt 0 ] && [ $1 != "" ]; then - LENGTH=$1 - fi - while [ ${n:=1} -le $LENGTH ]; do - PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}" - let n+=1 - done - echo "$PASS" -} - -# Simple chmod wrapper that skips symlink files after glob expand -# Taken from HestiaCP -no_symlink_chmod() { - local filemode=$1; shift; - - for i in "$@"; do - [[ -L ${i} ]] && continue - - chmod "${filemode}" "${i}" - done -} - -# $1 = subject -# $2 = body -send_email_to_admin() { - email=$(grep CONTACT /usr/local/vesta/data/users/admin/user.conf) - email=$(echo "$email" | cut -f 2 -d "'") - if [ -z "$email" ]; then - if [ ! -z "$NOTIFY_ADMIN_FULL_BACKUP" ]; then - email=$NOTIFY_ADMIN_FULL_BACKUP - fi - fi - if [ -z "$email" ]; then - return; - fi - echo "$2" | $SENDMAIL -s "$1" "$email" 'yes' -} - -check_if_service_exists() { - if [ $(systemctl list-units --all -t service --full --no-legend | grep -c "$1") -gt 0 ]; then - echo "1" - else - echo "0" - fi -} - -# Parsing config variables with key='value' and key="value" pairs and setting them as variables, without using Perl. -# Inspired by HestiaCP function and improved -parse_object_kv_list_non_eval() { - # Let's combine all the parameters into one string, replace the new lines with a space - local str="${*//$'\n'/ }" - str=${str//\\\'/---QUOTE---} - str=${str//\\\"/---DQUOTE---} - local backup_str=$str - - local key val match i length length_val prefix position cut - i=0 - # Searching for key='value' blocks - # Loop until we find the next key='value' - while [[ $str =~ ([A-Za-z][[:alnum:]_]*)=\'([^\']*)\' ]]; do - key="${BASH_REMATCH[1]}" - val="${BASH_REMATCH[2]}" - match="${BASH_REMATCH[0]}" - length=${#match} - length_val=${#match} - - # Key validation: alphanumeric, length 2–66 (key must start and end with a letter/number) - if ! [[ "$key" =~ ^[[:alnum:]][_[:alnum:]]{0,64}[[:alnum:]]$ ]]; then - check_result "$E_INVALID" "Invalid key format [$key]" - fi - - # Declaring a global variable - val=${val/---QUOTE---/\\\'} - val=${val/---DQUOTE---/\\\"} - declare -g "$key"="$val" - - # Let's remove the processed part from str to continue - prefix=${str%%"$key="*} - position=${#prefix} - cut=$((position + 1 + length_val)) - str=${str:cut} - ((i++)) - if [ $i -eq 100 ]; then - check_result "$E_INVALID" "Potentially conf-parsing infinite loop detected" - fi - done - - # Terminate function if we don't expect strings with double apostrophes - if [ -z "$PARSE_DOUBLE_QUOTES_VAR" ]; then - return; - fi - - # Searching for key="value" blocks - str=$backup_str - i=0 - # Loop until we find the next key="value" - while [[ $str =~ ([A-Za-z][[:alnum:]_]*)=\"([^\"]*)\" ]]; do - key="${BASH_REMATCH[1]}" - val="${BASH_REMATCH[2]}" - match="${BASH_REMATCH[0]}" - length=${#match} - length_val=${#match} - - # Key validation: alphanumeric, length 2–66 (key must start and end with a letter/number) - if ! [[ "$key" =~ ^[[:alnum:]][_[:alnum:]]{0,64}[[:alnum:]]$ ]]; then - check_result "$E_INVALID" "Invalid key format [$key]" - fi - - # Declaring a global variable - val=${val/---QUOTE---/\\\'} - val=${val/---DQUOTE---/\\\"} - declare -g "$key"="$val" - - # Let's remove the processed part from str to continue - prefix=${str%%"$key="*} - position=${#prefix} - cut=$((position + 1 + length_val)) - str=${str:cut} - ((i++)) - if [ $i -eq 100 ]; then - check_result "$E_INVALID" "Potentially conf-parsing infinite loop detected" - fi - done -} - -# Return OK (0) if domain is unsupended -# Parameters: -# $1 - user -# $2 - domain -return_ok_if_domain_is_unsuspended() { - spnd=$(grep "DOMAIN='$2'" /usr/local/vesta/data/users/$1/web.conf | grep "SUSPENDED='yes'") - if [ ! -z "$spnd" ]; then - return $E_SUSPENDED - fi - return $OK -} - -# Return OK (0) if user is unsupended -# Parameters: -# $1 - user -return_ok_if_user_is_unsuspended() { - spnd=$(cat /usr/local/vesta/data/users/$1/user.conf | grep "SUSPENDED='yes'") - if [ ! -z "$spnd" ]; then - return $E_SUSPENDED - fi - return $OK -} diff --git a/func/rebuild.sh b/func/rebuild.sh index ae267e8b..e5ab182a 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -51,7 +51,7 @@ rebuild_user_conf() { mkdir -p $HOMEDIR/$user/conf chmod a+x $HOMEDIR/$user chmod a+x $HOMEDIR/$user/conf - chown --no-dereference $user:$user $HOMEDIR/$user + chown $user:$user $HOMEDIR/$user chown root:root $HOMEDIR/$user/conf # Update disk pipe @@ -71,16 +71,13 @@ rebuild_user_conf() { echo "$BIN/v-update-web-domains-disk $user" \ >> $VESTA/data/queue/disk.pipe - if [[ -L "$HOMEDIR/$user/web" ]]; then - rm $HOMEDIR/$user/web - fi mkdir -p $HOMEDIR/$user/conf/web mkdir -p $HOMEDIR/$user/web mkdir -p $HOMEDIR/$user/tmp chmod 751 $HOMEDIR/$user/conf/web chmod 751 $HOMEDIR/$user/web chmod 771 $HOMEDIR/$user/tmp - chown --no-dereference $user:$user $HOMEDIR/$user/web + chown $user:$user $HOMEDIR/$user/web if [ -z "$create_user" ]; then $BIN/v-rebuild-web-domains $user $restart fi @@ -108,9 +105,6 @@ rebuild_user_conf() { echo "$BIN/v-update-mail-domains-disk $user" \ >> $VESTA/data/queue/disk.pipe - if [[ -L "$HOMEDIR/$user/mail" ]]; then - rm $HOMEDIR/$user/mail - fi mkdir -p $HOMEDIR/$user/conf/mail mkdir -p $HOMEDIR/$user/mail chmod 751 $HOMEDIR/$user/mail @@ -152,7 +146,7 @@ rebuild_web_domain_conf() { prepare_web_domain_values # Rebuilding domain directories - sudo -u $user mkdir -p $HOMEDIR/$user/web/$domain \ + mkdir -p $HOMEDIR/$user/web/$domain \ $HOMEDIR/$user/web/$domain/public_html \ $HOMEDIR/$user/web/$domain/public_shtml \ $HOMEDIR/$user/web/$domain/document_errors \ @@ -178,15 +172,14 @@ rebuild_web_domain_conf() { # Propagating html skeleton if [ ! -e "$WEBTPL/skel/document_errors/" ]; then - sudo -u $user cp -r $WEBTPL/skel/document_errors/ \ - $HOMEDIR/$user/web/$domain/ + cp -r $WEBTPL/skel/document_errors/ $HOMEDIR/$user/web/$domain/ fi # Set folder permissions - no_symlink_chmod 551 $HOMEDIR/$user/web/$domain \ + chmod 551 $HOMEDIR/$user/web/$domain \ $HOMEDIR/$user/web/$domain/stats \ $HOMEDIR/$user/web/$domain/logs - no_symlink_chmod 751 $HOMEDIR/$user/web/$domain/private \ + chmod 751 $HOMEDIR/$user/web/$domain/private \ $HOMEDIR/$user/web/$domain/cgi-bin \ $HOMEDIR/$user/web/$domain/public_html \ $HOMEDIR/$user/web/$domain/public_shtml \ @@ -194,7 +187,7 @@ rebuild_web_domain_conf() { chmod 640 /var/log/$WEB_SYSTEM/domains/$domain.* # Set ownership - chown --no-dereference $user:$user $HOMEDIR/$user/web/$domain \ + chown $user:$user $HOMEDIR/$user/web/$domain \ $HOMEDIR/$user/web/$domain/private \ $HOMEDIR/$user/web/$domain/cgi-bin \ $HOMEDIR/$user/web/$domain/public_html \ @@ -445,12 +438,9 @@ rebuild_mail_domain_conf() { rm -f $HOMEDIR/$user/conf/mail/$domain/protection rm -f $HOMEDIR/$user/conf/mail/$domain/passwd rm -f $HOMEDIR/$user/conf/mail/$domain/fwd_only - rm -f $HOMEDIR/$user/conf/mail/$domain/accounts - touch $HOMEDIR/$user/conf/mail/$domain/aliases touch $HOMEDIR/$user/conf/mail/$domain/passwd touch $HOMEDIR/$user/conf/mail/$domain/fwd_only - touch $HOMEDIR/$user/conf/mail/$domain/accounts # Adding antispam protection if [ "$ANTISPAM" = 'yes' ]; then @@ -509,8 +499,6 @@ rebuild_mail_domain_conf() { fi str="$account:$MD5:$user:mail::$HOMEDIR/$user:$QUOTA" echo $str >> $HOMEDIR/$user/conf/mail/$domain/passwd - userstr="$account:$account:$user:mail:$HOMEDIR/$user" - echo $userstr >> $HOMEDIR/$user/conf/mail/$domain/accounts for malias in ${ALIAS//,/ }; do echo "$malias@$domain_idn:$account@$domain_idn" >> $dom_aliases done @@ -523,12 +511,6 @@ rebuild_mail_domain_conf() { fi done - # Define mail user - if [ "$MAIL_SYSTEM" = 'exim4' ]; then - MAIL_USER=Debian-exim - else - MAIL_USER=exim - fi # Set permissions and ownership if [[ "$MAIL_SYSTEM" =~ exim ]]; then chmod 660 $USER_DATA/mail/$domain.* @@ -538,7 +520,6 @@ rebuild_mail_domain_conf() { chmod 770 $HOMEDIR/$user/mail/$domain_idn chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd - chown $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain/accounts chown $user:mail $HOMEDIR/$user/mail/$domain_idn fi @@ -554,50 +535,17 @@ rebuild_mail_domain_conf() { rebuild_mysql_database() { mysql_connect $HOST mysql_query "CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET" >/dev/null - if [ "$mysql_fork" = "mysql" ]; then - # mysql - mysql_ver_sub=$(echo $mysql_ver |cut -d '.' -f1) - mysql_ver_sub_sub=$(echo $mysql_ver |cut -d '.' -f2) - if [ "$mysql_ver_sub" -ge 8 ] || { [ "$mysql_ver_sub" -eq 5 ] && [ "$mysql_ver_sub_sub" -ge 7 ]; } then - # mysql >= 5.7 - # if [ "$mysql_ver_sub" -eq 5 ] && [ "$mysql_ver_sub_sub" -ge 7 ]; then - mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null - mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null - query="UPDATE mysql.user SET authentication_string='$MD5'" - query="$query WHERE User='$DBUSER'" - else - # mysql < 5.7 - query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'" - fi + if [ "$(echo $mysql_ver |cut -d '.' -f2)" -ge 7 ]; then + mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" >/dev/null + mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" >/dev/null + query="UPDATE mysql.user SET authentication_string='$MD5'" + query="$query WHERE User='$DBUSER'" else - # mariadb - mysql_ver_sub=$(echo $mysql_ver |cut -d '.' -f1) - mysql_ver_sub_sub=$(echo $mysql_ver |cut -d '.' -f2) - if [ "$mysql_ver_sub" -eq 5 ]; then - # mariadb = 5 - mysql_query "CREATE USER \`$DBUSER\`" > /dev/null - mysql_query "CREATE USER \`$DBUSER\`@localhost" > /dev/null - query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'" - else - # mariadb = 10 - mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`" > /dev/null - mysql_query "CREATE USER IF NOT EXISTS \`$DBUSER\`@localhost" > /dev/null - if [ "$mysql_ver_sub_sub" -ge 4 ]; then - # mariadb >= 10.4 - query="SET PASSWORD FOR '$DBUSER'@'%' = '$MD5';" - query2="SET PASSWORD FOR '$DBUSER'@'localhost' = '$MD5';" - else - # mariadb < 10.4 - query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'" - fi - fi + query="UPDATE mysql.user SET Password='$MD5' WHERE User='$DBUSER'" fi mysql_query "GRANT ALL ON \`$DB\`.* TO \`$DBUSER\`@\`%\`" >/dev/null mysql_query "GRANT ALL ON \`$DB\`.* TO \`$DBUSER\`@localhost" >/dev/null mysql_query "$query" >/dev/null - if [ ! -z "$query2" ]; then - mysql_query "$query2" >/dev/null - fi mysql_query "FLUSH PRIVILEGES" >/dev/null } @@ -610,9 +558,6 @@ rebuild_pgsql_database() { if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then echo "Error: postgresql config parsing failed" if [ ! -z "$SENDMAIL" ]; then - subj="Error: postgresql config parsing failed" - email=$($BIN/v-get-user-value admin CONTACT) - echo "Can't parse PostgreSQL config" | $SENDMAIL -s "$subj" $email fi log_event "$E_PARSING" "$ARGUMENTS" @@ -624,9 +569,6 @@ rebuild_pgsql_database() { if [ '0' -ne "$?" ]; then echo "Error: Connection failed" if [ ! -z "$SENDMAIL" ]; then - subj="Error: Connection failed" - email=$($BIN/v-get-user-value admin CONTACT) - echo "Database connection to PostgreSQL host $HOST failed" |\ $SENDMAIL -s "$subj" $email fi @@ -634,7 +576,7 @@ rebuild_pgsql_database() { exit $E_CONNECT fi - query="CREATE ROLE $DBUSER WITH LOGIN" + query="CREATE ROLE $DBUSER" psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 query="UPDATE pg_authid SET rolpassword='$MD5' WHERE rolname='$DBUSER'" @@ -651,7 +593,7 @@ rebuild_pgsql_database() { query="GRANT ALL PRIVILEGES ON DATABASE $DB TO $DBUSER" psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 - query="GRANT CONNECT ON DATABASE template1 to $DBUSER" + query="GRANT CONNECT ON DATABASE template1 to $dbuser" psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1 } diff --git a/func/string.php b/func/string.php deleted file mode 100644 index 7ada2546..00000000 --- a/func/string.php +++ /dev/null @@ -1,238 +0,0 @@ -$slen) $len=$slen-$pos1; - - $myvesta_str_found_at=$pos1; - $myvesta_str_end_at=$pos1+$len; - - return substr($text, $pos1, $len); -} - -function myvesta_str_replace_once_between_including_borders(&$text, $left, $right, $replace_with) { - $pos1=strpos($text, $left); - if ($pos1===false) return $text; - $pos2=strpos($text, $right, $pos1+strlen($left)); - if ($pos2===false) return $text; - return substr($text, 0, $pos1).$replace_with.substr($text, $pos2+strlen($right)); -} - -function myvesta_str_strip_once_between_including_borders(&$text, $left, $right) { - $pos1=strpos($text, $left); - if ($pos1===false) return $text; - $pos2=strpos($text, $right, $pos1+strlen($left)); - if ($pos2===false) return $text; - return substr($text, 0, $pos1).substr($text, $pos2+strlen($right)); -} - -function myvesta_str_replace_between_including_borders($text, $left, $right, $replace_with) { - $start=0; - $left_len=strlen($left); - $right_len=strlen($right); - while (true) { - $pos1=strpos($text, $left); - if ($pos1===false) break; - $pos2=strpos($text, $right, $pos1+$left_len); - if ($pos2===false) break; - $text=substr($text, 0, $pos1).$replace_with.substr($text, $pos2+$right_len); - } - return $text; -} - -function myvesta_str_strip_between_including_borders($text, $left, $right) { - global $myvesta_stdin; - $args=func_get_args(); - $args_i=-1; - if ($myvesta_stdin!='') { - $text=$myvesta_stdin; - } else { - $args_i++; $text=$args[$args_i]; - } - $args_i++; $left=$args[$args_i]; - $args_i++; $right=$args[$args_i]; - - $left_len=strlen($left); - $right_len=strlen($right); - while (true) { - $pos1=strpos($text, $left); - if ($pos1===false) break; - $pos2=strpos($text, $right, $pos1+$left_len); - if ($pos2===false) break; - $text=substr($text, 0, $pos1).substr($text, $pos2+$right_len); - } - return $text; -} - -function myvesta_str_find($text, $find, $quiet=false) { - $pos=strpos($text, $find); - if ($pos===false) return myvesta_throw_error (MYVESTA_ERROR_STRING_NOT_FOUND, ""); - if ($quiet) return true; - return $pos; -} - -function myvesta_str_uppercase($text) { - return strtoupper($text); -} - -function myvesta_str_lowercase($text) { - return strtolower($text); -} - -function myvesta_str_substring($text, $start, $length=null) { - if ($length===null) return substr($text, $start); - if ($length!==null) return substr($text, $start, $length); -} diff --git a/install/debian/10/apache2/apache2.conf b/install/debian/10/apache2/apache2.conf deleted file mode 100644 index 2be3e50d..00000000 --- a/install/debian/10/apache2/apache2.conf +++ /dev/null @@ -1,95 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 900 -ProxyTimeout 900 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/debian/10/apache2/status.conf b/install/debian/10/apache2/status.conf deleted file mode 100644 index 0d82a356..00000000 --- a/install/debian/10/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - # Allow from all - diff --git a/install/debian/10/bind/named.conf b/install/debian/10/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/debian/10/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/debian/10/clamav/clamd.conf b/install/debian/10/clamav/clamd.conf deleted file mode 100644 index c636b6d3..00000000 --- a/install/debian/10/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean true -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 2M -MaxFileSize 2M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/debian/10/deb_signing.key b/install/debian/10/deb_signing.key deleted file mode 100644 index d279abbd..00000000 --- a/install/debian/10/deb_signing.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/10/dovecot/conf.d/10-auth.conf b/install/debian/10/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/debian/10/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/debian/10/dovecot/conf.d/10-logging.conf b/install/debian/10/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/debian/10/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/debian/10/dovecot/conf.d/10-mail.conf b/install/debian/10/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/debian/10/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/debian/10/dovecot/conf.d/10-master.conf b/install/debian/10/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/debian/10/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/debian/10/dovecot/conf.d/10-ssl.conf b/install/debian/10/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 3aaff6ee..00000000 --- a/install/debian/10/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,3 +0,0 @@ -ssl = yes -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - mail_max_userip_connections = 50 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/debian/10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/debian/10/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/debian/10/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/debian/10/dovecot/dovecot.conf b/install/debian/10/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/debian/10/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/debian/10/exim/deny_senders b/install/debian/10/exim/deny_senders deleted file mode 100644 index 8b137891..00000000 --- a/install/debian/10/exim/deny_senders +++ /dev/null @@ -1 +0,0 @@ - diff --git a/install/debian/10/exim/dnsbl.conf b/install/debian/10/exim/dnsbl.conf deleted file mode 100644 index 279bafcd..00000000 --- a/install/debian/10/exim/dnsbl.conf +++ /dev/null @@ -1 +0,0 @@ -bl.spamcop.net diff --git a/install/debian/10/exim/exim4.conf.template b/install/debian/10/exim/exim4.conf.template deleted file mode 100644 index 0e5afaac..00000000 --- a/install/debian/10/exim/exim4.conf.template +++ /dev/null @@ -1,416 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -recipients_max = 15 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Web site is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_chunking = !93.188.3.0/24 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/10/exim/spam-blocks.conf b/install/debian/10/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/debian/10/fail2ban/action.d/vesta.conf b/install/debian/10/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/debian/10/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/debian/10/fail2ban/filter.d/vesta.conf b/install/debian/10/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 36ec1001..00000000 --- a/install/debian/10/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccessful Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/debian/10/fail2ban/jail.local b/install/debian/10/fail2ban/jail.local deleted file mode 100644 index eccea068..00000000 --- a/install/debian/10/fail2ban/jail.local +++ /dev/null @@ -1,39 +0,0 @@ -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 diff --git a/install/debian/10/firewall/ports.conf b/install/debian/10/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/debian/10/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/debian/10/firewall/rules.conf b/install/debian/10/firewall/rules.conf deleted file mode 100644 index 6da5a1c4..00000000 --- a/install/debian/10/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='yes' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/debian/10/logrotate/apache2 b/install/debian/10/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/debian/10/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/debian/10/logrotate/dovecot b/install/debian/10/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/debian/10/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/debian/10/logrotate/nginx b/install/debian/10/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/debian/10/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/debian/10/logrotate/vesta b/install/debian/10/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/debian/10/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/debian/10/mysql/my-large.cnf b/install/debian/10/mysql/my-large.cnf deleted file mode 100644 index b056c316..00000000 --- a/install/debian/10/mysql/my-large.cnf +++ /dev/null @@ -1,51 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M -thread_concurrency = 8 - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/10/mysql/my-medium.cnf b/install/debian/10/mysql/my-medium.cnf deleted file mode 100644 index 33aa04c2..00000000 --- a/install/debian/10/mysql/my-medium.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/10/mysql/my-small.cnf b/install/debian/10/mysql/my-small.cnf deleted file mode 100644 index 857f48ce..00000000 --- a/install/debian/10/mysql/my-small.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/10/nginx/nginx.conf b/install/debian/10/nginx/nginx.conf deleted file mode 100644 index 6d5e36ba..00000000 --- a/install/debian/10/nginx/nginx.conf +++ /dev/null @@ -1,140 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -timer_resolution 50ms; #In order to free some CPU cycles -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 900; - proxy_send_timeout 900; - proxy_read_timeout 900; - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/13; - set_real_ip_from 104.24.0.0/14; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 2400:cb00::/32; - set_real_ip_from 2606:4700::/32; - set_real_ip_from 2803:f800::/32; - set_real_ip_from 2405:b500::/32; - set_real_ip_from 2405:8100::/32; - set_real_ip_from 2a06:98c0::/29; - set_real_ip_from 2c0f:f248::/32; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/debian/10/nginx/phpmyadmin.inc b/install/debian/10/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/debian/10/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/debian/10/nginx/phppgadmin.inc b/install/debian/10/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/debian/10/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/10/nginx/status.conf b/install/debian/10/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/debian/10/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/debian/10/nginx/webmail.inc b/install/debian/10/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/debian/10/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/10/packages/default.pkg b/install/debian/10/packages/default.pkg deleted file mode 100644 index de293236..00000000 --- a/install/debian/10/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='PHP-FPM-73' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='unlimited' -WEB_ALIASES='unlimited' -DNS_DOMAINS='unlimited' -DNS_RECORDS='unlimited' -MAIL_DOMAINS='unlimited' -MAIL_ACCOUNTS='unlimited' -DATABASES='unlimited' -CRON_JOBS='unlimited' -DISK_QUOTA='unlimited' -BANDWIDTH='unlimited' -NS='YOURHOSTNAME1,YOURHOSTNAME2' -SHELL='nologin' -BACKUPS='2' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/10/pga/config.inc.php b/install/debian/10/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/debian/10/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/debian/10/pga/phppgadmin.conf b/install/debian/10/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/debian/10/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/debian/10/php-fpm/www.conf b/install/debian/10/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/debian/10/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/debian/10/php/php7.3-dedi.patch b/install/debian/10/php/php7.3-dedi.patch deleted file mode 100644 index c044e002..00000000 --- a/install/debian/10/php/php7.3-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/10/php/php7.3-vps.patch b/install/debian/10/php/php7.3-vps.patch deleted file mode 100644 index 803b93e8..00000000 --- a/install/debian/10/php/php7.3-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/10/pma/apache.conf b/install/debian/10/pma/apache.conf deleted file mode 100644 index 2a8f69e2..00000000 --- a/install/debian/10/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/debian/10/pma/config.inc.php b/install/debian/10/pma/config.inc.php deleted file mode 100644 index eafc6d67..00000000 --- a/install/debian/10/pma/config.inc.php +++ /dev/null @@ -1,146 +0,0 @@ -> $pmapath1 -sed -i '/savedsearches/d' $pmapath1 -sed -i '/navigationhiding/d' $pmapath1 -sed -i '/users/d' $pmapath1 -sed -i '/controlpass/d' $pmapath1 -sed -i '/favorite/d' $pmapath1 -sed -i '/usergroups/d' $pmapath1 -sed -i '/central_columns/d' $pmapath1 -sed -i '/designer_settings/d' $pmapath1 -sed -i '/export_templates/d' $pmapath1 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath1 - -sed -i '/pmadb/d' $pmapath2 -sed -i '/controluser/d' $pmapath2 -sed -i '/bookmarktable/d' $pmapath2 -sed -i '/relation/d' $pmapath2 -sed -i '/userconfig/d' $pmapath2 -sed -i '/table_info/d' $pmapath2 -sed -i '/column_info/d' $pmapath2 -sed -i '/history/d' $pmapath2 -sed -i '/recent/d' $pmapath2 -sed -i '/table_uiprefs/d' $pmapath2 -sed -i '/tracking/d' $pmapath2 -sed -i '/table_coords/d' $pmapath2 -sed -i '/pdf_pages/d' $pmapath2 -sed -i '/designer_coords/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/savedsearches/d' $pmapath2 -sed -i '/navigationhiding/d' $pmapath2 -sed -i '/users/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/favorite/d' $pmapath2 -sed -i '/usergroups/d' $pmapath2 -sed -i '/central_columns/d' $pmapath2 -sed -i '/designer_settings/d' $pmapath2 -sed -i '/export_templates/d' $pmapath2 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath2 - -#SOME WORK with DATABASE (table / user) -PMADB=phpmyadmin -PMAUSER=pma - -#DROP USER and TABLE -mysql -uroot < - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 100 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - - - Umask 002 - IdentLookups off - AllowOverwrite yes - - AllowAll - - diff --git a/install/debian/10/proftpd/tls.conf b/install/debian/10/proftpd/tls.conf deleted file mode 100644 index 9da0017b..00000000 --- a/install/debian/10/proftpd/tls.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# Proftpd sample configuration for FTPS connections. -# -# Note that FTPS impose some limitations in NAT traversing. -# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html -# for more information. -# - - # If mod_tls was built as a shared/DSO module, load it - LoadModule mod_tls.c - - -TLSEngine on -TLSLog /var/log/proftpd/tls.log -# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2 -TLSProtocol TLSv1.1 TLSv1.2 -# -# Server SSL certificate. You can generate a self-signed certificate using -# a command like: -# -# openssl req -x509 -newkey rsa:1024 \ -# -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \ -# -nodes -days 365 -# -# The proftpd.key file must be readable by root only. The other file can be -# readable by anyone. -# -# chmod 0600 /etc/ssl/private/proftpd.key -# chmod 0640 /etc/ssl/private/proftpd.key -# -TLSRSACertificateFile /usr/local/vesta/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/vesta/ssl/certificate.key -# -# CA the server trusts... -#TLSCACertificateFile /etc/ssl/certs/CA.pem -# ...or avoid CA cert and be verbose -#TLSOptions NoCertRequest EnableDiags -# ... or the same with relaxed session use for some clients (e.g. FireFtp) -#TLSOptions NoCertRequest EnableDiags NoSessionReuseRequired -# -# -# Per default drop connection if client tries to start a renegotiate -# This is a fix for CVE-2009-3555 but could break some clients. -# -#TLSOptions AllowClientRenegotiations -# -TLSOptions NoSessionReuseRequired AllowClientRenegotiations -# Authenticate clients that want to use FTP over TLS? -# -#TLSVerifyClient off -# -# Are clients required to use FTP over TLS when talking to this server? -# -TLSRequired off -# -# Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support -# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these -# clients will close the data connection, or there will be a timeout -# on an idle data connection. -# -TLSRenegotiate required off - diff --git a/install/debian/10/roundcube/apache.conf b/install/debian/10/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/debian/10/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/debian/10/roundcube/config.inc.php b/install/debian/10/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/debian/10/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/debian/10/roundcube/main.inc.php b/install/debian/10/roundcube/main.inc.php deleted file mode 100644 index 55a4e082..00000000 --- a/install/debian/10/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = true; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = false; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'larry'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 300 seconds (5min) -$rcmail_config['draft_autosave'] = 300; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/debian/10/roundcube/vesta.php b/install/debian/10/roundcube/vesta.php deleted file mode 100644 index b3dd167f..00000000 --- a/install/debian/10/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} diff --git a/install/debian/10/sudo/admin b/install/debian/10/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/debian/10/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/10/templates/dns/child-ns.tpl b/install/debian/10/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/debian/10/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/10/templates/dns/default.tpl b/install/debian/10/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/debian/10/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/10/templates/dns/gmail.tpl b/install/debian/10/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/debian/10/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/10/templates/dns/office365.tpl b/install/debian/10/templates/dns/office365.tpl deleted file mode 100644 index dcf556e1..00000000 --- a/install/debian/10/templates/dns/office365.tpl +++ /dev/null @@ -1,22 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:spf.protection.outlook.com -all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='MX' PRIORITY='0' VALUE='XXXXXXX.mail.protection.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"MS=msXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='autodiscover' TYPE='CNAME' PRIORITY='' VALUE='autodiscover.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='sip' TYPE='CNAME' PRIORITY='' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='lyncdiscover' TYPE='CNAME' PRIORITY='' VALUE='webdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='19' RECORD='enterpriseregistration' TYPE='CNAME' PRIORITY='' VALUE='enterpriseregistration.windows.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='20' RECORD='enterpriseenrollment' TYPE='CNAME' PRIORITY='' VALUE='enterpriseenrollment.manage.microsoft.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='21' RECORD='_sip._tls' TYPE='SRV' PRIORITY='100 1 443' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='22' RECORD='_sipfederationtls._tcp' TYPE='SRV' PRIORITY='100 1 5061' VALUE='sipfed.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/10/templates/dns/yandex.tpl b/install/debian/10/templates/dns/yandex.tpl deleted file mode 100644 index 4ce768fe..00000000 --- a/install/debian/10/templates/dns/yandex.tpl +++ /dev/null @@ -1,16 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.yandex.net ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"yandex-verification: XXXXXXXXXXXXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/10/templates/web/apache2/PHP-FPM-73-public.sh b/install/debian/10/templates/web/apache2/PHP-FPM-73-public.sh deleted file mode 100755 index a2fea927..00000000 --- a/install/debian/10/templates/web/apache2/PHP-FPM-73-public.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.3-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_73" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_73) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi -if [ -f "/etc/php/7.3/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.3/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/install/debian/10/templates/web/apache2/PHP-FPM-73-public.stpl b/install/debian/10/templates/web/apache2/PHP-FPM-73-public.stpl deleted file mode 100644 index 39777224..00000000 --- a/install/debian/10/templates/web/apache2/PHP-FPM-73-public.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/10/templates/web/apache2/PHP-FPM-73-public.tpl b/install/debian/10/templates/web/apache2/PHP-FPM-73-public.tpl deleted file mode 100644 index b6e306d7..00000000 --- a/install/debian/10/templates/web/apache2/PHP-FPM-73-public.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/10/templates/web/apache2/PHP-FPM-73.sh b/install/debian/10/templates/web/apache2/PHP-FPM-73.sh deleted file mode 100755 index a2fea927..00000000 --- a/install/debian/10/templates/web/apache2/PHP-FPM-73.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.3-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_73" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_73) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi -if [ -f "/etc/php/7.3/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.3/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/install/debian/10/templates/web/apache2/PHP-FPM-73.stpl b/install/debian/10/templates/web/apache2/PHP-FPM-73.stpl deleted file mode 100644 index 902d647a..00000000 --- a/install/debian/10/templates/web/apache2/PHP-FPM-73.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/10/templates/web/apache2/PHP-FPM-73.tpl b/install/debian/10/templates/web/apache2/PHP-FPM-73.tpl deleted file mode 100644 index 40df2629..00000000 --- a/install/debian/10/templates/web/apache2/PHP-FPM-73.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/10/templates/web/awstats/awstats.tpl b/install/debian/10/templates/web/awstats/awstats.tpl deleted file mode 100755 index 6bb51c50..00000000 --- a/install/debian/10/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1" -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/debian/10/templates/web/awstats/index.tpl b/install/debian/10/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/debian/10/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/debian/10/templates/web/awstats/nav.tpl b/install/debian/10/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/debian/10/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/debian/10/templates/web/nginx/caching.sh b/install/debian/10/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/debian/10/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/debian/10/templates/web/nginx/caching.stpl b/install/debian/10/templates/web/nginx/caching.stpl deleted file mode 100644 index f5c9740f..00000000 --- a/install/debian/10/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/caching.tpl b/install/debian/10/templates/web/nginx/caching.tpl deleted file mode 100644 index 73de28d5..00000000 --- a/install/debian/10/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/force-https-legacy.stpl b/install/debian/10/templates/web/nginx/force-https-legacy.stpl deleted file mode 100644 index 79e55a26..00000000 --- a/install/debian/10/templates/web/nginx/force-https-legacy.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/force-https-legacy.tpl b/install/debian/10/templates/web/nginx/force-https-legacy.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/10/templates/web/nginx/force-https-legacy.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/10/templates/web/nginx/force-https-public.stpl b/install/debian/10/templates/web/nginx/force-https-public.stpl deleted file mode 100644 index ac422df6..00000000 --- a/install/debian/10/templates/web/nginx/force-https-public.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/force-https-public.tpl b/install/debian/10/templates/web/nginx/force-https-public.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/10/templates/web/nginx/force-https-public.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl deleted file mode 100644 index 7e0e71d1..00000000 --- a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/10/templates/web/nginx/force-https-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/10/templates/web/nginx/force-https.stpl b/install/debian/10/templates/web/nginx/force-https.stpl deleted file mode 100644 index 33fab443..00000000 --- a/install/debian/10/templates/web/nginx/force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/force-https.tpl b/install/debian/10/templates/web/nginx/force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/10/templates/web/nginx/force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/10/templates/web/nginx/hosting-legacy.sh b/install/debian/10/templates/web/nginx/hosting-legacy.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/10/templates/web/nginx/hosting-legacy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/10/templates/web/nginx/hosting-legacy.stpl b/install/debian/10/templates/web/nginx/hosting-legacy.stpl deleted file mode 100644 index a34b4bf1..00000000 --- a/install/debian/10/templates/web/nginx/hosting-legacy.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting-legacy.tpl b/install/debian/10/templates/web/nginx/hosting-legacy.tpl deleted file mode 100644 index a41d4054..00000000 --- a/install/debian/10/templates/web/nginx/hosting-legacy.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting-public.stpl b/install/debian/10/templates/web/nginx/hosting-public.stpl deleted file mode 100644 index ac422df6..00000000 --- a/install/debian/10/templates/web/nginx/hosting-public.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting-public.tpl b/install/debian/10/templates/web/nginx/hosting-public.tpl deleted file mode 100644 index f5d8b327..00000000 --- a/install/debian/10/templates/web/nginx/hosting-public.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl b/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl deleted file mode 100644 index 7e0e71d1..00000000 --- a/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.tpl b/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.tpl deleted file mode 100644 index f84f4781..00000000 --- a/install/debian/10/templates/web/nginx/hosting-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting.sh b/install/debian/10/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/10/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/10/templates/web/nginx/hosting.stpl b/install/debian/10/templates/web/nginx/hosting.stpl deleted file mode 100644 index 755caadf..00000000 --- a/install/debian/10/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/hosting.tpl b/install/debian/10/templates/web/nginx/hosting.tpl deleted file mode 100644 index 61469ad2..00000000 --- a/install/debian/10/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index cf8fad56..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 5931f617..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index 3c2793d1..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index bb9a727b..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,126 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/default.stpl b/install/debian/10/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/default.tpl b/install/debian/10/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/default_host.stpl b/install/debian/10/templates/web/nginx/php-fpm/default_host.stpl deleted file mode 100644 index 005705ce..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/default_host.stpl +++ /dev/null @@ -1,62 +0,0 @@ -### -# this file directory: -# /usr/local/vesta/data/templates/web/nginx/php-fpm/default_host.stpl -# -# -### -server { - listen %ip%:%web_ssl_port% ssl http2 default_server; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - access_log off; - log_not_found off; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/default_host.tpl b/install/debian/10/templates/web/nginx/php-fpm/default_host.tpl deleted file mode 100644 index 45b8476e..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/default_host.tpl +++ /dev/null @@ -1,77 +0,0 @@ -# -# this file directory: /usr/local/vesta/data/templates/web/nginx/php-fpm/ -# -server { - listen %ip%:%web_port% default_server; - server_name %domain_idn% %alias_idn%; - # redirect http > httpS (www cut) - return 301 https://%domain_idn%$request_uri; - root %docroot%; - index index.php index.html; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - # запрещаем всем доступ - # access is denied to everyone - deny all; - # не засоряем лог отказом в доступе - # we do not clog the blog with access denial - access_log off; - log_not_found off; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; - - gzip on; - gzip_static on; - gzip_proxied any; - gzip_min_length 512; - gzip_buffers 16 8k; - gzip_comp_level 3; - gzip_vary on; - gzip_types - application/atom+xml - application/javascript - application/json - application/ld+json - application/manifest+json - application/rss+xml - application/vnd.geo+json - application/vnd.ms-fontobject - application/x-font-ttf - application/x-web-app-manifest+json - application/xhtml+xml - application/xml - font/opentype - image/bmp - image/svg+xml - image/x-icon - text/cache-manifest - text/css - text/plain - text/vcard - text/vnd.rim.location.xloc - text/vtt - text/x-component - text/x-cross-domain-policy; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index a7564705..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 6e67a4e0..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal6.tpl b/install/debian/10/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index d1096bff..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal7.tpl b/install/debian/10/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl b/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/drupal8.tpl b/install/debian/10/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl b/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index d4f96ee3..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/joomla.tpl b/install/debian/10/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl b/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index db0b4dde..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/laravel.tpl b/install/debian/10/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/magento.stpl b/install/debian/10/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index f8ac30c9..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,197 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/magento.tpl b/install/debian/10/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/modx.stpl b/install/debian/10/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index 420aeb9e..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,68 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/modx.tpl b/install/debian/10/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl b/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index 8594ec94..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/moodle.tpl b/install/debian/10/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl b/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 4bb50383..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/no-php.tpl b/install/debian/10/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl b/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index e28afcfc..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/odoo.tpl b/install/debian/10/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl b/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 52706d21..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,58 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/opencart.tpl b/install/debian/10/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 1b803f97..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/owncloud.tpl b/install/debian/10/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl b/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 1b299343..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/piwik.tpl b/install/debian/10/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index d26ed9f4..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/debian/10/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/sendy.stpl b/install/debian/10/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/sendy.tpl b/install/debian/10/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress.tpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index 01dfee5b..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index a5fc46fb..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/debian/10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/private-force-https.stpl b/install/debian/10/templates/web/nginx/private-force-https.stpl deleted file mode 100644 index 64094fb8..00000000 --- a/install/debian/10/templates/web/nginx/private-force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/10/templates/web/nginx/private-force-https.tpl b/install/debian/10/templates/web/nginx/private-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/10/templates/web/nginx/private-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/10/templates/web/nginx/private-hosting.sh b/install/debian/10/templates/web/nginx/private-hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/10/templates/web/nginx/private-hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/10/templates/web/nginx/private-hosting.stpl b/install/debian/10/templates/web/nginx/private-hosting.stpl deleted file mode 100644 index fd9471bd..00000000 --- a/install/debian/10/templates/web/nginx/private-hosting.stpl +++ /dev/null @@ -1,41 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/private-hosting.tpl b/install/debian/10/templates/web/nginx/private-hosting.tpl deleted file mode 100644 index a8ee840e..00000000 --- a/install/debian/10/templates/web/nginx/private-hosting.tpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/10/templates/web/nginx/proxy_ip.tpl b/install/debian/10/templates/web/nginx/proxy_ip.tpl deleted file mode 100644 index ae195617..00000000 --- a/install/debian/10/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/debian/10/templates/web/php-fpm/default.tpl b/install/debian/10/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/debian/10/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/10/templates/web/php-fpm/no-php.tpl b/install/debian/10/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/debian/10/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/10/templates/web/php-fpm/socket.tpl b/install/debian/10/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/debian/10/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/10/templates/web/skel/document_errors/403.html b/install/debian/10/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/debian/10/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/debian/10/templates/web/skel/document_errors/404.html b/install/debian/10/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/debian/10/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/debian/10/templates/web/skel/document_errors/50x.html b/install/debian/10/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/debian/10/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/debian/10/templates/web/skel/public_html/index.html b/install/debian/10/templates/web/skel/public_html/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/10/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/10/templates/web/skel/public_html/robots.txt b/install/debian/10/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/10/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/10/templates/web/skel/public_shtml/index.html b/install/debian/10/templates/web/skel/public_shtml/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/10/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/10/templates/web/skel/public_shtml/robots.txt b/install/debian/10/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/10/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/10/templates/web/suspend/.htaccess b/install/debian/10/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/debian/10/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/debian/10/templates/web/suspend/index.html b/install/debian/10/templates/web/suspend/index.html deleted file mode 100755 index 3815354d..00000000 --- a/install/debian/10/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

Temporary under construction

-

This website is temporary under construction.

-
- We will back again soon. -
- - diff --git a/install/debian/10/templates/web/webalizer/webalizer.tpl b/install/debian/10/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/debian/10/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/debian/10/vsftpd/vsftpd.conf b/install/debian/10/vsftpd/vsftpd.conf deleted file mode 100644 index 1ca1a992..00000000 --- a/install/debian/10/vsftpd/vsftpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -#allow_writable_chroot=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_max_port=12100 -pasv_min_port=12000 -use_localtime=YES diff --git a/install/debian/11/apache2/apache2.conf b/install/debian/11/apache2/apache2.conf deleted file mode 100644 index 2be3e50d..00000000 --- a/install/debian/11/apache2/apache2.conf +++ /dev/null @@ -1,95 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 900 -ProxyTimeout 900 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/debian/11/apache2/status.conf b/install/debian/11/apache2/status.conf deleted file mode 100644 index 0d82a356..00000000 --- a/install/debian/11/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - # Allow from all - diff --git a/install/debian/11/bind/named.conf b/install/debian/11/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/debian/11/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/debian/11/clamav/clamd.conf b/install/debian/11/clamav/clamd.conf deleted file mode 100644 index c636b6d3..00000000 --- a/install/debian/11/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean true -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 2M -MaxFileSize 2M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/debian/11/deb_signing.key b/install/debian/11/deb_signing.key deleted file mode 100644 index d279abbd..00000000 --- a/install/debian/11/deb_signing.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/11/dovecot/conf.d/10-auth.conf b/install/debian/11/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/debian/11/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/debian/11/dovecot/conf.d/10-logging.conf b/install/debian/11/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/debian/11/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/debian/11/dovecot/conf.d/10-mail.conf b/install/debian/11/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/debian/11/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/debian/11/dovecot/conf.d/10-master.conf b/install/debian/11/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/debian/11/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/debian/11/dovecot/conf.d/10-ssl.conf b/install/debian/11/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 3aaff6ee..00000000 --- a/install/debian/11/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,3 +0,0 @@ -ssl = yes -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - mail_max_userip_connections = 50 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/debian/11/dovecot/conf.d/auth-passwdfile.conf.ext b/install/debian/11/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/debian/11/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/debian/11/dovecot/dovecot.conf b/install/debian/11/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/debian/11/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/debian/11/exim/deny_senders b/install/debian/11/exim/deny_senders deleted file mode 100644 index 8b137891..00000000 --- a/install/debian/11/exim/deny_senders +++ /dev/null @@ -1 +0,0 @@ - diff --git a/install/debian/11/exim/dnsbl.conf b/install/debian/11/exim/dnsbl.conf deleted file mode 100644 index 279bafcd..00000000 --- a/install/debian/11/exim/dnsbl.conf +++ /dev/null @@ -1 +0,0 @@ -bl.spamcop.net diff --git a/install/debian/11/exim/exim4.conf.template b/install/debian/11/exim/exim4.conf.template deleted file mode 100644 index 3f09a2e8..00000000 --- a/install/debian/11/exim/exim4.conf.template +++ /dev/null @@ -1,418 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= -smtputf8_advertise_hosts = - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -recipients_max = 15 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Web site is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg - from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/11/exim/exim4.conf.template-RC b/install/debian/11/exim/exim4.conf.template-RC deleted file mode 100644 index 82b97d4e..00000000 --- a/install/debian/11/exim/exim4.conf.template-RC +++ /dev/null @@ -1,449 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= -smtputf8_advertise_hosts = - -#local_interfaces = 0.0.0.0 -#smtp_active_hostname = ${lookup{$interface_address}lsearch{/etc/exim4/virtual/helo_data}{$value}} -#smtp_banner = "$smtp_active_hostname ESMTP $tod_full" - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS = 15 -LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS = 5 -LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 -LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 - -recipients_max = 150 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/$received_ip_address.crt -tls_privatekey = /usr/local/vesta/ssl/$received_ip_address.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_recipients}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Hosting account is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = yes - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_recipients}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = no - - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - set acl_m3 = yes - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #interface = ${if eq{$acl_m3}{yes}{FIRSTIP}{${lookup{$sender_address_domain}lsearch{/etc/exim4/virtual/interfaces} {$value}{SECONDIP}}}} - #helo_data = "${if eq{$acl_m3}{yes}{FIRSTHOST}{${lookup{$sending_ip_address}lsearch{/etc/exim4/virtual/helo_data}{$value}{SECONDHOST}}}}" - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg - from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/11/exim/spam-blocks.conf b/install/debian/11/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/debian/11/fail2ban/action.d/vesta.conf b/install/debian/11/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/debian/11/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/debian/11/fail2ban/filter.d/vesta.conf b/install/debian/11/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 36ec1001..00000000 --- a/install/debian/11/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccessful Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/debian/11/fail2ban/jail.local b/install/debian/11/fail2ban/jail.local deleted file mode 100644 index eccea068..00000000 --- a/install/debian/11/fail2ban/jail.local +++ /dev/null @@ -1,39 +0,0 @@ -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 diff --git a/install/debian/11/firewall/ports.conf b/install/debian/11/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/debian/11/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/debian/11/firewall/rules.conf b/install/debian/11/firewall/rules.conf deleted file mode 100644 index 6da5a1c4..00000000 --- a/install/debian/11/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='yes' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/debian/11/logrotate/apache2 b/install/debian/11/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/debian/11/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/debian/11/logrotate/dovecot b/install/debian/11/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/debian/11/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/debian/11/logrotate/nginx b/install/debian/11/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/debian/11/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/debian/11/logrotate/vesta b/install/debian/11/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/debian/11/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/debian/11/mysql/my-large.cnf b/install/debian/11/mysql/my-large.cnf deleted file mode 100644 index b056c316..00000000 --- a/install/debian/11/mysql/my-large.cnf +++ /dev/null @@ -1,51 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M -thread_concurrency = 8 - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/11/mysql/my-medium.cnf b/install/debian/11/mysql/my-medium.cnf deleted file mode 100644 index 33aa04c2..00000000 --- a/install/debian/11/mysql/my-medium.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/11/mysql/my-small.cnf b/install/debian/11/mysql/my-small.cnf deleted file mode 100644 index 857f48ce..00000000 --- a/install/debian/11/mysql/my-small.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/11/nginx/nginx.conf b/install/debian/11/nginx/nginx.conf deleted file mode 100644 index 6d5e36ba..00000000 --- a/install/debian/11/nginx/nginx.conf +++ /dev/null @@ -1,140 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -timer_resolution 50ms; #In order to free some CPU cycles -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 900; - proxy_send_timeout 900; - proxy_read_timeout 900; - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/13; - set_real_ip_from 104.24.0.0/14; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 2400:cb00::/32; - set_real_ip_from 2606:4700::/32; - set_real_ip_from 2803:f800::/32; - set_real_ip_from 2405:b500::/32; - set_real_ip_from 2405:8100::/32; - set_real_ip_from 2a06:98c0::/29; - set_real_ip_from 2c0f:f248::/32; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/debian/11/nginx/phpmyadmin.inc b/install/debian/11/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/debian/11/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/debian/11/nginx/phppgadmin.inc b/install/debian/11/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/debian/11/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/11/nginx/status.conf b/install/debian/11/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/debian/11/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/debian/11/nginx/webmail.inc b/install/debian/11/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/debian/11/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/11/packages/default.pkg b/install/debian/11/packages/default.pkg deleted file mode 100644 index 45a34c96..00000000 --- a/install/debian/11/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='PHP-FPM-74' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='unlimited' -WEB_ALIASES='unlimited' -DNS_DOMAINS='unlimited' -DNS_RECORDS='unlimited' -MAIL_DOMAINS='unlimited' -MAIL_ACCOUNTS='unlimited' -DATABASES='unlimited' -CRON_JOBS='unlimited' -DISK_QUOTA='unlimited' -BANDWIDTH='unlimited' -NS='YOURHOSTNAME1,YOURHOSTNAME2' -SHELL='nologin' -BACKUPS='2' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/11/pga/config.inc.php b/install/debian/11/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/debian/11/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/debian/11/pga/phppgadmin.conf b/install/debian/11/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/debian/11/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/debian/11/php-fpm/www.conf b/install/debian/11/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/debian/11/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/debian/11/php/php7.3-dedi.patch b/install/debian/11/php/php7.3-dedi.patch deleted file mode 100644 index c044e002..00000000 --- a/install/debian/11/php/php7.3-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/11/php/php7.3-vps.patch b/install/debian/11/php/php7.3-vps.patch deleted file mode 100644 index 803b93e8..00000000 --- a/install/debian/11/php/php7.3-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/11/php/php7.4-dedi.patch b/install/debian/11/php/php7.4-dedi.patch deleted file mode 100644 index 3e5bd2fb..00000000 --- a/install/debian/11/php/php7.4-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.4/fpm/php.ini.orig 2021-07-16 16:12:30.027464762 +0200 -+++ /etc/php/7.4/fpm/php.ini 2021-07-16 16:25:15.000000000 +0200 -@@ -309,7 +309,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -402,11 +403,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -691,7 +692,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -843,7 +844,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1089,7 +1090,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1766,20 +1767,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/11/php/php7.4-vps.patch b/install/debian/11/php/php7.4-vps.patch deleted file mode 100644 index 7c52d402..00000000 --- a/install/debian/11/php/php7.4-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.4/fpm/php.ini.orig 2021-07-16 16:12:30.027464762 +0200 -+++ /etc/php/7.4/fpm/php.ini 2021-07-16 16:24:26.000000000 +0200 -@@ -309,7 +309,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -402,11 +403,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -691,7 +692,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -843,7 +844,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1089,7 +1090,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1766,20 +1767,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/11/pma/apache.conf b/install/debian/11/pma/apache.conf deleted file mode 100644 index 2a8f69e2..00000000 --- a/install/debian/11/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/debian/11/pma/config.inc.php b/install/debian/11/pma/config.inc.php deleted file mode 100644 index eafc6d67..00000000 --- a/install/debian/11/pma/config.inc.php +++ /dev/null @@ -1,146 +0,0 @@ -> $pmapath1 -sed -i '/savedsearches/d' $pmapath1 -sed -i '/navigationhiding/d' $pmapath1 -sed -i '/users/d' $pmapath1 -sed -i '/controlpass/d' $pmapath1 -sed -i '/favorite/d' $pmapath1 -sed -i '/usergroups/d' $pmapath1 -sed -i '/central_columns/d' $pmapath1 -sed -i '/designer_settings/d' $pmapath1 -sed -i '/export_templates/d' $pmapath1 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath1 - -sed -i '/pmadb/d' $pmapath2 -sed -i '/controluser/d' $pmapath2 -sed -i '/bookmarktable/d' $pmapath2 -sed -i '/relation/d' $pmapath2 -sed -i '/userconfig/d' $pmapath2 -sed -i '/table_info/d' $pmapath2 -sed -i '/column_info/d' $pmapath2 -sed -i '/history/d' $pmapath2 -sed -i '/recent/d' $pmapath2 -sed -i '/table_uiprefs/d' $pmapath2 -sed -i '/tracking/d' $pmapath2 -sed -i '/table_coords/d' $pmapath2 -sed -i '/pdf_pages/d' $pmapath2 -sed -i '/designer_coords/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/savedsearches/d' $pmapath2 -sed -i '/navigationhiding/d' $pmapath2 -sed -i '/users/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/favorite/d' $pmapath2 -sed -i '/usergroups/d' $pmapath2 -sed -i '/central_columns/d' $pmapath2 -sed -i '/designer_settings/d' $pmapath2 -sed -i '/export_templates/d' $pmapath2 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath2 - -#SOME WORK with DATABASE (table / user) -PMADB=phpmyadmin -PMAUSER=pma - -#DROP USER and TABLE -mysql -uroot < - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 100 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - - - Umask 002 - - IdentLookups off - - AllowOverwrite yes - - AllowAll - - diff --git a/install/debian/11/proftpd/tls.conf b/install/debian/11/proftpd/tls.conf deleted file mode 100644 index 9da0017b..00000000 --- a/install/debian/11/proftpd/tls.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# Proftpd sample configuration for FTPS connections. -# -# Note that FTPS impose some limitations in NAT traversing. -# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html -# for more information. -# - - # If mod_tls was built as a shared/DSO module, load it - LoadModule mod_tls.c - - -TLSEngine on -TLSLog /var/log/proftpd/tls.log -# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2 -TLSProtocol TLSv1.1 TLSv1.2 -# -# Server SSL certificate. You can generate a self-signed certificate using -# a command like: -# -# openssl req -x509 -newkey rsa:1024 \ -# -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \ -# -nodes -days 365 -# -# The proftpd.key file must be readable by root only. The other file can be -# readable by anyone. -# -# chmod 0600 /etc/ssl/private/proftpd.key -# chmod 0640 /etc/ssl/private/proftpd.key -# -TLSRSACertificateFile /usr/local/vesta/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/vesta/ssl/certificate.key -# -# CA the server trusts... -#TLSCACertificateFile /etc/ssl/certs/CA.pem -# ...or avoid CA cert and be verbose -#TLSOptions NoCertRequest EnableDiags -# ... or the same with relaxed session use for some clients (e.g. FireFtp) -#TLSOptions NoCertRequest EnableDiags NoSessionReuseRequired -# -# -# Per default drop connection if client tries to start a renegotiate -# This is a fix for CVE-2009-3555 but could break some clients. -# -#TLSOptions AllowClientRenegotiations -# -TLSOptions NoSessionReuseRequired AllowClientRenegotiations -# Authenticate clients that want to use FTP over TLS? -# -#TLSVerifyClient off -# -# Are clients required to use FTP over TLS when talking to this server? -# -TLSRequired off -# -# Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support -# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these -# clients will close the data connection, or there will be a timeout -# on an idle data connection. -# -TLSRenegotiate required off - diff --git a/install/debian/11/roundcube/apache.conf b/install/debian/11/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/debian/11/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/debian/11/roundcube/config.inc.php b/install/debian/11/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/debian/11/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/debian/11/roundcube/main.inc.php b/install/debian/11/roundcube/main.inc.php deleted file mode 100644 index 91f32000..00000000 --- a/install/debian/11/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = true; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = false; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'elastic'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 300 seconds (5min) -$rcmail_config['draft_autosave'] = 300; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/debian/11/roundcube/vesta.php b/install/debian/11/roundcube/vesta.php deleted file mode 100644 index b3dd167f..00000000 --- a/install/debian/11/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} diff --git a/install/debian/11/sudo/admin b/install/debian/11/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/debian/11/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/11/templates/dns/child-ns.tpl b/install/debian/11/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/debian/11/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/11/templates/dns/default.tpl b/install/debian/11/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/debian/11/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/11/templates/dns/gmail.tpl b/install/debian/11/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/debian/11/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/11/templates/dns/office365.tpl b/install/debian/11/templates/dns/office365.tpl deleted file mode 100644 index dcf556e1..00000000 --- a/install/debian/11/templates/dns/office365.tpl +++ /dev/null @@ -1,22 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:spf.protection.outlook.com -all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='MX' PRIORITY='0' VALUE='XXXXXXX.mail.protection.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"MS=msXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='autodiscover' TYPE='CNAME' PRIORITY='' VALUE='autodiscover.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='sip' TYPE='CNAME' PRIORITY='' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='lyncdiscover' TYPE='CNAME' PRIORITY='' VALUE='webdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='19' RECORD='enterpriseregistration' TYPE='CNAME' PRIORITY='' VALUE='enterpriseregistration.windows.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='20' RECORD='enterpriseenrollment' TYPE='CNAME' PRIORITY='' VALUE='enterpriseenrollment.manage.microsoft.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='21' RECORD='_sip._tls' TYPE='SRV' PRIORITY='100 1 443' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='22' RECORD='_sipfederationtls._tcp' TYPE='SRV' PRIORITY='100 1 5061' VALUE='sipfed.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/11/templates/dns/yandex.tpl b/install/debian/11/templates/dns/yandex.tpl deleted file mode 100644 index 4ce768fe..00000000 --- a/install/debian/11/templates/dns/yandex.tpl +++ /dev/null @@ -1,16 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.yandex.net ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"yandex-verification: XXXXXXXXXXXXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/11/templates/web/apache2/PHP-FPM-74-public.sh b/install/debian/11/templates/web/apache2/PHP-FPM-74-public.sh deleted file mode 100755 index e72bb003..00000000 --- a/install/debian/11/templates/web/apache2/PHP-FPM-74-public.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_74" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_74) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi -if [ -f "/etc/php/7.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.4/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/install/debian/11/templates/web/apache2/PHP-FPM-74-public.stpl b/install/debian/11/templates/web/apache2/PHP-FPM-74-public.stpl deleted file mode 100644 index 739cb48d..00000000 --- a/install/debian/11/templates/web/apache2/PHP-FPM-74-public.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/11/templates/web/apache2/PHP-FPM-74-public.tpl b/install/debian/11/templates/web/apache2/PHP-FPM-74-public.tpl deleted file mode 100644 index f31ed5a8..00000000 --- a/install/debian/11/templates/web/apache2/PHP-FPM-74-public.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/11/templates/web/apache2/PHP-FPM-74.sh b/install/debian/11/templates/web/apache2/PHP-FPM-74.sh deleted file mode 100755 index e72bb003..00000000 --- a/install/debian/11/templates/web/apache2/PHP-FPM-74.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_74" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_74) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi -if [ -f "/etc/php/7.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.4/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/install/debian/11/templates/web/apache2/PHP-FPM-74.stpl b/install/debian/11/templates/web/apache2/PHP-FPM-74.stpl deleted file mode 100644 index fbc1d9c6..00000000 --- a/install/debian/11/templates/web/apache2/PHP-FPM-74.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/11/templates/web/apache2/PHP-FPM-74.tpl b/install/debian/11/templates/web/apache2/PHP-FPM-74.tpl deleted file mode 100644 index aaf8f62c..00000000 --- a/install/debian/11/templates/web/apache2/PHP-FPM-74.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/11/templates/web/awstats/awstats.tpl b/install/debian/11/templates/web/awstats/awstats.tpl deleted file mode 100755 index 6bb51c50..00000000 --- a/install/debian/11/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1" -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/debian/11/templates/web/awstats/index.tpl b/install/debian/11/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/debian/11/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/debian/11/templates/web/awstats/nav.tpl b/install/debian/11/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/debian/11/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/debian/11/templates/web/nginx/caching.sh b/install/debian/11/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/debian/11/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/debian/11/templates/web/nginx/caching.stpl b/install/debian/11/templates/web/nginx/caching.stpl deleted file mode 100644 index f5c9740f..00000000 --- a/install/debian/11/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/caching.tpl b/install/debian/11/templates/web/nginx/caching.tpl deleted file mode 100644 index 73de28d5..00000000 --- a/install/debian/11/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/force-https-legacy.stpl b/install/debian/11/templates/web/nginx/force-https-legacy.stpl deleted file mode 100644 index 79e55a26..00000000 --- a/install/debian/11/templates/web/nginx/force-https-legacy.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/force-https-legacy.tpl b/install/debian/11/templates/web/nginx/force-https-legacy.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/11/templates/web/nginx/force-https-legacy.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/11/templates/web/nginx/force-https-public.stpl b/install/debian/11/templates/web/nginx/force-https-public.stpl deleted file mode 100644 index ac422df6..00000000 --- a/install/debian/11/templates/web/nginx/force-https-public.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/force-https-public.tpl b/install/debian/11/templates/web/nginx/force-https-public.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/11/templates/web/nginx/force-https-public.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.stpl deleted file mode 100644 index 7e0e71d1..00000000 --- a/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/11/templates/web/nginx/force-https-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/11/templates/web/nginx/force-https.stpl b/install/debian/11/templates/web/nginx/force-https.stpl deleted file mode 100644 index 33fab443..00000000 --- a/install/debian/11/templates/web/nginx/force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/force-https.tpl b/install/debian/11/templates/web/nginx/force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/11/templates/web/nginx/force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/11/templates/web/nginx/hosting-legacy.sh b/install/debian/11/templates/web/nginx/hosting-legacy.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/11/templates/web/nginx/hosting-legacy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/11/templates/web/nginx/hosting-legacy.stpl b/install/debian/11/templates/web/nginx/hosting-legacy.stpl deleted file mode 100644 index a34b4bf1..00000000 --- a/install/debian/11/templates/web/nginx/hosting-legacy.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting-legacy.tpl b/install/debian/11/templates/web/nginx/hosting-legacy.tpl deleted file mode 100644 index a41d4054..00000000 --- a/install/debian/11/templates/web/nginx/hosting-legacy.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting-public.stpl b/install/debian/11/templates/web/nginx/hosting-public.stpl deleted file mode 100644 index ac422df6..00000000 --- a/install/debian/11/templates/web/nginx/hosting-public.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting-public.tpl b/install/debian/11/templates/web/nginx/hosting-public.tpl deleted file mode 100644 index f5d8b327..00000000 --- a/install/debian/11/templates/web/nginx/hosting-public.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting-webmail-phpmyadmin.stpl b/install/debian/11/templates/web/nginx/hosting-webmail-phpmyadmin.stpl deleted file mode 100644 index 7e0e71d1..00000000 --- a/install/debian/11/templates/web/nginx/hosting-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting-webmail-phpmyadmin.tpl b/install/debian/11/templates/web/nginx/hosting-webmail-phpmyadmin.tpl deleted file mode 100644 index f84f4781..00000000 --- a/install/debian/11/templates/web/nginx/hosting-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting.sh b/install/debian/11/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/11/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/11/templates/web/nginx/hosting.stpl b/install/debian/11/templates/web/nginx/hosting.stpl deleted file mode 100644 index 755caadf..00000000 --- a/install/debian/11/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/hosting.tpl b/install/debian/11/templates/web/nginx/hosting.tpl deleted file mode 100644 index 61469ad2..00000000 --- a/install/debian/11/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/11/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index cf8fad56..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/debian/11/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/11/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 5931f617..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/debian/11/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/11/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index 3c2793d1..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/debian/11/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/11/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index bb9a727b..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,126 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/debian/11/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/default.stpl b/install/debian/11/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/default.tpl b/install/debian/11/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/11/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index a7564705..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/debian/11/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/11/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 6e67a4e0..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/drupal6.tpl b/install/debian/11/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index d1096bff..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/drupal7.stpl b/install/debian/11/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/drupal7.tpl b/install/debian/11/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/drupal8.stpl b/install/debian/11/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/drupal8.tpl b/install/debian/11/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/joomla.stpl b/install/debian/11/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index d4f96ee3..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/joomla.tpl b/install/debian/11/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/laravel.stpl b/install/debian/11/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index db0b4dde..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/laravel.tpl b/install/debian/11/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/magento.stpl b/install/debian/11/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index f8ac30c9..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,197 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/magento.tpl b/install/debian/11/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/modx.stpl b/install/debian/11/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index 420aeb9e..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,68 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/modx.tpl b/install/debian/11/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/moodle.stpl b/install/debian/11/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index 8594ec94..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/moodle.tpl b/install/debian/11/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/no-php.stpl b/install/debian/11/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 4bb50383..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/no-php.tpl b/install/debian/11/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/odoo.stpl b/install/debian/11/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index e28afcfc..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/odoo.tpl b/install/debian/11/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/opencart.stpl b/install/debian/11/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 52706d21..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,58 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/opencart.tpl b/install/debian/11/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/11/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 1b803f97..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/owncloud.tpl b/install/debian/11/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/piwik.stpl b/install/debian/11/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 1b299343..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/piwik.tpl b/install/debian/11/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/11/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index d26ed9f4..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/pyrocms.tpl b/install/debian/11/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/sendy.stpl b/install/debian/11/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/sendy.tpl b/install/debian/11/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/11/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/wordpress.tpl b/install/debian/11/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/11/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index 01dfee5b..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/wordpress2.tpl b/install/debian/11/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/11/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index a5fc46fb..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/debian/11/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/debian/11/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/private-force-https.stpl b/install/debian/11/templates/web/nginx/private-force-https.stpl deleted file mode 100644 index 64094fb8..00000000 --- a/install/debian/11/templates/web/nginx/private-force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/11/templates/web/nginx/private-force-https.tpl b/install/debian/11/templates/web/nginx/private-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/11/templates/web/nginx/private-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/11/templates/web/nginx/private-hosting.sh b/install/debian/11/templates/web/nginx/private-hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/11/templates/web/nginx/private-hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/11/templates/web/nginx/private-hosting.stpl b/install/debian/11/templates/web/nginx/private-hosting.stpl deleted file mode 100644 index fd9471bd..00000000 --- a/install/debian/11/templates/web/nginx/private-hosting.stpl +++ /dev/null @@ -1,41 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/private-hosting.tpl b/install/debian/11/templates/web/nginx/private-hosting.tpl deleted file mode 100644 index a8ee840e..00000000 --- a/install/debian/11/templates/web/nginx/private-hosting.tpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/11/templates/web/nginx/proxy_ip.tpl b/install/debian/11/templates/web/nginx/proxy_ip.tpl deleted file mode 100644 index ae195617..00000000 --- a/install/debian/11/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/debian/11/templates/web/php-fpm/default.tpl b/install/debian/11/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/debian/11/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/11/templates/web/php-fpm/no-php.tpl b/install/debian/11/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/debian/11/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/11/templates/web/php-fpm/socket.tpl b/install/debian/11/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/debian/11/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/11/templates/web/skel/document_errors/403.html b/install/debian/11/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/debian/11/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/debian/11/templates/web/skel/document_errors/404.html b/install/debian/11/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/debian/11/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/debian/11/templates/web/skel/document_errors/50x.html b/install/debian/11/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/debian/11/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/debian/11/templates/web/skel/public_html/index.html b/install/debian/11/templates/web/skel/public_html/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/11/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/11/templates/web/skel/public_html/robots.txt b/install/debian/11/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/11/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/11/templates/web/skel/public_shtml/index.html b/install/debian/11/templates/web/skel/public_shtml/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/11/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/11/templates/web/skel/public_shtml/robots.txt b/install/debian/11/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/11/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/11/templates/web/suspend/.htaccess b/install/debian/11/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/debian/11/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/debian/11/templates/web/suspend/index.html b/install/debian/11/templates/web/suspend/index.html deleted file mode 100755 index 3815354d..00000000 --- a/install/debian/11/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

Temporary under construction

-

This website is temporary under construction.

-
- We will back again soon. -
- - diff --git a/install/debian/11/templates/web/webalizer/webalizer.tpl b/install/debian/11/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/debian/11/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/debian/11/vsftpd/vsftpd.conf b/install/debian/11/vsftpd/vsftpd.conf deleted file mode 100644 index 1ca1a992..00000000 --- a/install/debian/11/vsftpd/vsftpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -#allow_writable_chroot=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_max_port=12100 -pasv_min_port=12000 -use_localtime=YES diff --git a/install/debian/12/apache2/apache2.conf b/install/debian/12/apache2/apache2.conf deleted file mode 100644 index 2be3e50d..00000000 --- a/install/debian/12/apache2/apache2.conf +++ /dev/null @@ -1,95 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 900 -ProxyTimeout 900 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/debian/12/apache2/status.conf b/install/debian/12/apache2/status.conf deleted file mode 100644 index 0d82a356..00000000 --- a/install/debian/12/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - # Allow from all - diff --git a/install/debian/12/bind/named.conf b/install/debian/12/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/debian/12/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/debian/12/clamav/clamd.conf b/install/debian/12/clamav/clamd.conf deleted file mode 100644 index c636b6d3..00000000 --- a/install/debian/12/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean true -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 2M -MaxFileSize 2M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/debian/12/deb_signing.key b/install/debian/12/deb_signing.key deleted file mode 100644 index d279abbd..00000000 --- a/install/debian/12/deb_signing.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/12/dovecot/conf.d/10-auth.conf b/install/debian/12/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/debian/12/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/debian/12/dovecot/conf.d/10-logging.conf b/install/debian/12/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/debian/12/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/debian/12/dovecot/conf.d/10-mail.conf b/install/debian/12/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/debian/12/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/debian/12/dovecot/conf.d/10-master.conf b/install/debian/12/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/debian/12/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/debian/12/dovecot/conf.d/10-ssl.conf b/install/debian/12/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 3aaff6ee..00000000 --- a/install/debian/12/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,3 +0,0 @@ -ssl = yes -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - mail_max_userip_connections = 50 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/debian/12/dovecot/conf.d/auth-passwdfile.conf.ext b/install/debian/12/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/debian/12/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/debian/12/dovecot/dovecot.conf b/install/debian/12/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/debian/12/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/debian/12/exim/deny_senders b/install/debian/12/exim/deny_senders deleted file mode 100644 index 8b137891..00000000 --- a/install/debian/12/exim/deny_senders +++ /dev/null @@ -1 +0,0 @@ - diff --git a/install/debian/12/exim/dnsbl.conf b/install/debian/12/exim/dnsbl.conf deleted file mode 100644 index 279bafcd..00000000 --- a/install/debian/12/exim/dnsbl.conf +++ /dev/null @@ -1 +0,0 @@ -bl.spamcop.net diff --git a/install/debian/12/exim/exim4.conf.template b/install/debian/12/exim/exim4.conf.template deleted file mode 100644 index 15264797..00000000 --- a/install/debian/12/exim/exim4.conf.template +++ /dev/null @@ -1,487 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= -smtputf8_advertise_hosts = - -SRS_SECRET = ${readfile{/etc/exim4/srs.conf}} - -#local_interfaces = 0.0.0.0 -#smtp_active_hostname = ${lookup{$interface_address}lsearch{/etc/exim4/virtual/helo_data}{$value}} -#smtp_banner = "$smtp_active_hostname ESMTP $tod_full" - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS = 15 -LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS = 5 -LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 -LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 - -recipients_max = 150 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_recipients}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Hosting account is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = yes - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_recipients}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = no - - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if eq{${lookup{$domain}dsearch{/etc/exim4/domains/}}}{}{false}{true}} - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - set acl_m3 = yes - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - # if outbound, and forwarding has been done, use an alternate transport - domains = ! +local_domains - transport = ${if eq {$local_part@$domain} \ - {$original_local_part@$original_domain} \ - {remote_smtp} {remote_forwarded_smtp}} - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -inbound_srs: - driver = redirect - senders = : - domains = +local_domains - # detect inbound bounces which are converted to SRS, and decode them - condition = ${if inbound_srs {$local_part} {SRS_SECRET}} - data = $srs_recipient - -inbound_srs_failure: - driver = redirect - senders = : - domains = +local_domains - # detect inbound bounces which look converted to SRS but are invalid - condition = ${if inbound_srs {$local_part} {}} - allow_fail - data = :fail: Invalid SRS recipient address - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #interface = ${if eq{$acl_m3}{yes}{FIRSTIP}{${lookup{$sender_address_domain}lsearch{/etc/exim4/virtual/interfaces} {$value}{SECONDIP}}}} - #helo_data = "${if eq{$acl_m3}{yes}{FIRSTHOST}{${lookup{$sending_ip_address}lsearch{/etc/exim4/virtual/helo_data}{$value}{SECONDHOST}}}}" - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - message_linelength_limit = 1G - -remote_forwarded_smtp: - driver = smtp - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - message_linelength_limit = 1G - # modify the envelope from, for mails that we forward - max_rcpt = 1 - return_path = ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}} - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg - from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/12/exim/exim4.conf.template.without-srs b/install/debian/12/exim/exim4.conf.template.without-srs deleted file mode 100644 index 78eda468..00000000 --- a/install/debian/12/exim/exim4.conf.template.without-srs +++ /dev/null @@ -1,451 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= -smtputf8_advertise_hosts = - -#local_interfaces = 0.0.0.0 -#smtp_active_hostname = ${lookup{$interface_address}lsearch{/etc/exim4/virtual/helo_data}{$value}} -#smtp_banner = "$smtp_active_hostname ESMTP $tod_full" - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS = 15 -LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS = 5 -LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 -LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 - -recipients_max = 150 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_recipients}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Hosting account is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = yes - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_recipients}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = no - - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if eq{${lookup{$domain}dsearch{/etc/exim4/domains/}}}{}{false}{true}} - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - set acl_m3 = yes - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #interface = ${if eq{$acl_m3}{yes}{FIRSTIP}{${lookup{$sender_address_domain}lsearch{/etc/exim4/virtual/interfaces} {$value}{SECONDIP}}}} - #helo_data = "${if eq{$acl_m3}{yes}{FIRSTHOST}{${lookup{$sending_ip_address}lsearch{/etc/exim4/virtual/helo_data}{$value}{SECONDHOST}}}}" - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - message_linelength_limit = 1G - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg - from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/12/exim/spam-blocks.conf b/install/debian/12/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/debian/12/fail2ban/action.d/vesta.conf b/install/debian/12/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/debian/12/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/debian/12/fail2ban/filter.d/vesta.conf b/install/debian/12/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 36ec1001..00000000 --- a/install/debian/12/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccessful Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/debian/12/fail2ban/jail.local b/install/debian/12/fail2ban/jail.local deleted file mode 100644 index eccea068..00000000 --- a/install/debian/12/fail2ban/jail.local +++ /dev/null @@ -1,39 +0,0 @@ -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 diff --git a/install/debian/12/firewall/ports.conf b/install/debian/12/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/debian/12/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/debian/12/firewall/rules.conf b/install/debian/12/firewall/rules.conf deleted file mode 100644 index 6da5a1c4..00000000 --- a/install/debian/12/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='yes' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/debian/12/logrotate/apache2 b/install/debian/12/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/debian/12/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/debian/12/logrotate/dovecot b/install/debian/12/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/debian/12/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/debian/12/logrotate/nginx b/install/debian/12/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/debian/12/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/debian/12/logrotate/vesta b/install/debian/12/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/debian/12/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/debian/12/mysql/my-large.cnf b/install/debian/12/mysql/my-large.cnf deleted file mode 100644 index b056c316..00000000 --- a/install/debian/12/mysql/my-large.cnf +++ /dev/null @@ -1,51 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M -thread_concurrency = 8 - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/12/mysql/my-medium.cnf b/install/debian/12/mysql/my-medium.cnf deleted file mode 100644 index 33aa04c2..00000000 --- a/install/debian/12/mysql/my-medium.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/12/mysql/my-small.cnf b/install/debian/12/mysql/my-small.cnf deleted file mode 100644 index 857f48ce..00000000 --- a/install/debian/12/mysql/my-small.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/12/nginx/nginx.conf b/install/debian/12/nginx/nginx.conf deleted file mode 100644 index 6efe2337..00000000 --- a/install/debian/12/nginx/nginx.conf +++ /dev/null @@ -1,140 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -timer_resolution 50ms; #In order to free some CPU cycles -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 900; - proxy_send_timeout 900; - proxy_read_timeout 900; - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/13; - set_real_ip_from 104.24.0.0/14; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 2400:cb00::/32; - set_real_ip_from 2606:4700::/32; - set_real_ip_from 2803:f800::/32; - set_real_ip_from 2405:b500::/32; - set_real_ip_from 2405:8100::/32; - set_real_ip_from 2a06:98c0::/29; - set_real_ip_from 2c0f:f248::/32; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/debian/12/nginx/phpmyadmin.inc b/install/debian/12/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/debian/12/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/debian/12/nginx/phppgadmin.inc b/install/debian/12/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/debian/12/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/12/nginx/status.conf b/install/debian/12/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/debian/12/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/debian/12/nginx/webmail.inc b/install/debian/12/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/debian/12/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/12/packages/default.pkg b/install/debian/12/packages/default.pkg deleted file mode 100644 index cd1cbba1..00000000 --- a/install/debian/12/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='PHP-FPM-82' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='unlimited' -WEB_ALIASES='unlimited' -DNS_DOMAINS='unlimited' -DNS_RECORDS='unlimited' -MAIL_DOMAINS='unlimited' -MAIL_ACCOUNTS='unlimited' -DATABASES='unlimited' -CRON_JOBS='unlimited' -DISK_QUOTA='unlimited' -BANDWIDTH='unlimited' -NS='YOURHOSTNAME1,YOURHOSTNAME2' -SHELL='nologin' -BACKUPS='2' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/12/pga/config.inc.php b/install/debian/12/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/debian/12/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/debian/12/pga/phppgadmin.conf b/install/debian/12/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/debian/12/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/debian/12/php-fpm/www.conf b/install/debian/12/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/debian/12/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/debian/12/php/php7.3-dedi.patch b/install/debian/12/php/php7.3-dedi.patch deleted file mode 100644 index c044e002..00000000 --- a/install/debian/12/php/php7.3-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/12/php/php7.3-vps.patch b/install/debian/12/php/php7.3-vps.patch deleted file mode 100644 index 803b93e8..00000000 --- a/install/debian/12/php/php7.3-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/12/php/php7.4-dedi.patch b/install/debian/12/php/php7.4-dedi.patch deleted file mode 100644 index 3e5bd2fb..00000000 --- a/install/debian/12/php/php7.4-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.4/fpm/php.ini.orig 2021-07-16 16:12:30.027464762 +0200 -+++ /etc/php/7.4/fpm/php.ini 2021-07-16 16:25:15.000000000 +0200 -@@ -309,7 +309,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -402,11 +403,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -691,7 +692,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -843,7 +844,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1089,7 +1090,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1766,20 +1767,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/12/php/php7.4-vps.patch b/install/debian/12/php/php7.4-vps.patch deleted file mode 100644 index 7c52d402..00000000 --- a/install/debian/12/php/php7.4-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.4/fpm/php.ini.orig 2021-07-16 16:12:30.027464762 +0200 -+++ /etc/php/7.4/fpm/php.ini 2021-07-16 16:24:26.000000000 +0200 -@@ -309,7 +309,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -402,11 +403,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -691,7 +692,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -843,7 +844,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1089,7 +1090,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1766,20 +1767,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/12/pma/apache.conf b/install/debian/12/pma/apache.conf deleted file mode 100644 index 2a8f69e2..00000000 --- a/install/debian/12/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/debian/12/pma/config.inc.php b/install/debian/12/pma/config.inc.php deleted file mode 100644 index eafc6d67..00000000 --- a/install/debian/12/pma/config.inc.php +++ /dev/null @@ -1,146 +0,0 @@ -> $pmapath1 -sed -i '/savedsearches/d' $pmapath1 -sed -i '/navigationhiding/d' $pmapath1 -sed -i '/users/d' $pmapath1 -sed -i '/controlpass/d' $pmapath1 -sed -i '/favorite/d' $pmapath1 -sed -i '/usergroups/d' $pmapath1 -sed -i '/central_columns/d' $pmapath1 -sed -i '/designer_settings/d' $pmapath1 -sed -i '/export_templates/d' $pmapath1 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath1 - -sed -i '/pmadb/d' $pmapath2 -sed -i '/controluser/d' $pmapath2 -sed -i '/bookmarktable/d' $pmapath2 -sed -i '/relation/d' $pmapath2 -sed -i '/userconfig/d' $pmapath2 -sed -i '/table_info/d' $pmapath2 -sed -i '/column_info/d' $pmapath2 -sed -i '/history/d' $pmapath2 -sed -i '/recent/d' $pmapath2 -sed -i '/table_uiprefs/d' $pmapath2 -sed -i '/tracking/d' $pmapath2 -sed -i '/table_coords/d' $pmapath2 -sed -i '/pdf_pages/d' $pmapath2 -sed -i '/designer_coords/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/savedsearches/d' $pmapath2 -sed -i '/navigationhiding/d' $pmapath2 -sed -i '/users/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/favorite/d' $pmapath2 -sed -i '/usergroups/d' $pmapath2 -sed -i '/central_columns/d' $pmapath2 -sed -i '/designer_settings/d' $pmapath2 -sed -i '/export_templates/d' $pmapath2 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath2 - -#SOME WORK with DATABASE (table / user) -PMADB=phpmyadmin -PMAUSER=pma - -#DROP USER and TABLE -mysql -uroot < - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 100 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - - - Umask 002 - - IdentLookups off - - AllowOverwrite yes - - AllowAll - - diff --git a/install/debian/12/proftpd/tls.conf b/install/debian/12/proftpd/tls.conf deleted file mode 100644 index 9da0017b..00000000 --- a/install/debian/12/proftpd/tls.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# Proftpd sample configuration for FTPS connections. -# -# Note that FTPS impose some limitations in NAT traversing. -# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html -# for more information. -# - - # If mod_tls was built as a shared/DSO module, load it - LoadModule mod_tls.c - - -TLSEngine on -TLSLog /var/log/proftpd/tls.log -# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2 -TLSProtocol TLSv1.1 TLSv1.2 -# -# Server SSL certificate. You can generate a self-signed certificate using -# a command like: -# -# openssl req -x509 -newkey rsa:1024 \ -# -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \ -# -nodes -days 365 -# -# The proftpd.key file must be readable by root only. The other file can be -# readable by anyone. -# -# chmod 0600 /etc/ssl/private/proftpd.key -# chmod 0640 /etc/ssl/private/proftpd.key -# -TLSRSACertificateFile /usr/local/vesta/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/vesta/ssl/certificate.key -# -# CA the server trusts... -#TLSCACertificateFile /etc/ssl/certs/CA.pem -# ...or avoid CA cert and be verbose -#TLSOptions NoCertRequest EnableDiags -# ... or the same with relaxed session use for some clients (e.g. FireFtp) -#TLSOptions NoCertRequest EnableDiags NoSessionReuseRequired -# -# -# Per default drop connection if client tries to start a renegotiate -# This is a fix for CVE-2009-3555 but could break some clients. -# -#TLSOptions AllowClientRenegotiations -# -TLSOptions NoSessionReuseRequired AllowClientRenegotiations -# Authenticate clients that want to use FTP over TLS? -# -#TLSVerifyClient off -# -# Are clients required to use FTP over TLS when talking to this server? -# -TLSRequired off -# -# Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support -# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these -# clients will close the data connection, or there will be a timeout -# on an idle data connection. -# -TLSRenegotiate required off - diff --git a/install/debian/12/roundcube/apache.conf b/install/debian/12/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/debian/12/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/debian/12/roundcube/config.inc.php b/install/debian/12/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/debian/12/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/debian/12/roundcube/main.inc.php b/install/debian/12/roundcube/main.inc.php deleted file mode 100644 index 91f32000..00000000 --- a/install/debian/12/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = true; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = false; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'elastic'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 300 seconds (5min) -$rcmail_config['draft_autosave'] = 300; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/debian/12/roundcube/vesta.php b/install/debian/12/roundcube/vesta.php deleted file mode 100644 index b3dd167f..00000000 --- a/install/debian/12/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} diff --git a/install/debian/12/sudo/admin b/install/debian/12/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/debian/12/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/12/templates/dns/child-ns.tpl b/install/debian/12/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/debian/12/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/12/templates/dns/default.tpl b/install/debian/12/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/debian/12/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/12/templates/dns/gmail.tpl b/install/debian/12/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/debian/12/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/12/templates/dns/office365.tpl b/install/debian/12/templates/dns/office365.tpl deleted file mode 100644 index dcf556e1..00000000 --- a/install/debian/12/templates/dns/office365.tpl +++ /dev/null @@ -1,22 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:spf.protection.outlook.com -all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='MX' PRIORITY='0' VALUE='XXXXXXX.mail.protection.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"MS=msXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='autodiscover' TYPE='CNAME' PRIORITY='' VALUE='autodiscover.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='sip' TYPE='CNAME' PRIORITY='' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='lyncdiscover' TYPE='CNAME' PRIORITY='' VALUE='webdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='19' RECORD='enterpriseregistration' TYPE='CNAME' PRIORITY='' VALUE='enterpriseregistration.windows.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='20' RECORD='enterpriseenrollment' TYPE='CNAME' PRIORITY='' VALUE='enterpriseenrollment.manage.microsoft.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='21' RECORD='_sip._tls' TYPE='SRV' PRIORITY='100 1 443' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='22' RECORD='_sipfederationtls._tcp' TYPE='SRV' PRIORITY='100 1 5061' VALUE='sipfed.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/12/templates/dns/yandex.tpl b/install/debian/12/templates/dns/yandex.tpl deleted file mode 100644 index 4ce768fe..00000000 --- a/install/debian/12/templates/dns/yandex.tpl +++ /dev/null @@ -1,16 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.yandex.net ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"yandex-verification: XXXXXXXXXXXXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/12/templates/web/apache2/PHP-FPM-82-public.sh b/install/debian/12/templates/web/apache2/PHP-FPM-82-public.sh deleted file mode 100755 index a4deb752..00000000 --- a/install/debian/12/templates/web/apache2/PHP-FPM-82-public.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.2-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_82" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_82) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi -if [ -f "/etc/php/8.2/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.2/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/install/debian/12/templates/web/apache2/PHP-FPM-82-public.stpl b/install/debian/12/templates/web/apache2/PHP-FPM-82-public.stpl deleted file mode 100644 index 809e7f33..00000000 --- a/install/debian/12/templates/web/apache2/PHP-FPM-82-public.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/12/templates/web/apache2/PHP-FPM-82-public.tpl b/install/debian/12/templates/web/apache2/PHP-FPM-82-public.tpl deleted file mode 100644 index 679d1409..00000000 --- a/install/debian/12/templates/web/apache2/PHP-FPM-82-public.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/12/templates/web/apache2/PHP-FPM-82.sh b/install/debian/12/templates/web/apache2/PHP-FPM-82.sh deleted file mode 100755 index a4deb752..00000000 --- a/install/debian/12/templates/web/apache2/PHP-FPM-82.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.2-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_82" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_82) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi -if [ -f "/etc/php/8.2/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.2/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/install/debian/12/templates/web/apache2/PHP-FPM-82.stpl b/install/debian/12/templates/web/apache2/PHP-FPM-82.stpl deleted file mode 100644 index e0d04794..00000000 --- a/install/debian/12/templates/web/apache2/PHP-FPM-82.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/12/templates/web/apache2/PHP-FPM-82.tpl b/install/debian/12/templates/web/apache2/PHP-FPM-82.tpl deleted file mode 100644 index eba95935..00000000 --- a/install/debian/12/templates/web/apache2/PHP-FPM-82.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/12/templates/web/awstats/awstats.tpl b/install/debian/12/templates/web/awstats/awstats.tpl deleted file mode 100755 index 6bb51c50..00000000 --- a/install/debian/12/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1" -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/debian/12/templates/web/awstats/index.tpl b/install/debian/12/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/debian/12/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/debian/12/templates/web/awstats/nav.tpl b/install/debian/12/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/debian/12/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/debian/12/templates/web/nginx/caching.sh b/install/debian/12/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/debian/12/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/debian/12/templates/web/nginx/caching.stpl b/install/debian/12/templates/web/nginx/caching.stpl deleted file mode 100644 index f5c9740f..00000000 --- a/install/debian/12/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/caching.tpl b/install/debian/12/templates/web/nginx/caching.tpl deleted file mode 100644 index 73de28d5..00000000 --- a/install/debian/12/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/force-https-legacy.stpl b/install/debian/12/templates/web/nginx/force-https-legacy.stpl deleted file mode 100644 index 8e636db3..00000000 --- a/install/debian/12/templates/web/nginx/force-https-legacy.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/force-https-legacy.tpl b/install/debian/12/templates/web/nginx/force-https-legacy.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/12/templates/web/nginx/force-https-legacy.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/12/templates/web/nginx/force-https-public.stpl b/install/debian/12/templates/web/nginx/force-https-public.stpl deleted file mode 100644 index a7609b13..00000000 --- a/install/debian/12/templates/web/nginx/force-https-public.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/force-https-public.tpl b/install/debian/12/templates/web/nginx/force-https-public.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/12/templates/web/nginx/force-https-public.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/12/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/12/templates/web/nginx/force-https-webmail-phpmyadmin.stpl deleted file mode 100644 index 2db9a06e..00000000 --- a/install/debian/12/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,64 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/12/templates/web/nginx/force-https-webmail-phpmyadmin.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/12/templates/web/nginx/force-https-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/12/templates/web/nginx/force-https.stpl b/install/debian/12/templates/web/nginx/force-https.stpl deleted file mode 100644 index 55f41002..00000000 --- a/install/debian/12/templates/web/nginx/force-https.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/force-https.tpl b/install/debian/12/templates/web/nginx/force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/12/templates/web/nginx/force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/12/templates/web/nginx/hosting-legacy.sh b/install/debian/12/templates/web/nginx/hosting-legacy.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/12/templates/web/nginx/hosting-legacy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/12/templates/web/nginx/hosting-legacy.stpl b/install/debian/12/templates/web/nginx/hosting-legacy.stpl deleted file mode 100644 index efdd3b87..00000000 --- a/install/debian/12/templates/web/nginx/hosting-legacy.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting-legacy.tpl b/install/debian/12/templates/web/nginx/hosting-legacy.tpl deleted file mode 100644 index a41d4054..00000000 --- a/install/debian/12/templates/web/nginx/hosting-legacy.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting-public.stpl b/install/debian/12/templates/web/nginx/hosting-public.stpl deleted file mode 100644 index a7609b13..00000000 --- a/install/debian/12/templates/web/nginx/hosting-public.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting-public.tpl b/install/debian/12/templates/web/nginx/hosting-public.tpl deleted file mode 100644 index f5d8b327..00000000 --- a/install/debian/12/templates/web/nginx/hosting-public.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting-webmail-phpmyadmin.stpl b/install/debian/12/templates/web/nginx/hosting-webmail-phpmyadmin.stpl deleted file mode 100644 index 2db9a06e..00000000 --- a/install/debian/12/templates/web/nginx/hosting-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,64 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting-webmail-phpmyadmin.tpl b/install/debian/12/templates/web/nginx/hosting-webmail-phpmyadmin.tpl deleted file mode 100644 index f84f4781..00000000 --- a/install/debian/12/templates/web/nginx/hosting-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting.sh b/install/debian/12/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/12/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/12/templates/web/nginx/hosting.stpl b/install/debian/12/templates/web/nginx/hosting.stpl deleted file mode 100644 index 5745311e..00000000 --- a/install/debian/12/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/hosting.tpl b/install/debian/12/templates/web/nginx/hosting.tpl deleted file mode 100644 index 61469ad2..00000000 --- a/install/debian/12/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/12/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index cf8fad56..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/debian/12/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/12/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 5931f617..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/debian/12/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/12/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index 3c2793d1..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/debian/12/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/12/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index bb9a727b..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,126 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/debian/12/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/default.stpl b/install/debian/12/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/default.tpl b/install/debian/12/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/12/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index a7564705..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/debian/12/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/12/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 6e67a4e0..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/drupal6.tpl b/install/debian/12/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index d1096bff..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/drupal7.stpl b/install/debian/12/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/drupal7.tpl b/install/debian/12/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/drupal8.stpl b/install/debian/12/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/drupal8.tpl b/install/debian/12/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/joomla.stpl b/install/debian/12/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index d4f96ee3..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/joomla.tpl b/install/debian/12/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/laravel.stpl b/install/debian/12/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index db0b4dde..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/laravel.tpl b/install/debian/12/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/magento.stpl b/install/debian/12/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index f8ac30c9..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,197 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/magento.tpl b/install/debian/12/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/modx.stpl b/install/debian/12/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index 420aeb9e..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,68 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/modx.tpl b/install/debian/12/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/moodle.stpl b/install/debian/12/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index 8594ec94..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/moodle.tpl b/install/debian/12/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/no-php.stpl b/install/debian/12/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 4bb50383..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/no-php.tpl b/install/debian/12/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/odoo.stpl b/install/debian/12/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index e28afcfc..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/odoo.tpl b/install/debian/12/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/opencart.stpl b/install/debian/12/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 52706d21..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,58 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/opencart.tpl b/install/debian/12/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/12/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 1b803f97..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/owncloud.tpl b/install/debian/12/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/piwik.stpl b/install/debian/12/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 1b299343..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/piwik.tpl b/install/debian/12/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/12/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index d26ed9f4..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/pyrocms.tpl b/install/debian/12/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/sendy.stpl b/install/debian/12/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/sendy.tpl b/install/debian/12/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/12/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/wordpress.tpl b/install/debian/12/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/12/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index 01dfee5b..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/wordpress2.tpl b/install/debian/12/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/12/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index a5fc46fb..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/debian/12/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/debian/12/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/private-force-https.stpl b/install/debian/12/templates/web/nginx/private-force-https.stpl deleted file mode 100644 index bf805683..00000000 --- a/install/debian/12/templates/web/nginx/private-force-https.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/12/templates/web/nginx/private-force-https.tpl b/install/debian/12/templates/web/nginx/private-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/12/templates/web/nginx/private-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/12/templates/web/nginx/private-hosting.sh b/install/debian/12/templates/web/nginx/private-hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/12/templates/web/nginx/private-hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/12/templates/web/nginx/private-hosting.stpl b/install/debian/12/templates/web/nginx/private-hosting.stpl deleted file mode 100644 index 8e5b3f7b..00000000 --- a/install/debian/12/templates/web/nginx/private-hosting.stpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/private-hosting.tpl b/install/debian/12/templates/web/nginx/private-hosting.tpl deleted file mode 100644 index a8ee840e..00000000 --- a/install/debian/12/templates/web/nginx/private-hosting.tpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/12/templates/web/nginx/proxy_ip.tpl b/install/debian/12/templates/web/nginx/proxy_ip.tpl deleted file mode 100644 index ae195617..00000000 --- a/install/debian/12/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/debian/12/templates/web/php-fpm/default.tpl b/install/debian/12/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/debian/12/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/12/templates/web/php-fpm/no-php.tpl b/install/debian/12/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/debian/12/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/12/templates/web/php-fpm/socket.tpl b/install/debian/12/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/debian/12/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/12/templates/web/skel/document_errors/403.html b/install/debian/12/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/debian/12/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/debian/12/templates/web/skel/document_errors/404.html b/install/debian/12/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/debian/12/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/debian/12/templates/web/skel/document_errors/50x.html b/install/debian/12/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/debian/12/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/debian/12/templates/web/skel/public_html/index.html b/install/debian/12/templates/web/skel/public_html/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/12/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/12/templates/web/skel/public_html/robots.txt b/install/debian/12/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/12/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/12/templates/web/skel/public_shtml/index.html b/install/debian/12/templates/web/skel/public_shtml/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/12/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/12/templates/web/skel/public_shtml/robots.txt b/install/debian/12/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/12/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/12/templates/web/suspend/.htaccess b/install/debian/12/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/debian/12/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/debian/12/templates/web/suspend/index.html b/install/debian/12/templates/web/suspend/index.html deleted file mode 100755 index 3815354d..00000000 --- a/install/debian/12/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

Temporary under construction

-

This website is temporary under construction.

-
- We will back again soon. -
- - diff --git a/install/debian/12/templates/web/webalizer/webalizer.tpl b/install/debian/12/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/debian/12/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/debian/12/vsftpd/vsftpd.conf b/install/debian/12/vsftpd/vsftpd.conf deleted file mode 100644 index 1ca1a992..00000000 --- a/install/debian/12/vsftpd/vsftpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -#allow_writable_chroot=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_max_port=12100 -pasv_min_port=12000 -use_localtime=YES diff --git a/install/debian/13/apache2/apache2.conf b/install/debian/13/apache2/apache2.conf deleted file mode 100644 index 2be3e50d..00000000 --- a/install/debian/13/apache2/apache2.conf +++ /dev/null @@ -1,95 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 900 -ProxyTimeout 900 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/debian/13/apache2/status.conf b/install/debian/13/apache2/status.conf deleted file mode 100644 index 0d82a356..00000000 --- a/install/debian/13/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - # Allow from all - diff --git a/install/debian/13/bind/named.conf b/install/debian/13/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/debian/13/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/debian/13/clamav/clamd.conf b/install/debian/13/clamav/clamd.conf deleted file mode 100644 index c636b6d3..00000000 --- a/install/debian/13/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean true -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 2M -MaxFileSize 2M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/debian/13/deb_signing.key b/install/debian/13/deb_signing.key deleted file mode 100644 index d279abbd..00000000 --- a/install/debian/13/deb_signing.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/13/dovecot/conf.d/10-auth.conf b/install/debian/13/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/debian/13/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/debian/13/dovecot/conf.d/10-logging.conf b/install/debian/13/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/debian/13/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/debian/13/dovecot/conf.d/10-mail.conf b/install/debian/13/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/debian/13/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/debian/13/dovecot/conf.d/10-master.conf b/install/debian/13/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/debian/13/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/debian/13/dovecot/conf.d/10-ssl.conf b/install/debian/13/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 3aaff6ee..00000000 --- a/install/debian/13/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,3 +0,0 @@ -ssl = yes -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - mail_max_userip_connections = 50 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/debian/13/dovecot/conf.d/auth-passwdfile.conf.ext b/install/debian/13/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/debian/13/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/debian/13/dovecot/dovecot.conf b/install/debian/13/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/debian/13/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/debian/13/exim/deny_senders b/install/debian/13/exim/deny_senders deleted file mode 100644 index 8b137891..00000000 --- a/install/debian/13/exim/deny_senders +++ /dev/null @@ -1 +0,0 @@ - diff --git a/install/debian/13/exim/dnsbl.conf b/install/debian/13/exim/dnsbl.conf deleted file mode 100644 index 279bafcd..00000000 --- a/install/debian/13/exim/dnsbl.conf +++ /dev/null @@ -1 +0,0 @@ -bl.spamcop.net diff --git a/install/debian/13/exim/exim4.conf.template b/install/debian/13/exim/exim4.conf.template deleted file mode 100644 index 15264797..00000000 --- a/install/debian/13/exim/exim4.conf.template +++ /dev/null @@ -1,487 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= -smtputf8_advertise_hosts = - -SRS_SECRET = ${readfile{/etc/exim4/srs.conf}} - -#local_interfaces = 0.0.0.0 -#smtp_active_hostname = ${lookup{$interface_address}lsearch{/etc/exim4/virtual/helo_data}{$value}} -#smtp_banner = "$smtp_active_hostname ESMTP $tod_full" - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS = 15 -LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS = 5 -LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 -LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 - -recipients_max = 150 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_recipients}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Hosting account is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = yes - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_recipients}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = no - - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if eq{${lookup{$domain}dsearch{/etc/exim4/domains/}}}{}{false}{true}} - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - set acl_m3 = yes - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - # if outbound, and forwarding has been done, use an alternate transport - domains = ! +local_domains - transport = ${if eq {$local_part@$domain} \ - {$original_local_part@$original_domain} \ - {remote_smtp} {remote_forwarded_smtp}} - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -inbound_srs: - driver = redirect - senders = : - domains = +local_domains - # detect inbound bounces which are converted to SRS, and decode them - condition = ${if inbound_srs {$local_part} {SRS_SECRET}} - data = $srs_recipient - -inbound_srs_failure: - driver = redirect - senders = : - domains = +local_domains - # detect inbound bounces which look converted to SRS but are invalid - condition = ${if inbound_srs {$local_part} {}} - allow_fail - data = :fail: Invalid SRS recipient address - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #interface = ${if eq{$acl_m3}{yes}{FIRSTIP}{${lookup{$sender_address_domain}lsearch{/etc/exim4/virtual/interfaces} {$value}{SECONDIP}}}} - #helo_data = "${if eq{$acl_m3}{yes}{FIRSTHOST}{${lookup{$sending_ip_address}lsearch{/etc/exim4/virtual/helo_data}{$value}{SECONDHOST}}}}" - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - message_linelength_limit = 1G - -remote_forwarded_smtp: - driver = smtp - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - message_linelength_limit = 1G - # modify the envelope from, for mails that we forward - max_rcpt = 1 - return_path = ${srs_encode {SRS_SECRET} {$return_path} {$original_domain}} - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg - from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/13/exim/exim4.conf.template.without-srs b/install/debian/13/exim/exim4.conf.template.without-srs deleted file mode 100644 index 78eda468..00000000 --- a/install/debian/13/exim/exim4.conf.template.without-srs +++ /dev/null @@ -1,451 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= -smtputf8_advertise_hosts = - -#local_interfaces = 0.0.0.0 -#smtp_active_hostname = ${lookup{$interface_address}lsearch{/etc/exim4/virtual/helo_data}{$value}} -#smtp_banner = "$smtp_active_hostname ESMTP $tod_full" - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS = 15 -LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS = 5 -LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 -LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR = 40 - -recipients_max = 150 -recipients_max_reject = true - -# log_selector = +smtp_connection -smtp_accept_max = 50 -smtp_accept_max_per_host = 4 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lookup{${lc:${domain:$h_from:}}}dsearch{/etc/exim4/domains/}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_recipients}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Hosting account is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_HOSTING_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = yes - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Too many recipients, limit is $acl_c_max_recipients recipients - set acl_c_max_recipients=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_recipients}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_RECIPIENTS}} - condition = ${if >{$rcpt_count}{$acl_c_max_recipients}} - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - ratelimit = $acl_c_limit_per_hour / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - set acl_c_limit_per_hour=${lookup{$authenticated_id}lsearch{/etc/exim4/limit_per_email_account_max_sent_emails_per_hour}{$value}{LIMIT_PER_EMAIL_ACCOUNT_MAX_SENT_EMAILS_PER_HOUR}} - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period [limit=$acl_c_limit_per_hour] - - warn set acl_m3 = no - - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if eq{${lookup{$domain}dsearch{/etc/exim4/domains/}}}{}{false}{true}} - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - set acl_m3 = yes - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{600K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - require_files = ${local_part}:+${home}/.forward - domains = +local_domains - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #interface = ${if eq{$acl_m3}{yes}{FIRSTIP}{${lookup{$sender_address_domain}lsearch{/etc/exim4/virtual/interfaces} {$value}{SECONDIP}}}} - #helo_data = "${if eq{$acl_m3}{yes}{FIRSTHOST}{${lookup{$sending_ip_address}lsearch{/etc/exim4/virtual/helo_data}{$value}{SECONDHOST}}}}" - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = - hosts_try_chunking = !93.188.3.0/24 - message_linelength_limit = 1G - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}/${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg - from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/13/exim/spam-blocks.conf b/install/debian/13/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/debian/13/fail2ban/action.d/vesta.conf b/install/debian/13/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/debian/13/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/debian/13/fail2ban/filter.d/vesta.conf b/install/debian/13/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 36ec1001..00000000 --- a/install/debian/13/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccessful Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/debian/13/fail2ban/jail.local b/install/debian/13/fail2ban/jail.local deleted file mode 100644 index eccea068..00000000 --- a/install/debian/13/fail2ban/jail.local +++ /dev/null @@ -1,39 +0,0 @@ -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 diff --git a/install/debian/13/firewall/ports.conf b/install/debian/13/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/debian/13/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/debian/13/firewall/rules.conf b/install/debian/13/firewall/rules.conf deleted file mode 100644 index 6da5a1c4..00000000 --- a/install/debian/13/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='yes' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/debian/13/logrotate/apache2 b/install/debian/13/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/debian/13/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/debian/13/logrotate/dovecot b/install/debian/13/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/debian/13/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/debian/13/logrotate/nginx b/install/debian/13/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/debian/13/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/debian/13/logrotate/vesta b/install/debian/13/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/debian/13/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/debian/13/mysql/my-large.cnf b/install/debian/13/mysql/my-large.cnf deleted file mode 100644 index b056c316..00000000 --- a/install/debian/13/mysql/my-large.cnf +++ /dev/null @@ -1,51 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M -thread_concurrency = 8 - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/13/mysql/my-medium.cnf b/install/debian/13/mysql/my-medium.cnf deleted file mode 100644 index 33aa04c2..00000000 --- a/install/debian/13/mysql/my-medium.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/13/mysql/my-small.cnf b/install/debian/13/mysql/my-small.cnf deleted file mode 100644 index 857f48ce..00000000 --- a/install/debian/13/mysql/my-small.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -default-character-set=utf8mb4 -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysql] -default-character-set=utf8mb4 - -[mysqld] -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -sql_mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/13/nginx/nginx.conf b/install/debian/13/nginx/nginx.conf deleted file mode 100644 index 6efe2337..00000000 --- a/install/debian/13/nginx/nginx.conf +++ /dev/null @@ -1,140 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -timer_resolution 50ms; #In order to free some CPU cycles -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 900; - proxy_send_timeout 900; - proxy_read_timeout 900; - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/13; - set_real_ip_from 104.24.0.0/14; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 2400:cb00::/32; - set_real_ip_from 2606:4700::/32; - set_real_ip_from 2803:f800::/32; - set_real_ip_from 2405:b500::/32; - set_real_ip_from 2405:8100::/32; - set_real_ip_from 2a06:98c0::/29; - set_real_ip_from 2c0f:f248::/32; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/debian/13/nginx/phpmyadmin.inc b/install/debian/13/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/debian/13/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/debian/13/nginx/phppgadmin.inc b/install/debian/13/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/debian/13/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/13/nginx/status.conf b/install/debian/13/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/debian/13/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/debian/13/nginx/webmail.inc b/install/debian/13/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/debian/13/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/13/packages/default.pkg b/install/debian/13/packages/default.pkg deleted file mode 100644 index cd1cbba1..00000000 --- a/install/debian/13/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='PHP-FPM-82' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='unlimited' -WEB_ALIASES='unlimited' -DNS_DOMAINS='unlimited' -DNS_RECORDS='unlimited' -MAIL_DOMAINS='unlimited' -MAIL_ACCOUNTS='unlimited' -DATABASES='unlimited' -CRON_JOBS='unlimited' -DISK_QUOTA='unlimited' -BANDWIDTH='unlimited' -NS='YOURHOSTNAME1,YOURHOSTNAME2' -SHELL='nologin' -BACKUPS='2' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/13/pga/config.inc.php b/install/debian/13/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/debian/13/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/debian/13/pga/phppgadmin.conf b/install/debian/13/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/debian/13/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/debian/13/php-fpm/www.conf b/install/debian/13/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/debian/13/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/debian/13/php/php7.3-dedi.patch b/install/debian/13/php/php7.3-dedi.patch deleted file mode 100644 index c044e002..00000000 --- a/install/debian/13/php/php7.3-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/13/php/php7.3-vps.patch b/install/debian/13/php/php7.3-vps.patch deleted file mode 100644 index 803b93e8..00000000 --- a/install/debian/13/php/php7.3-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.3/fpm/php.ini.orig 2019-07-18 16:11:18.856589963 +0200 -+++ /etc/php/7.3/fpm/php.ini 2019-07-18 17:45:51.000000000 +0200 -@@ -312,7 +312,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -399,11 +400,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -690,7 +691,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -842,7 +843,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1087,7 +1088,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1791,20 +1792,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/13/php/php7.4-dedi.patch b/install/debian/13/php/php7.4-dedi.patch deleted file mode 100644 index 3e5bd2fb..00000000 --- a/install/debian/13/php/php7.4-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.4/fpm/php.ini.orig 2021-07-16 16:12:30.027464762 +0200 -+++ /etc/php/7.4/fpm/php.ini 2021-07-16 16:25:15.000000000 +0200 -@@ -309,7 +309,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -402,11 +403,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -691,7 +692,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -843,7 +844,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1089,7 +1090,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1766,20 +1767,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/13/php/php7.4-vps.patch b/install/debian/13/php/php7.4-vps.patch deleted file mode 100644 index 7c52d402..00000000 --- a/install/debian/13/php/php7.4-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/7.4/fpm/php.ini.orig 2021-07-16 16:12:30.027464762 +0200 -+++ /etc/php/7.4/fpm/php.ini 2021-07-16 16:24:26.000000000 +0200 -@@ -309,7 +309,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -402,11 +403,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -691,7 +692,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -843,7 +844,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1089,7 +1090,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1766,20 +1767,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/13/pma/apache.conf b/install/debian/13/pma/apache.conf deleted file mode 100644 index 2a8f69e2..00000000 --- a/install/debian/13/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/debian/13/pma/config.inc.php b/install/debian/13/pma/config.inc.php deleted file mode 100644 index eafc6d67..00000000 --- a/install/debian/13/pma/config.inc.php +++ /dev/null @@ -1,146 +0,0 @@ -> $pmapath1 -sed -i '/savedsearches/d' $pmapath1 -sed -i '/navigationhiding/d' $pmapath1 -sed -i '/users/d' $pmapath1 -sed -i '/controlpass/d' $pmapath1 -sed -i '/favorite/d' $pmapath1 -sed -i '/usergroups/d' $pmapath1 -sed -i '/central_columns/d' $pmapath1 -sed -i '/designer_settings/d' $pmapath1 -sed -i '/export_templates/d' $pmapath1 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath1 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath1 - -sed -i '/pmadb/d' $pmapath2 -sed -i '/controluser/d' $pmapath2 -sed -i '/bookmarktable/d' $pmapath2 -sed -i '/relation/d' $pmapath2 -sed -i '/userconfig/d' $pmapath2 -sed -i '/table_info/d' $pmapath2 -sed -i '/column_info/d' $pmapath2 -sed -i '/history/d' $pmapath2 -sed -i '/recent/d' $pmapath2 -sed -i '/table_uiprefs/d' $pmapath2 -sed -i '/tracking/d' $pmapath2 -sed -i '/table_coords/d' $pmapath2 -sed -i '/pdf_pages/d' $pmapath2 -sed -i '/designer_coords/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/savedsearches/d' $pmapath2 -sed -i '/navigationhiding/d' $pmapath2 -sed -i '/users/d' $pmapath2 -sed -i '/controlpass/d' $pmapath2 -sed -i '/favorite/d' $pmapath2 -sed -i '/usergroups/d' $pmapath2 -sed -i '/central_columns/d' $pmapath2 -sed -i '/designer_settings/d' $pmapath2 -sed -i '/export_templates/d' $pmapath2 -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath2 -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath2 - -#SOME WORK with DATABASE (table / user) -PMADB=phpmyadmin -PMAUSER=pma - -#DROP USER and TABLE -mysql -uroot < - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 100 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 -TransferLog /var/log/proftpd/xferlog -SystemLog /var/log/proftpd/proftpd.log - - - Umask 002 - - IdentLookups off - - AllowOverwrite yes - - AllowAll - - diff --git a/install/debian/13/proftpd/tls.conf b/install/debian/13/proftpd/tls.conf deleted file mode 100644 index 9da0017b..00000000 --- a/install/debian/13/proftpd/tls.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# Proftpd sample configuration for FTPS connections. -# -# Note that FTPS impose some limitations in NAT traversing. -# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html -# for more information. -# - - # If mod_tls was built as a shared/DSO module, load it - LoadModule mod_tls.c - - -TLSEngine on -TLSLog /var/log/proftpd/tls.log -# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2 -TLSProtocol TLSv1.1 TLSv1.2 -# -# Server SSL certificate. You can generate a self-signed certificate using -# a command like: -# -# openssl req -x509 -newkey rsa:1024 \ -# -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \ -# -nodes -days 365 -# -# The proftpd.key file must be readable by root only. The other file can be -# readable by anyone. -# -# chmod 0600 /etc/ssl/private/proftpd.key -# chmod 0640 /etc/ssl/private/proftpd.key -# -TLSRSACertificateFile /usr/local/vesta/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/vesta/ssl/certificate.key -# -# CA the server trusts... -#TLSCACertificateFile /etc/ssl/certs/CA.pem -# ...or avoid CA cert and be verbose -#TLSOptions NoCertRequest EnableDiags -# ... or the same with relaxed session use for some clients (e.g. FireFtp) -#TLSOptions NoCertRequest EnableDiags NoSessionReuseRequired -# -# -# Per default drop connection if client tries to start a renegotiate -# This is a fix for CVE-2009-3555 but could break some clients. -# -#TLSOptions AllowClientRenegotiations -# -TLSOptions NoSessionReuseRequired AllowClientRenegotiations -# Authenticate clients that want to use FTP over TLS? -# -#TLSVerifyClient off -# -# Are clients required to use FTP over TLS when talking to this server? -# -TLSRequired off -# -# Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support -# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these -# clients will close the data connection, or there will be a timeout -# on an idle data connection. -# -TLSRenegotiate required off - diff --git a/install/debian/13/roundcube/apache.conf b/install/debian/13/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/debian/13/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/debian/13/roundcube/config.inc.php b/install/debian/13/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/debian/13/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/debian/13/roundcube/main.inc.php b/install/debian/13/roundcube/main.inc.php deleted file mode 100644 index 91f32000..00000000 --- a/install/debian/13/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = true; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = false; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'elastic'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 300 seconds (5min) -$rcmail_config['draft_autosave'] = 300; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/debian/13/roundcube/vesta.php b/install/debian/13/roundcube/vesta.php deleted file mode 100644 index b3dd167f..00000000 --- a/install/debian/13/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} diff --git a/install/debian/13/sudo/admin b/install/debian/13/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/debian/13/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/13/templates/dns/child-ns.tpl b/install/debian/13/templates/dns/child-ns.tpl deleted file mode 100644 index 42c046e4..00000000 --- a/install/debian/13/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/default.tpl b/install/debian/13/templates/dns/default.tpl deleted file mode 100644 index e0a37e62..00000000 --- a/install/debian/13/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/gmail.tpl b/install/debian/13/templates/dns/gmail.tpl deleted file mode 100644 index 219c9d24..00000000 --- a/install/debian/13/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/office365.tpl b/install/debian/13/templates/dns/office365.tpl deleted file mode 100644 index dcf556e1..00000000 --- a/install/debian/13/templates/dns/office365.tpl +++ /dev/null @@ -1,22 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:spf.protection.outlook.com -all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='MX' PRIORITY='0' VALUE='XXXXXXX.mail.protection.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"MS=msXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='autodiscover' TYPE='CNAME' PRIORITY='' VALUE='autodiscover.outlook.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='sip' TYPE='CNAME' PRIORITY='' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='lyncdiscover' TYPE='CNAME' PRIORITY='' VALUE='webdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='19' RECORD='enterpriseregistration' TYPE='CNAME' PRIORITY='' VALUE='enterpriseregistration.windows.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='20' RECORD='enterpriseenrollment' TYPE='CNAME' PRIORITY='' VALUE='enterpriseenrollment.manage.microsoft.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='21' RECORD='_sip._tls' TYPE='SRV' PRIORITY='100 1 443' VALUE='sipdir.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='22' RECORD='_sipfederationtls._tcp' TYPE='SRV' PRIORITY='100 1 5061' VALUE='sipfed.online.lync.com.' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/dns/yandex.tpl b/install/debian/13/templates/dns/yandex.tpl deleted file mode 100644 index 4ce768fe..00000000 --- a/install/debian/13/templates/dns/yandex.tpl +++ /dev/null @@ -1,16 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='CNAME' PRIORITY='' VALUE='domain.mail.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mx.yandex.net.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.yandex.net ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"yandex-verification: XXXXXXXXXXXXXXX"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.sh b/install/debian/13/templates/web/apache2/PHP-FPM-84-public.sh deleted file mode 100644 index cbea2de9..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" -pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -if [ -f "$pool_file_83" ]; then - rm $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_84" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_84) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_84 - systemctl reset-failed php8.4-fpm - systemctl restart php8.4-fpm -fi -if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.4/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.stpl b/install/debian/13/templates/web/apache2/PHP-FPM-84-public.stpl deleted file mode 100644 index 91e05b17..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.tpl b/install/debian/13/templates/web/apache2/PHP-FPM-84-public.tpl deleted file mode 100644 index 94acbf15..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84-public.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84.sh b/install/debian/13/templates/web/apache2/PHP-FPM-84.sh deleted file mode 100644 index cbea2de9..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" -pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -if [ -f "$pool_file_83" ]; then - rm $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_84" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_84) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_84 - systemctl reset-failed php8.4-fpm - systemctl restart php8.4-fpm -fi -if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.4/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84.stpl b/install/debian/13/templates/web/apache2/PHP-FPM-84.stpl deleted file mode 100644 index 848abf7c..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/13/templates/web/apache2/PHP-FPM-84.tpl b/install/debian/13/templates/web/apache2/PHP-FPM-84.tpl deleted file mode 100644 index 065c1f89..00000000 --- a/install/debian/13/templates/web/apache2/PHP-FPM-84.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/13/templates/web/awstats/awstats.tpl b/install/debian/13/templates/web/awstats/awstats.tpl deleted file mode 100644 index 6bb51c50..00000000 --- a/install/debian/13/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1" -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/debian/13/templates/web/awstats/index.tpl b/install/debian/13/templates/web/awstats/index.tpl deleted file mode 100644 index 9df9bb5c..00000000 --- a/install/debian/13/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/debian/13/templates/web/awstats/nav.tpl b/install/debian/13/templates/web/awstats/nav.tpl deleted file mode 100644 index f29bed68..00000000 --- a/install/debian/13/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/debian/13/templates/web/nginx/caching.sh b/install/debian/13/templates/web/nginx/caching.sh deleted file mode 100644 index 09d8efe7..00000000 --- a/install/debian/13/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/debian/13/templates/web/nginx/caching.stpl b/install/debian/13/templates/web/nginx/caching.stpl deleted file mode 100644 index f5c9740f..00000000 --- a/install/debian/13/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/caching.tpl b/install/debian/13/templates/web/nginx/caching.tpl deleted file mode 100644 index 73de28d5..00000000 --- a/install/debian/13/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/force-https-legacy.stpl b/install/debian/13/templates/web/nginx/force-https-legacy.stpl deleted file mode 100644 index 8e636db3..00000000 --- a/install/debian/13/templates/web/nginx/force-https-legacy.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/force-https-legacy.tpl b/install/debian/13/templates/web/nginx/force-https-legacy.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/13/templates/web/nginx/force-https-legacy.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/13/templates/web/nginx/force-https-public.stpl b/install/debian/13/templates/web/nginx/force-https-public.stpl deleted file mode 100644 index a7609b13..00000000 --- a/install/debian/13/templates/web/nginx/force-https-public.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/force-https-public.tpl b/install/debian/13/templates/web/nginx/force-https-public.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/13/templates/web/nginx/force-https-public.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/13/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/13/templates/web/nginx/force-https-webmail-phpmyadmin.stpl deleted file mode 100644 index 2db9a06e..00000000 --- a/install/debian/13/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,64 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/13/templates/web/nginx/force-https-webmail-phpmyadmin.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/13/templates/web/nginx/force-https-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/13/templates/web/nginx/force-https.stpl b/install/debian/13/templates/web/nginx/force-https.stpl deleted file mode 100644 index 55f41002..00000000 --- a/install/debian/13/templates/web/nginx/force-https.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/force-https.tpl b/install/debian/13/templates/web/nginx/force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/13/templates/web/nginx/force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/13/templates/web/nginx/hosting-legacy.sh b/install/debian/13/templates/web/nginx/hosting-legacy.sh deleted file mode 100644 index eeed37ef..00000000 --- a/install/debian/13/templates/web/nginx/hosting-legacy.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/13/templates/web/nginx/hosting-legacy.stpl b/install/debian/13/templates/web/nginx/hosting-legacy.stpl deleted file mode 100644 index efdd3b87..00000000 --- a/install/debian/13/templates/web/nginx/hosting-legacy.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting-legacy.tpl b/install/debian/13/templates/web/nginx/hosting-legacy.tpl deleted file mode 100644 index a41d4054..00000000 --- a/install/debian/13/templates/web/nginx/hosting-legacy.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting-public.stpl b/install/debian/13/templates/web/nginx/hosting-public.stpl deleted file mode 100644 index a7609b13..00000000 --- a/install/debian/13/templates/web/nginx/hosting-public.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting-public.tpl b/install/debian/13/templates/web/nginx/hosting-public.tpl deleted file mode 100644 index f5d8b327..00000000 --- a/install/debian/13/templates/web/nginx/hosting-public.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting-webmail-phpmyadmin.stpl b/install/debian/13/templates/web/nginx/hosting-webmail-phpmyadmin.stpl deleted file mode 100644 index 2db9a06e..00000000 --- a/install/debian/13/templates/web/nginx/hosting-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,64 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting-webmail-phpmyadmin.tpl b/install/debian/13/templates/web/nginx/hosting-webmail-phpmyadmin.tpl deleted file mode 100644 index f84f4781..00000000 --- a/install/debian/13/templates/web/nginx/hosting-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting.sh b/install/debian/13/templates/web/nginx/hosting.sh deleted file mode 100644 index eeed37ef..00000000 --- a/install/debian/13/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/13/templates/web/nginx/hosting.stpl b/install/debian/13/templates/web/nginx/hosting.stpl deleted file mode 100644 index 5745311e..00000000 --- a/install/debian/13/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/hosting.tpl b/install/debian/13/templates/web/nginx/hosting.tpl deleted file mode 100644 index 61469ad2..00000000 --- a/install/debian/13/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/13/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index cf8fad56..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/debian/13/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/13/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 5931f617..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/debian/13/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/13/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index 3c2793d1..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/debian/13/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/13/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index bb9a727b..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,126 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/debian/13/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/default.stpl b/install/debian/13/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/default.tpl b/install/debian/13/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/13/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index a7564705..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/debian/13/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/13/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 6e67a4e0..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/drupal6.tpl b/install/debian/13/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index d1096bff..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri @rewrite; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/drupal7.stpl b/install/debian/13/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/drupal7.tpl b/install/debian/13/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/drupal8.stpl b/install/debian/13/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 32f01a6f..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/drupal8.tpl b/install/debian/13/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index c9729795..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,91 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location / { - try_files $uri /index.php?$query_string; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/joomla.stpl b/install/debian/13/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index d4f96ee3..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/joomla.tpl b/install/debian/13/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/laravel.stpl b/install/debian/13/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index db0b4dde..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/laravel.tpl b/install/debian/13/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/magento.stpl b/install/debian/13/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index f8ac30c9..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,197 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/magento.tpl b/install/debian/13/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/modx.stpl b/install/debian/13/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index 420aeb9e..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,68 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/modx.tpl b/install/debian/13/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/moodle.stpl b/install/debian/13/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index 8594ec94..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/moodle.tpl b/install/debian/13/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/no-php.stpl b/install/debian/13/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 4bb50383..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/no-php.tpl b/install/debian/13/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/odoo.stpl b/install/debian/13/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index e28afcfc..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/odoo.tpl b/install/debian/13/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/opencart.stpl b/install/debian/13/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 52706d21..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,58 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/opencart.tpl b/install/debian/13/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/13/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 1b803f97..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/owncloud.tpl b/install/debian/13/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/piwik.stpl b/install/debian/13/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 1b299343..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/piwik.tpl b/install/debian/13/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/13/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index d26ed9f4..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/pyrocms.tpl b/install/debian/13/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/sendy.stpl b/install/debian/13/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/sendy.tpl b/install/debian/13/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/13/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index f9c01e40..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/wordpress.tpl b/install/debian/13/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/13/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index 01dfee5b..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/wordpress2.tpl b/install/debian/13/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/13/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index a5fc46fb..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/debian/13/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/debian/13/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/private-force-https.stpl b/install/debian/13/templates/web/nginx/private-force-https.stpl deleted file mode 100644 index bf805683..00000000 --- a/install/debian/13/templates/web/nginx/private-force-https.stpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/13/templates/web/nginx/private-force-https.tpl b/install/debian/13/templates/web/nginx/private-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/13/templates/web/nginx/private-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/13/templates/web/nginx/private-hosting.sh b/install/debian/13/templates/web/nginx/private-hosting.sh deleted file mode 100644 index eeed37ef..00000000 --- a/install/debian/13/templates/web/nginx/private-hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/13/templates/web/nginx/private-hosting.stpl b/install/debian/13/templates/web/nginx/private-hosting.stpl deleted file mode 100644 index 8e5b3f7b..00000000 --- a/install/debian/13/templates/web/nginx/private-hosting.stpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/private-hosting.tpl b/install/debian/13/templates/web/nginx/private-hosting.tpl deleted file mode 100644 index a8ee840e..00000000 --- a/install/debian/13/templates/web/nginx/private-hosting.tpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} - diff --git a/install/debian/13/templates/web/nginx/proxy_ip.tpl b/install/debian/13/templates/web/nginx/proxy_ip.tpl deleted file mode 100644 index ae195617..00000000 --- a/install/debian/13/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/debian/13/templates/web/php-fpm/default.tpl b/install/debian/13/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/debian/13/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/13/templates/web/php-fpm/no-php.tpl b/install/debian/13/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/debian/13/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/13/templates/web/php-fpm/socket.tpl b/install/debian/13/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/debian/13/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/13/templates/web/skel/document_errors/403.html b/install/debian/13/templates/web/skel/document_errors/403.html deleted file mode 100644 index 9c3f6baa..00000000 --- a/install/debian/13/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/debian/13/templates/web/skel/document_errors/404.html b/install/debian/13/templates/web/skel/document_errors/404.html deleted file mode 100644 index 2cee7708..00000000 --- a/install/debian/13/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/debian/13/templates/web/skel/document_errors/50x.html b/install/debian/13/templates/web/skel/document_errors/50x.html deleted file mode 100644 index 85ba648b..00000000 --- a/install/debian/13/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/debian/13/templates/web/skel/public_html/index.html b/install/debian/13/templates/web/skel/public_html/index.html deleted file mode 100644 index c2895cf2..00000000 --- a/install/debian/13/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/13/templates/web/skel/public_html/robots.txt b/install/debian/13/templates/web/skel/public_html/robots.txt deleted file mode 100644 index 00ee83dc..00000000 --- a/install/debian/13/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/13/templates/web/skel/public_shtml/index.html b/install/debian/13/templates/web/skel/public_shtml/index.html deleted file mode 100644 index c2895cf2..00000000 --- a/install/debian/13/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/13/templates/web/skel/public_shtml/robots.txt b/install/debian/13/templates/web/skel/public_shtml/robots.txt deleted file mode 100644 index 00ee83dc..00000000 --- a/install/debian/13/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/13/templates/web/suspend/.htaccess b/install/debian/13/templates/web/suspend/.htaccess deleted file mode 100644 index 5a6df83f..00000000 --- a/install/debian/13/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/debian/13/templates/web/suspend/index.html b/install/debian/13/templates/web/suspend/index.html deleted file mode 100644 index 3815354d..00000000 --- a/install/debian/13/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

Temporary under construction

-

This website is temporary under construction.

-
- We will back again soon. -
- - diff --git a/install/debian/13/templates/web/webalizer/webalizer.tpl b/install/debian/13/templates/web/webalizer/webalizer.tpl deleted file mode 100644 index 068adcfb..00000000 --- a/install/debian/13/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/debian/13/vsftpd/vsftpd.conf b/install/debian/13/vsftpd/vsftpd.conf deleted file mode 100644 index 1ca1a992..00000000 --- a/install/debian/13/vsftpd/vsftpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -#allow_writable_chroot=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_max_port=12100 -pasv_min_port=12000 -use_localtime=YES diff --git a/install/debian/7/deb_signing.key b/install/debian/7/deb_signing.key index d279abbd..2ad2db8b 100644 --- a/install/debian/7/deb_signing.key +++ b/install/debian/7/deb_signing.key @@ -1,41 +1,30 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ -----END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/7/nginx/nginx.conf b/install/debian/7/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/debian/7/nginx/nginx.conf +++ b/install/debian/7/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/debian/7/nginx/phpmyadmin.inc b/install/debian/7/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/debian/7/nginx/phpmyadmin.inc +++ b/install/debian/7/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/debian/7/nginx/phppgadmin.inc b/install/debian/7/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/debian/7/nginx/phppgadmin.inc +++ b/install/debian/7/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/debian/7/nginx/webmail.inc b/install/debian/7/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/debian/7/nginx/webmail.inc +++ b/install/debian/7/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/debian/7/pma/config.inc.php b/install/debian/7/pma/config.inc.php index 4b6a3a6b..a643a065 100644 --- a/install/debian/7/pma/config.inc.php +++ b/install/debian/7/pma/config.inc.php @@ -137,13 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/debian/7/sudo/admin b/install/debian/7/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/debian/7/sudo/admin +++ b/install/debian/7/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/7/templates/web/apache2/basedir.stpl b/install/debian/7/templates/web/apache2/basedir.stpl index fe0b5b40..dda3aa76 100644 --- a/install/debian/7/templates/web/apache2/basedir.stpl +++ b/install/debian/7/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/debian/7/templates/web/apache2/hosting.stpl b/install/debian/7/templates/web/apache2/hosting.stpl index e1442ce2..627325e0 100644 --- a/install/debian/7/templates/web/apache2/hosting.stpl +++ b/install/debian/7/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/7/templates/web/apache2/phpcgi.stpl b/install/debian/7/templates/web/apache2/phpcgi.stpl index 40ce5fb2..aa807091 100644 --- a/install/debian/7/templates/web/apache2/phpcgi.stpl +++ b/install/debian/7/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/debian/7/templates/web/apache2/phpfcgid.stpl b/install/debian/7/templates/web/apache2/phpfcgid.stpl index 5d27efcd..88cea0e6 100644 --- a/install/debian/7/templates/web/apache2/phpfcgid.stpl +++ b/install/debian/7/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/7/templates/web/nginx/caching.stpl b/install/debian/7/templates/web/nginx/caching.stpl old mode 100644 new mode 100755 index 61b74814..5e0e4064 --- a/install/debian/7/templates/web/nginx/caching.stpl +++ b/install/debian/7/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/caching.tpl b/install/debian/7/templates/web/nginx/caching.tpl old mode 100644 new mode 100755 index 73de28d5..36761b65 --- a/install/debian/7/templates/web/nginx/caching.tpl +++ b/install/debian/7/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/default.stpl b/install/debian/7/templates/web/nginx/default.stpl old mode 100644 new mode 100755 index 418305a8..fa538060 --- a/install/debian/7/templates/web/nginx/default.stpl +++ b/install/debian/7/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/default.tpl b/install/debian/7/templates/web/nginx/default.tpl old mode 100644 new mode 100755 index bebd47a2..4d5c774b --- a/install/debian/7/templates/web/nginx/default.tpl +++ b/install/debian/7/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/hosting.stpl b/install/debian/7/templates/web/nginx/hosting.stpl old mode 100644 new mode 100755 index fc70c266..d778d633 --- a/install/debian/7/templates/web/nginx/hosting.stpl +++ b/install/debian/7/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/debian/7/templates/web/nginx/hosting.tpl b/install/debian/7/templates/web/nginx/hosting.tpl old mode 100644 new mode 100755 index a41d4054..15961c95 --- a/install/debian/7/templates/web/nginx/hosting.tpl +++ b/install/debian/7/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/http2.stpl b/install/debian/7/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/debian/7/templates/web/nginx/http2.stpl +++ b/install/debian/7/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/http2.tpl b/install/debian/7/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/debian/7/templates/web/nginx/http2.tpl +++ b/install/debian/7/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/sendy.stpl b/install/debian/7/templates/web/nginx/php5-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/sendy.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl +++ b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.stpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.tpl b/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/debian/7/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/7/templates/web/nginx/proxy_ip.tpl b/install/debian/7/templates/web/nginx/proxy_ip.tpl old mode 100644 new mode 100755 diff --git a/install/debian/8/apache2/status.conf b/install/debian/8/apache2/status.conf index 0d82a356..da9d9633 100644 --- a/install/debian/8/apache2/status.conf +++ b/install/debian/8/apache2/status.conf @@ -4,5 +4,5 @@ Listen 127.0.0.1:8081 Order deny,allow Deny from all Allow from 127.0.0.1 - # Allow from all + Allow from all diff --git a/install/debian/8/clamav/clamd.conf b/install/debian/8/clamav/clamd.conf index 3fe6454f..4e04356e 100644 --- a/install/debian/8/clamav/clamd.conf +++ b/install/debian/8/clamav/clamd.conf @@ -20,7 +20,7 @@ MaxThreads 12 MaxConnectionQueueLength 15 LogSyslog false LogFacility LOG_LOCAL6 -LogClean true +LogClean false LogVerbose true PidFile /var/run/clamav/clamd.pid DatabaseDirectory /var/lib/clamav @@ -49,8 +49,7 @@ SendBufTimeout 200 MaxQueue 100 ExtendedDetectionInfo true OLE2BlockMacros false -StreamMaxLength 2M -MaxFileSize 2M +StreamMaxLength 25M LogFile /var/log/clamav/clamav.log LogTime true LogFileUnlock false diff --git a/install/debian/8/deb_signing.key b/install/debian/8/deb_signing.key index d279abbd..2ad2db8b 100644 --- a/install/debian/8/deb_signing.key +++ b/install/debian/8/deb_signing.key @@ -1,41 +1,30 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI +mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD +G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x +QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf +fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 +oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY +2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g +PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ +CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb +VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN +QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh +IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 +Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 +WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN +BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz +QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 +k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC +YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt +i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS +ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA +CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR ++EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 +XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC +CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN +qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq +ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== +=J2HJ -----END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/8/exim/deny_senders b/install/debian/8/exim/deny_senders deleted file mode 100644 index 8b137891..00000000 --- a/install/debian/8/exim/deny_senders +++ /dev/null @@ -1 +0,0 @@ - diff --git a/install/debian/8/exim/dnsbl.conf b/install/debian/8/exim/dnsbl.conf index 279bafcd..5166b255 100644 --- a/install/debian/8/exim/dnsbl.conf +++ b/install/debian/8/exim/dnsbl.conf @@ -1 +1,2 @@ bl.spamcop.net +zen.spamhaus.org diff --git a/install/debian/8/exim/exim4.conf.template b/install/debian/8/exim/exim4.conf.template index 261947d2..bfb98e0b 100644 --- a/install/debian/8/exim/exim4.conf.template +++ b/install/debian/8/exim/exim4.conf.template @@ -25,9 +25,6 @@ acl_smtp_rcpt = acl_check_rcpt acl_smtp_data = acl_check_data acl_smtp_mime = acl_check_mime -recipients_max = 15 -recipients_max_reject = true - .ifdef SPAMASSASSIN spamd_address = 127.0.0.1 783 .endif @@ -45,7 +42,7 @@ tls_on_connect_ports = 465 never_users = root host_lookup = * rfc1413_hosts = * -rfc1413_query_timeout = 0s +rfc1413_query_timeout = 5s ignore_bounce_errors_after = 2d timeout_frozen_after = 7d @@ -59,20 +56,8 @@ DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} # ACL CONFIGURATION # # Specifies access control lists for incoming SMTP mail # ###################################################################### - -acl_not_smtp = acl_not_smtp - begin acl -acl_not_smtp: - deny message = Web site is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period - - accept - acl_check_spammers: accept hosts = +whitelist @@ -87,18 +72,15 @@ acl_check_mail: deny condition = ${if eq{$sender_helo_name}{}} message = HELO required before MAIL - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid + drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} delay = 45s - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} + drop condition = ${if isip{$sender_helo_name}} message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} + drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} message = $interface_address is _my_ address accept @@ -107,12 +89,6 @@ acl_check_mail: acl_check_rcpt: accept hosts = : - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period - deny message = Restricted characters in address domains = +local_domains local_parts = ^[.] : ^.*[@%!/|] @@ -160,12 +136,9 @@ acl_check_rcpt: acl_check_data: - - deny senders = /etc/exim4/deny_senders - .ifdef CLAMD deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok + malware = * condition = ${if eq{$acl_m0}{yes}{yes}{no}} .endif @@ -191,7 +164,7 @@ acl_check_data: acl_check_mime: deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} + condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} accept @@ -236,11 +209,6 @@ dnslookup: transport = remote_smtp no_more -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - userforward: driver = redirect check_local_user @@ -282,6 +250,11 @@ localuser_fwd_only: transport = devnull condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} +localuser_spam: + driver = accept + transport = local_spam_delivery + condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} + localuser: driver = accept transport = local_delivery diff --git a/install/debian/8/nginx/nginx.conf b/install/debian/8/nginx/nginx.conf index 989c6b63..1eef1672 100644 --- a/install/debian/8/nginx/nginx.conf +++ b/install/debian/8/nginx/nginx.conf @@ -51,7 +51,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; @@ -72,34 +71,33 @@ http { # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 173.245.48.0/20; set_real_ip_from 103.21.244.0/22; set_real_ip_from 103.22.200.0/22; set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/13; - set_real_ip_from 104.24.0.0/14; - set_real_ip_from 141.101.64.0/18; + set_real_ip_from 104.16.0.0/12; set_real_ip_from 108.162.192.0/18; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; + set_real_ip_from 131.0.72.0/22; + set_real_ip_from 141.101.64.0/18; set_real_ip_from 162.158.0.0/15; set_real_ip_from 172.64.0.0/13; - set_real_ip_from 131.0.72.0/22; + set_real_ip_from 173.245.48.0/20; + set_real_ip_from 188.114.96.0/20; + set_real_ip_from 190.93.240.0/20; + set_real_ip_from 197.234.240.0/22; + set_real_ip_from 198.41.128.0/17; set_real_ip_from 2400:cb00::/32; set_real_ip_from 2606:4700::/32; set_real_ip_from 2803:f800::/32; set_real_ip_from 2405:b500::/32; set_real_ip_from 2405:8100::/32; - set_real_ip_from 2a06:98c0::/29; set_real_ip_from 2c0f:f248::/32; + set_real_ip_from 2a06:98c0::/29; real_ip_header CF-Connecting-IP; # SSL PCI Compliance ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.1 TLSv1.2; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_prefer_server_ciphers on; ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; diff --git a/install/debian/8/nginx/phpmyadmin.inc b/install/debian/8/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/debian/8/nginx/phpmyadmin.inc +++ b/install/debian/8/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/debian/8/nginx/phppgadmin.inc b/install/debian/8/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/debian/8/nginx/phppgadmin.inc +++ b/install/debian/8/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/debian/8/nginx/webmail.inc b/install/debian/8/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/debian/8/nginx/webmail.inc +++ b/install/debian/8/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/debian/8/pma/config.inc.php b/install/debian/8/pma/config.inc.php index a3803697..eafc6d67 100644 --- a/install/debian/8/pma/config.inc.php +++ b/install/debian/8/pma/config.inc.php @@ -137,13 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/debian/8/proftpd/proftpd.conf b/install/debian/8/proftpd/proftpd.conf index d2bd8667..69ec6b2e 100644 --- a/install/debian/8/proftpd/proftpd.conf +++ b/install/debian/8/proftpd/proftpd.conf @@ -4,8 +4,6 @@ ServerAdmin root@localhost DefaultServer on DefaultRoot ~ !adm -Include /etc/proftpd/tls.conf - VRootEngine on VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf diff --git a/install/debian/8/proftpd/tls.conf b/install/debian/8/proftpd/tls.conf deleted file mode 100644 index 9da0017b..00000000 --- a/install/debian/8/proftpd/tls.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# Proftpd sample configuration for FTPS connections. -# -# Note that FTPS impose some limitations in NAT traversing. -# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html -# for more information. -# - - # If mod_tls was built as a shared/DSO module, load it - LoadModule mod_tls.c - - -TLSEngine on -TLSLog /var/log/proftpd/tls.log -# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2 -TLSProtocol TLSv1.1 TLSv1.2 -# -# Server SSL certificate. You can generate a self-signed certificate using -# a command like: -# -# openssl req -x509 -newkey rsa:1024 \ -# -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \ -# -nodes -days 365 -# -# The proftpd.key file must be readable by root only. The other file can be -# readable by anyone. -# -# chmod 0600 /etc/ssl/private/proftpd.key -# chmod 0640 /etc/ssl/private/proftpd.key -# -TLSRSACertificateFile /usr/local/vesta/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/vesta/ssl/certificate.key -# -# CA the server trusts... -#TLSCACertificateFile /etc/ssl/certs/CA.pem -# ...or avoid CA cert and be verbose -#TLSOptions NoCertRequest EnableDiags -# ... or the same with relaxed session use for some clients (e.g. FireFtp) -#TLSOptions NoCertRequest EnableDiags NoSessionReuseRequired -# -# -# Per default drop connection if client tries to start a renegotiate -# This is a fix for CVE-2009-3555 but could break some clients. -# -#TLSOptions AllowClientRenegotiations -# -TLSOptions NoSessionReuseRequired AllowClientRenegotiations -# Authenticate clients that want to use FTP over TLS? -# -#TLSVerifyClient off -# -# Are clients required to use FTP over TLS when talking to this server? -# -TLSRequired off -# -# Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support -# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these -# clients will close the data connection, or there will be a timeout -# on an idle data connection. -# -TLSRenegotiate required off - diff --git a/install/debian/8/sudo/admin b/install/debian/8/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/debian/8/sudo/admin +++ b/install/debian/8/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/8/templates/web/apache2/basedir.stpl b/install/debian/8/templates/web/apache2/basedir.stpl index 60a8f7fd..d978d4c4 100644 --- a/install/debian/8/templates/web/apache2/basedir.stpl +++ b/install/debian/8/templates/web/apache2/basedir.stpl @@ -14,8 +14,8 @@ AllowOverride All SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/debian/8/templates/web/apache2/basedir.tpl b/install/debian/8/templates/web/apache2/basedir.tpl index 3b8f875a..96c94a1b 100644 --- a/install/debian/8/templates/web/apache2/basedir.tpl +++ b/install/debian/8/templates/web/apache2/basedir.tpl @@ -13,7 +13,7 @@ ErrorLog /var/log/%web_system%/domains/%domain%.error.log AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/apache2/default.stpl b/install/debian/8/templates/web/apache2/default.stpl index 3fc7e160..ec34c279 100644 --- a/install/debian/8/templates/web/apache2/default.stpl +++ b/install/debian/8/templates/web/apache2/default.stpl @@ -14,7 +14,7 @@ AllowOverride All SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/apache2/default.tpl b/install/debian/8/templates/web/apache2/default.tpl index 464257ec..3a227015 100644 --- a/install/debian/8/templates/web/apache2/default.tpl +++ b/install/debian/8/templates/web/apache2/default.tpl @@ -13,7 +13,7 @@ ErrorLog /var/log/%web_system%/domains/%domain%.error.log AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/apache2/hosting.stpl b/install/debian/8/templates/web/apache2/hosting.stpl index b17014cd..8892072b 100644 --- a/install/debian/8/templates/web/apache2/hosting.stpl +++ b/install/debian/8/templates/web/apache2/hosting.stpl @@ -14,7 +14,7 @@ AllowOverride All SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value upload_max_filesize 10M php_admin_value max_execution_time 20 php_admin_value post_max_size 8M @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/apache2/hosting.tpl b/install/debian/8/templates/web/apache2/hosting.tpl index 34f55b29..1eb26910 100644 --- a/install/debian/8/templates/web/apache2/hosting.tpl +++ b/install/debian/8/templates/web/apache2/hosting.tpl @@ -13,7 +13,7 @@ ErrorLog /var/log/%web_system%/domains/%domain%.error.log AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value upload_max_filesize 10M php_admin_value max_execution_time 20 php_admin_value post_max_size 8M diff --git a/install/debian/8/templates/web/apache2/phpcgi.stpl b/install/debian/8/templates/web/apache2/phpcgi.stpl index 7c1248d4..731355bc 100644 --- a/install/debian/8/templates/web/apache2/phpcgi.stpl +++ b/install/debian/8/templates/web/apache2/phpcgi.stpl @@ -14,8 +14,8 @@ SSLRequireSSL AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/debian/8/templates/web/apache2/phpcgi.tpl b/install/debian/8/templates/web/apache2/phpcgi.tpl index 603ea8b9..c6796d29 100644 --- a/install/debian/8/templates/web/apache2/phpcgi.tpl +++ b/install/debian/8/templates/web/apache2/phpcgi.tpl @@ -13,7 +13,7 @@ ErrorLog /var/log/%web_system%/domains/%domain%.error.log AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/apache2/phpfcgid.stpl b/install/debian/8/templates/web/apache2/phpfcgid.stpl index 98304f2a..156c8a91 100644 --- a/install/debian/8/templates/web/apache2/phpfcgid.stpl +++ b/install/debian/8/templates/web/apache2/phpfcgid.stpl @@ -14,8 +14,8 @@ SSLRequireSSL AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + Options +Includes -Indexes +ExecCGI + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/apache2/phpfcgid.tpl b/install/debian/8/templates/web/apache2/phpfcgid.tpl index 525b1f53..a4c01269 100644 --- a/install/debian/8/templates/web/apache2/phpfcgid.tpl +++ b/install/debian/8/templates/web/apache2/phpfcgid.tpl @@ -13,7 +13,7 @@ ErrorLog /var/log/%web_system%/domains/%domain%.error.log AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch + Options +Includes -Indexes +ExecCGI php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/debian/8/templates/web/awstats/awstats.tpl b/install/debian/8/templates/web/awstats/awstats.tpl index 6bb51c50..9a92e0fd 100755 --- a/install/debian/8/templates/web/awstats/awstats.tpl +++ b/install/debian/8/templates/web/awstats/awstats.tpl @@ -24,7 +24,7 @@ PurgeLogFile=0 ArchiveLogRecords=0 KeepBackupOfHistoricFiles=1 DefaultFile="index.php index.html" -SkipHosts="127.0.0.1" +SkipHosts="127.0.0.1 SkipUserAgents="" SkipFiles="" SkipReferrersBlackList="" diff --git a/install/debian/8/templates/web/nginx/caching.stpl b/install/debian/8/templates/web/nginx/caching.stpl old mode 100644 new mode 100755 index d104643a..52641dbe --- a/install/debian/8/templates/web/nginx/caching.stpl +++ b/install/debian/8/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/caching.tpl b/install/debian/8/templates/web/nginx/caching.tpl old mode 100644 new mode 100755 index 73de28d5..36761b65 --- a/install/debian/8/templates/web/nginx/caching.tpl +++ b/install/debian/8/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/default.stpl b/install/debian/8/templates/web/nginx/default.stpl old mode 100644 new mode 100755 index 418305a8..fa538060 --- a/install/debian/8/templates/web/nginx/default.stpl +++ b/install/debian/8/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/default.tpl b/install/debian/8/templates/web/nginx/default.tpl old mode 100644 new mode 100755 index bebd47a2..4d5c774b --- a/install/debian/8/templates/web/nginx/default.tpl +++ b/install/debian/8/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/force-https-legacy.stpl b/install/debian/8/templates/web/nginx/force-https-legacy.stpl deleted file mode 100644 index 4e51748d..00000000 --- a/install/debian/8/templates/web/nginx/force-https-legacy.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/8/templates/web/nginx/force-https-legacy.tpl b/install/debian/8/templates/web/nginx/force-https-legacy.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/8/templates/web/nginx/force-https-legacy.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/8/templates/web/nginx/force-https-public.stpl b/install/debian/8/templates/web/nginx/force-https-public.stpl deleted file mode 100644 index 9522313b..00000000 --- a/install/debian/8/templates/web/nginx/force-https-public.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/8/templates/web/nginx/force-https-public.tpl b/install/debian/8/templates/web/nginx/force-https-public.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/8/templates/web/nginx/force-https-public.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl deleted file mode 100644 index 2d62e72b..00000000 --- a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/8/templates/web/nginx/force-https-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/8/templates/web/nginx/force-https.stpl b/install/debian/8/templates/web/nginx/force-https.stpl deleted file mode 100644 index d138ea63..00000000 --- a/install/debian/8/templates/web/nginx/force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/8/templates/web/nginx/force-https.tpl b/install/debian/8/templates/web/nginx/force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/8/templates/web/nginx/force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/8/templates/web/nginx/hosting.stpl b/install/debian/8/templates/web/nginx/hosting.stpl old mode 100644 new mode 100755 index fc70c266..d778d633 --- a/install/debian/8/templates/web/nginx/hosting.stpl +++ b/install/debian/8/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/debian/8/templates/web/nginx/hosting.tpl b/install/debian/8/templates/web/nginx/hosting.tpl old mode 100644 new mode 100755 index a41d4054..15961c95 --- a/install/debian/8/templates/web/nginx/hosting.tpl +++ b/install/debian/8/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/http2.stpl b/install/debian/8/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/debian/8/templates/web/nginx/http2.stpl +++ b/install/debian/8/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/http2.tpl b/install/debian/8/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/debian/8/templates/web/nginx/http2.tpl +++ b/install/debian/8/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/sendy.stpl b/install/debian/8/templates/web/nginx/php5-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/sendy.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl +++ b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.stpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.tpl b/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/debian/8/templates/web/nginx/php5-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/8/templates/web/nginx/private-force-https.stpl b/install/debian/8/templates/web/nginx/private-force-https.stpl deleted file mode 100644 index c77baf91..00000000 --- a/install/debian/8/templates/web/nginx/private-force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/8/templates/web/nginx/private-force-https.tpl b/install/debian/8/templates/web/nginx/private-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/8/templates/web/nginx/private-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/8/templates/web/nginx/proxy_ip.tpl b/install/debian/8/templates/web/nginx/proxy_ip.tpl old mode 100644 new mode 100755 diff --git a/install/debian/9/apache2/apache2.conf b/install/debian/9/apache2/apache2.conf deleted file mode 100644 index 2756132a..00000000 --- a/install/debian/9/apache2/apache2.conf +++ /dev/null @@ -1,94 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 30 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/debian/9/apache2/status.conf b/install/debian/9/apache2/status.conf deleted file mode 100644 index 0d82a356..00000000 --- a/install/debian/9/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - # Allow from all - diff --git a/install/debian/9/bind/named.conf b/install/debian/9/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/debian/9/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/debian/9/clamav/clamd.conf b/install/debian/9/clamav/clamd.conf deleted file mode 100644 index 3fe6454f..00000000 --- a/install/debian/9/clamav/clamd.conf +++ /dev/null @@ -1,62 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean true -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -DetectBrokenExecutables false -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 2M -MaxFileSize 2M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/debian/9/deb_signing.key b/install/debian/9/deb_signing.key deleted file mode 100644 index d279abbd..00000000 --- a/install/debian/9/deb_signing.key +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGDsPogBDADT7jiPewIuavqJZJMZ18c+kEC8N+/EK15k9zdBvcluxZ7gb5D6 -sKT3fVmLWD49mux+OoFs8DJH1LkpFe2Ax58NVMgDwCNUtcqeR8eB6nEWpZLjzJhZ -RD5+ZpUaX/emXrr7mxJ1SvT8PgWWerl2ZuPSlpPm4Ls6JO53AvPAsUVgMTHkfHNj -4/GqKtORkanzBwimC0bcB3BBRLH/kiW/TNi3hQnR5GYIaKWrc8oGpHHqX5BNw72O -JTSqTj8OZXKG7US6cXgBQuLN68sKd9TIy2HZdTKlqR1yQyc2BiPwVYDrJemM72VT -kuW0qbsOwji7rG2B6Pg1yggWXpB8Znczzi8AfzoFgXeOTi/hzcaf3YnAxfeL1Ofq -aOW+ReqsF1wxpgVwNj0DVquPTqzd4uCIGNNGGHhlIR434FyA4YNfxK63YxZS5SAR -leQGTUtBRdh1SOKPDZMcSlJ3wEfHKbp72qmnLdqUkGl//FZsCDdPFxx3wDCPPS2e -++g3ImqeaQ553nUAEQEAAbQhbXlWZXN0YSB0ZWFtIDxpbmZvQG15dmVzdGFjcC5j -b20+iQHOBBMBCgA4FiEEDcdTLoRXCPbKaPuqiIB9SyIhM4wFAmDsPogCGwMFCwkI -BwIGFQoJCAsCBBYCAwECHgECF4AACgkQiIB9SyIhM4yADAv+M62/6N+uFx9Izbj5 -HxZCzLEgvlQzdQcLJPDwFWYByVRiQRkRJWt5kqwNpndWoDo5zEtyKn3Yulbj6zyy -UqYhN0ctXyaFjKFIHIqrrz9P9AF2uGr17rTWbnRpjlMSkDSmUGXNEKO7gMtKiTo3 -olWldDELuM0MQddwMGgnqZPb3/Z+om68U1/6NS8A5hAHL+HuwcKGFZpFRJYXSOLY -lIpHyicifvkRAMkPp025Y3Who3EZMWq3Bpo78djtxfA4CoUn+OH64Hn0llkJ3vU6 -bM+KuC2ZrkHrzcqZbPbYnmEmVD1rkxVoOgzqE76fAY2I6YFY09uhdg0FbZeeMjA+ -DReBwINRFYsk6/maY7Zc82clfc7+vr3xmR+f+KEiUCU4mI72PnlU9LT9RuoCkKbo -znUZo+Xj6ezM6lCKGnOmqhvQmWR+hdsn1zX1ufxPA5uQyeFfR5VpAjvDOFykPA93 -3Et0ZdrKB2U6jjlGzWhsCkYphF7M0DVIRPOm1xLUJvLx+zB+uQGNBGDsPogBDADG -rJuQBsLJ6MWAGLydwaIBttwG3GOysSsQ1P09mbeOqiyCaWfEladePorTpKsbOHA/ -USAfjN8Eik81Un1Kik6rYU8ieGERKpCMiBkcNLQH/DnYyCNT5oaGqXtIQ+5GNn71 -mt7sLmf0yL3C320RJa8KSP+rAaey4ttLyl7rM1q8RPmlsRSxVjeiMw01i6cXmA1G -EJDuRbXdzDuo5utHDBMHgN0T0g8kgoTX9G2uwUTnJm9qzW2Lg3d4xoe2+H5/86Qm -0lVl5vLSMEPl01NcoTVgQpGO/yR3nJ4ubMkkbzCM0e0MByHqOKJ2LfW77BcvcoXg -coa7tF+6DZBB4UGyb1VuSZJoVOYN2tnSj2/taPk0yHJf/tLvNm/hVHEvXNXk09hy -fne0FZmHKwwp0TGSC8tzsHPRSbIOazifIC8pdN4fPTQyfI9tKxi26opCIAHHkcTr -7VOUvUNyAGVB9TU/nmzpvkv8BLCKSQM1FxUQ0owgFtrtIoMVxkYG5hb6EjAHyUcA -EQEAAYkBtgQYAQoAIBYhBA3HUy6EVwj2ymj7qoiAfUsiITOMBQJg7D6IAhsMAAoJ -EIiAfUsiITOMR40MALn5sqKFZ9FMe7982XMamanjPqO3Odi5/9rUXYKbJGjsaSof -lSC3OtqnRTVGE6KEuYErCKCpAk2ZvEf5eQHi264fC255zuxWihdcEQpiPK1DdlN3 -m9JNp/4Pns38Nn/zG3cFQuDEvDsC75xmxN7pi+ZkokodwA0PgaiMVh5mSos+Mc/G -fLcEes21xVk2DQ3Vw6p1P/39uujBPZ3J2unWBqv0rCFEpwgXm/d80Y0x31tq0ToZ -hf1r/GcoB6rC3sSAtUykrTZUaRv57BouvnAP9zfFlFSrYpJZ5L9/IawBH+O9yUu2 -N1jGq9eJ/RwHG1lKUBJd6wCWz1ZKzxnaoH9CfRC/aG9vRQWLSjiHCl2cnNDxElKx -JOT7RUjxlri4zvxdum49Vr8iEpjUFXzhRYq79SsmqkLuXZYQnccNFAdde8ZcPpKA -zhfavTutAPNJRyg9hbwxQYUH6N1i5J7ZZsqHB/GIBaSReXroacHjFYcU6uiBt/da -qiC8NLvRaE3PVkma9Q== -=RAbI ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/debian/9/dovecot/conf.d/10-auth.conf b/install/debian/9/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/debian/9/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/debian/9/dovecot/conf.d/10-logging.conf b/install/debian/9/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/debian/9/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/debian/9/dovecot/conf.d/10-mail.conf b/install/debian/9/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/debian/9/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/debian/9/dovecot/conf.d/10-master.conf b/install/debian/9/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/debian/9/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/debian/9/dovecot/conf.d/10-ssl.conf b/install/debian/9/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 3aaff6ee..00000000 --- a/install/debian/9/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,3 +0,0 @@ -ssl = yes -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/debian/9/dovecot/conf.d/auth-passwdfile.conf.ext b/install/debian/9/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/debian/9/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/debian/9/dovecot/dovecot.conf b/install/debian/9/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/debian/9/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/debian/9/exim/deny_senders b/install/debian/9/exim/deny_senders deleted file mode 100644 index 8b137891..00000000 --- a/install/debian/9/exim/deny_senders +++ /dev/null @@ -1 +0,0 @@ - diff --git a/install/debian/9/exim/dnsbl.conf b/install/debian/9/exim/dnsbl.conf deleted file mode 100644 index 279bafcd..00000000 --- a/install/debian/9/exim/dnsbl.conf +++ /dev/null @@ -1 +0,0 @@ -bl.spamcop.net diff --git a/install/debian/9/exim/exim4.conf.template b/install/debian/9/exim/exim4.conf.template deleted file mode 100644 index 261947d2..00000000 --- a/install/debian/9/exim/exim4.conf.template +++ /dev/null @@ -1,409 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -recipients_max = 15 -recipients_max_reject = true - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -acl_not_smtp: - deny message = Web site is sending too much emails [limitlog]: deny / account / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period - - accept - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop !authenticated = * - message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop !authenticated = * - condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop !authenticated = * - condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Email account is sending too much emails [limitlog]: deny / email / $authenticated_id / $sender_rate / $sender_rate_period - ratelimit = 40 / 1h / $authenticated_id - - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/debian/9/exim/spam-blocks.conf b/install/debian/9/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/debian/9/fail2ban/action.d/vesta.conf b/install/debian/9/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/debian/9/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/debian/9/fail2ban/filter.d/vesta.conf b/install/debian/9/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 36ec1001..00000000 --- a/install/debian/9/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccessful Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/debian/9/fail2ban/jail.local b/install/debian/9/fail2ban/jail.local deleted file mode 100644 index eccea068..00000000 --- a/install/debian/9/fail2ban/jail.local +++ /dev/null @@ -1,39 +0,0 @@ -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 diff --git a/install/debian/9/firewall/ports.conf b/install/debian/9/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/debian/9/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/debian/9/firewall/rules.conf b/install/debian/9/firewall/rules.conf deleted file mode 100644 index fba98e1e..00000000 --- a/install/debian/9/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/debian/9/logrotate/apache2 b/install/debian/9/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/debian/9/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/debian/9/logrotate/dovecot b/install/debian/9/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/debian/9/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/debian/9/logrotate/nginx b/install/debian/9/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/debian/9/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/debian/9/logrotate/vesta b/install/debian/9/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/debian/9/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/debian/9/mysql/my-large.cnf b/install/debian/9/mysql/my-large.cnf deleted file mode 100644 index d0bab390..00000000 --- a/install/debian/9/mysql/my-large.cnf +++ /dev/null @@ -1,42 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M -thread_concurrency = 8 - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/9/mysql/my-medium.cnf b/install/debian/9/mysql/my-medium.cnf deleted file mode 100644 index 1c10ab9a..00000000 --- a/install/debian/9/mysql/my-medium.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/9/mysql/my-small.cnf b/install/debian/9/mysql/my-small.cnf deleted file mode 100644 index 26a80478..00000000 --- a/install/debian/9/mysql/my-small.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/debian/9/nginx/nginx.conf b/install/debian/9/nginx/nginx.conf deleted file mode 100644 index 989c6b63..00000000 --- a/install/debian/9/nginx/nginx.conf +++ /dev/null @@ -1,139 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -timer_resolution 50ms; #In order to free some CPU cycles -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_vary on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffers 32 4k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/13; - set_real_ip_from 104.24.0.0/14; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 2400:cb00::/32; - set_real_ip_from 2606:4700::/32; - set_real_ip_from 2803:f800::/32; - set_real_ip_from 2405:b500::/32; - set_real_ip_from 2405:8100::/32; - set_real_ip_from 2a06:98c0::/29; - set_real_ip_from 2c0f:f248::/32; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/debian/9/nginx/phpmyadmin.inc b/install/debian/9/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/debian/9/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/debian/9/nginx/phppgadmin.inc b/install/debian/9/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/debian/9/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/9/nginx/status.conf b/install/debian/9/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/debian/9/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/debian/9/nginx/webmail.inc b/install/debian/9/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/debian/9/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/debian/9/packages/default.pkg b/install/debian/9/packages/default.pkg deleted file mode 100644 index c2a93574..00000000 --- a/install/debian/9/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='unlimited' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/9/packages/gainsboro.pkg b/install/debian/9/packages/gainsboro.pkg deleted file mode 100644 index 76d7dae2..00000000 --- a/install/debian/9/packages/gainsboro.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='10' -WEB_ALIASES='10' -DNS_DOMAINS='10' -DNS_RECORDS='10' -MAIL_DOMAINS='10' -MAIL_ACCOUNTS='10' -DATABASES='10' -CRON_JOBS='10' -DISK_QUOTA='10000' -BANDWIDTH='10000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='1' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/9/packages/palegreen.pkg b/install/debian/9/packages/palegreen.pkg deleted file mode 100644 index 3db5fe57..00000000 --- a/install/debian/9/packages/palegreen.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='hosting' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='50' -WEB_ALIASES='50' -DNS_DOMAINS='50' -DNS_RECORDS='50' -MAIL_DOMAINS='50' -MAIL_ACCOUNTS='50' -DATABASES='50' -CRON_JOBS='50' -DISK_QUOTA='50000' -BANDWIDTH='50000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='5' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/9/packages/slategrey.pkg b/install/debian/9/packages/slategrey.pkg deleted file mode 100644 index d89e796f..00000000 --- a/install/debian/9/packages/slategrey.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='10000' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/debian/9/pga/config.inc.php b/install/debian/9/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/debian/9/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/debian/9/pga/phppgadmin.conf b/install/debian/9/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/debian/9/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/debian/9/php-fpm/www.conf b/install/debian/9/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/debian/9/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/debian/9/php/php7.0-dedi.patch b/install/debian/9/php/php7.0-dedi.patch deleted file mode 100644 index 04af8325..00000000 --- a/install/debian/9/php/php7.0-dedi.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- origin/etc/php/7.0/apache2/php.ini 2018-02-07 15:46:09.000000000 +0100 -+++ vesta/etc/php/7.0/apache2/php.ini 2018-02-07 17:29:58.531325409 +0100 -@@ -296,7 +296,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -382,11 +383,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --; max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -653,7 +654,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -806,7 +807,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1038,7 +1039,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1764,20 +1765,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=0 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=64 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=4 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=2000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/9/php/php7.0-vps.patch b/install/debian/9/php/php7.0-vps.patch deleted file mode 100644 index 42670598..00000000 --- a/install/debian/9/php/php7.0-vps.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- origin/etc/php/7.0/apache2/php.ini 2018-02-07 15:46:09.000000000 +0100 -+++ vesta/etc/php/7.0/apache2/php.ini 2018-02-07 17:27:08.000000000 +0100 -@@ -296,7 +296,8 @@ - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -382,11 +383,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --; max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -653,7 +654,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -806,7 +807,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1038,7 +1039,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1764,20 +1765,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=0 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=64 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=4 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=2000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/install/debian/9/pma/apache.conf b/install/debian/9/pma/apache.conf deleted file mode 100644 index 2a8f69e2..00000000 --- a/install/debian/9/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/debian/9/pma/config.inc.php b/install/debian/9/pma/config.inc.php deleted file mode 100644 index a3803697..00000000 --- a/install/debian/9/pma/config.inc.php +++ /dev/null @@ -1,153 +0,0 @@ - - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 20 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 - - - Umask 002 - IdentLookups off - AllowOverwrite yes - - AllowAll - - diff --git a/install/debian/9/proftpd/tls.conf b/install/debian/9/proftpd/tls.conf deleted file mode 100644 index 9da0017b..00000000 --- a/install/debian/9/proftpd/tls.conf +++ /dev/null @@ -1,63 +0,0 @@ -# -# Proftpd sample configuration for FTPS connections. -# -# Note that FTPS impose some limitations in NAT traversing. -# See http://www.castaglia.org/proftpd/doc/contrib/ProFTPD-mini-HOWTO-TLS.html -# for more information. -# - - # If mod_tls was built as a shared/DSO module, load it - LoadModule mod_tls.c - - -TLSEngine on -TLSLog /var/log/proftpd/tls.log -# this is an example of protocols, proftp works witl all, but use only the most secure ones like TLSv1.1 and TLSv1.2 -TLSProtocol TLSv1.1 TLSv1.2 -# -# Server SSL certificate. You can generate a self-signed certificate using -# a command like: -# -# openssl req -x509 -newkey rsa:1024 \ -# -keyout /etc/ssl/private/proftpd.key -out /etc/ssl/certs/proftpd.crt \ -# -nodes -days 365 -# -# The proftpd.key file must be readable by root only. The other file can be -# readable by anyone. -# -# chmod 0600 /etc/ssl/private/proftpd.key -# chmod 0640 /etc/ssl/private/proftpd.key -# -TLSRSACertificateFile /usr/local/vesta/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/vesta/ssl/certificate.key -# -# CA the server trusts... -#TLSCACertificateFile /etc/ssl/certs/CA.pem -# ...or avoid CA cert and be verbose -#TLSOptions NoCertRequest EnableDiags -# ... or the same with relaxed session use for some clients (e.g. FireFtp) -#TLSOptions NoCertRequest EnableDiags NoSessionReuseRequired -# -# -# Per default drop connection if client tries to start a renegotiate -# This is a fix for CVE-2009-3555 but could break some clients. -# -#TLSOptions AllowClientRenegotiations -# -TLSOptions NoSessionReuseRequired AllowClientRenegotiations -# Authenticate clients that want to use FTP over TLS? -# -#TLSVerifyClient off -# -# Are clients required to use FTP over TLS when talking to this server? -# -TLSRequired off -# -# Allow SSL/TLS renegotiations when the client requests them, but -# do not force the renegotations. Some clients do not support -# SSL/TLS renegotiations; when mod_tls forces a renegotiation, these -# clients will close the data connection, or there will be a timeout -# on an idle data connection. -# -TLSRenegotiate required off - diff --git a/install/debian/9/roundcube/apache.conf b/install/debian/9/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/debian/9/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/debian/9/roundcube/config.inc.php b/install/debian/9/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/debian/9/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/debian/9/roundcube/main.inc.php b/install/debian/9/roundcube/main.inc.php deleted file mode 100644 index 97cdbf2d..00000000 --- a/install/debian/9/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = false; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = false; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'larry'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 300 seconds (5min) -$rcmail_config['draft_autosave'] = 300; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/debian/9/roundcube/vesta.php b/install/debian/9/roundcube/vesta.php deleted file mode 100644 index b3dd167f..00000000 --- a/install/debian/9/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} diff --git a/install/debian/9/sudo/admin b/install/debian/9/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/debian/9/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/debian/9/templates/dns/child-ns.tpl b/install/debian/9/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/debian/9/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/9/templates/dns/default.tpl b/install/debian/9/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/debian/9/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/9/templates/dns/gmail.tpl b/install/debian/9/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/debian/9/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/debian/9/templates/web/apache2/basedir.stpl b/install/debian/9/templates/web/apache2/basedir.stpl deleted file mode 100644 index 60a8f7fd..00000000 --- a/install/debian/9/templates/web/apache2/basedir.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/basedir.tpl b/install/debian/9/templates/web/apache2/basedir.tpl deleted file mode 100644 index 3b8f875a..00000000 --- a/install/debian/9/templates/web/apache2/basedir.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/default.stpl b/install/debian/9/templates/web/apache2/default.stpl deleted file mode 100644 index 3fc7e160..00000000 --- a/install/debian/9/templates/web/apache2/default.stpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/default.tpl b/install/debian/9/templates/web/apache2/default.tpl deleted file mode 100644 index 464257ec..00000000 --- a/install/debian/9/templates/web/apache2/default.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/hosting.stpl b/install/debian/9/templates/web/apache2/hosting.stpl deleted file mode 100644 index b17014cd..00000000 --- a/install/debian/9/templates/web/apache2/hosting.stpl +++ /dev/null @@ -1,49 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/hosting.tpl b/install/debian/9/templates/web/apache2/hosting.tpl deleted file mode 100644 index 34f55b29..00000000 --- a/install/debian/9/templates/web/apache2/hosting.tpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/phpcgi.sh b/install/debian/9/templates/web/apache2/phpcgi.sh deleted file mode 100755 index 6565e103..00000000 --- a/install/debian/9/templates/web/apache2/phpcgi.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/debian/9/templates/web/apache2/phpcgi.stpl b/install/debian/9/templates/web/apache2/phpcgi.stpl deleted file mode 100644 index 7c1248d4..00000000 --- a/install/debian/9/templates/web/apache2/phpcgi.stpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/phpcgi.tpl b/install/debian/9/templates/web/apache2/phpcgi.tpl deleted file mode 100644 index 603ea8b9..00000000 --- a/install/debian/9/templates/web/apache2/phpcgi.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/phpfcgid.sh b/install/debian/9/templates/web/apache2/phpfcgid.sh deleted file mode 100755 index e8058249..00000000 --- a/install/debian/9/templates/web/apache2/phpfcgid.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script="#!/bin/sh -PHPRC=/usr/local/lib -export PHPRC -export PHP_FCGI_MAX_REQUESTS=1000 -export PHP_FCGI_CHILDREN=20 -exec /usr/bin/php-cgi -" -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/debian/9/templates/web/apache2/phpfcgid.stpl b/install/debian/9/templates/web/apache2/phpfcgid.stpl deleted file mode 100644 index 98304f2a..00000000 --- a/install/debian/9/templates/web/apache2/phpfcgid.stpl +++ /dev/null @@ -1,39 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - php_admin_value open_basedir none - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/apache2/phpfcgid.tpl b/install/debian/9/templates/web/apache2/phpfcgid.tpl deleted file mode 100644 index 525b1f53..00000000 --- a/install/debian/9/templates/web/apache2/phpfcgid.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/debian/9/templates/web/awstats/awstats.tpl b/install/debian/9/templates/web/awstats/awstats.tpl deleted file mode 100755 index 6bb51c50..00000000 --- a/install/debian/9/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1" -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/debian/9/templates/web/awstats/index.tpl b/install/debian/9/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/debian/9/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/debian/9/templates/web/awstats/nav.tpl b/install/debian/9/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/debian/9/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/debian/9/templates/web/nginx/caching.sh b/install/debian/9/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/debian/9/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/debian/9/templates/web/nginx/caching.stpl b/install/debian/9/templates/web/nginx/caching.stpl deleted file mode 100644 index f5c9740f..00000000 --- a/install/debian/9/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/caching.tpl b/install/debian/9/templates/web/nginx/caching.tpl deleted file mode 100644 index 73de28d5..00000000 --- a/install/debian/9/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/default.stpl b/install/debian/9/templates/web/nginx/default.stpl deleted file mode 100644 index 5a958ca4..00000000 --- a/install/debian/9/templates/web/nginx/default.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/default.tpl b/install/debian/9/templates/web/nginx/default.tpl deleted file mode 100644 index bebd47a2..00000000 --- a/install/debian/9/templates/web/nginx/default.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/force-https-legacy.stpl b/install/debian/9/templates/web/nginx/force-https-legacy.stpl deleted file mode 100644 index 79e55a26..00000000 --- a/install/debian/9/templates/web/nginx/force-https-legacy.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/force-https-legacy.tpl b/install/debian/9/templates/web/nginx/force-https-legacy.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/9/templates/web/nginx/force-https-legacy.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/9/templates/web/nginx/force-https-public.stpl b/install/debian/9/templates/web/nginx/force-https-public.stpl deleted file mode 100644 index ac422df6..00000000 --- a/install/debian/9/templates/web/nginx/force-https-public.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%/public; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%/public; - - include %home%/%user%/conf/web/snginx.%domain_idn%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/force-https-public.tpl b/install/debian/9/templates/web/nginx/force-https-public.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/9/templates/web/nginx/force-https-public.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.stpl b/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.stpl deleted file mode 100644 index 7e0e71d1..00000000 --- a/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /webmail { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /var/lib/roundcube; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /phpmyadmin { - disable_symlinks off; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root /usr/share; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl b/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/9/templates/web/nginx/force-https-webmail-phpmyadmin.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/9/templates/web/nginx/force-https.stpl b/install/debian/9/templates/web/nginx/force-https.stpl deleted file mode 100644 index 33fab443..00000000 --- a/install/debian/9/templates/web/nginx/force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/force-https.tpl b/install/debian/9/templates/web/nginx/force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/9/templates/web/nginx/force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/9/templates/web/nginx/hosting.sh b/install/debian/9/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/debian/9/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/debian/9/templates/web/nginx/hosting.stpl b/install/debian/9/templates/web/nginx/hosting.stpl deleted file mode 100644 index 605fa875..00000000 --- a/install/debian/9/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%sdocroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/hosting.tpl b/install/debian/9/templates/web/nginx/hosting.tpl deleted file mode 100644 index a41d4054..00000000 --- a/install/debian/9/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/http2.stpl b/install/debian/9/templates/web/nginx/http2.stpl deleted file mode 100644 index 5a958ca4..00000000 --- a/install/debian/9/templates/web/nginx/http2.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/http2.tpl b/install/debian/9/templates/web/nginx/http2.tpl deleted file mode 100644 index bebd47a2..00000000 --- a/install/debian/9/templates/web/nginx/http2.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index d85bcce3..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/debian/9/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 9c24c3ea..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,61 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/debian/9/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/debian/9/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index d7186314..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/debian/9/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/debian/9/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index 4f0b9ec7..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,127 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/debian/9/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/default.stpl b/install/debian/9/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index 5cb55311..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/default.tpl b/install/debian/9/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/debian/9/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index f85032ba..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/debian/9/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/drupal6.stpl b/install/debian/9/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 9d984000..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/drupal6.tpl b/install/debian/9/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index 0ae7568b..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/drupal7.stpl b/install/debian/9/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 0d7930fa..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/drupal7.tpl b/install/debian/9/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index 6b41f319..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/drupal8.stpl b/install/debian/9/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 6fd64db6..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/drupal8.tpl b/install/debian/9/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index 452aa9e6..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/joomla.stpl b/install/debian/9/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index 704405f3..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/joomla.tpl b/install/debian/9/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/laravel.stpl b/install/debian/9/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index 477f6f01..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/laravel.tpl b/install/debian/9/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/magento.stpl b/install/debian/9/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index fdab43aa..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,198 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/magento.tpl b/install/debian/9/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/modx.stpl b/install/debian/9/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index f410ab77..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/modx.tpl b/install/debian/9/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/moodle.stpl b/install/debian/9/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index f15a68c5..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/moodle.tpl b/install/debian/9/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/no-php.stpl b/install/debian/9/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index bc8b53a3..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,47 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/no-php.tpl b/install/debian/9/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/odoo.stpl b/install/debian/9/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index d6697d7a..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,70 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/odoo.tpl b/install/debian/9/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/opencart.stpl b/install/debian/9/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 908b9aeb..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/opencart.tpl b/install/debian/9/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/owncloud.stpl b/install/debian/9/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 891566b9..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/owncloud.tpl b/install/debian/9/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/piwik.stpl b/install/debian/9/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 78c1bb78..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,73 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/piwik.tpl b/install/debian/9/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/pyrocms.stpl b/install/debian/9/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index a721dd81..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/pyrocms.tpl b/install/debian/9/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/sendy.stpl b/install/debian/9/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index e7f3dcc6..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/sendy.tpl b/install/debian/9/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/vbulletin5.stpl b/install/debian/9/templates/web/nginx/php-fpm/vbulletin5.stpl deleted file mode 100644 index eebb3e42..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/vbulletin5.stpl +++ /dev/null @@ -1,105 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # legacy css being handled separate for performance - location = /css\.php { - rewrite ^ /core/css.php break; - } - - # make install available from presentation - location ^~ /install { - rewrite ^/install/ /core/install/ break; - } - - # any request to not existing item gets redirected through routestring - location / { - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - } - - # make admincp available from presentation - location ^~ /admincp { - if (!-f $request_filename) { - rewrite ^/admincp/(.*)$ /index.php?routestring=admincp/$1 last; - } - } - - # process any php scripts, not found gets redirected through routestring - location ~ \.php$ { - # handles legacy scripts - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 break; - } - - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout 180; - fastcgi_buffers 256 16k; - fastcgi_buffer_size 32k; - fastcgi_temp_file_write_size 256k; - - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/vbulletin5.tpl b/install/debian/9/templates/web/nginx/php-fpm/vbulletin5.tpl deleted file mode 100644 index 2c5c9988..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/vbulletin5.tpl +++ /dev/null @@ -1,100 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # legacy css being handled separate for performance - location = /css\.php { - rewrite ^ /core/css.php break; - } - - # make install available from presentation - location ^~ /install { - rewrite ^/install/ /core/install/ break; - } - - # any request to not existing item gets redirected through routestring - location / { - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - } - - # make admincp available from presentation - location ^~ /admincp { - if (!-f $request_filename) { - rewrite ^/admincp/(.*)$ /index.php?routestring=admincp/$1 last; - } - } - - # process any php scripts, not found gets redirected through routestring - location ~ \.php$ { - # handles legacy scripts - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 break; - } - - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout 180; - fastcgi_buffers 256 16k; - fastcgi_buffer_size 32k; - fastcgi_temp_file_write_size 256k; - - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress.stpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index 5cb55311..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress.tpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress2.stpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index e0aeb524..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress2.tpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index 0d9793ae..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/debian/9/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/debian/9/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/private-force-https.stpl b/install/debian/9/templates/web/nginx/private-force-https.stpl deleted file mode 100644 index 64094fb8..00000000 --- a/install/debian/9/templates/web/nginx/private-force-https.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - auth_basic "Restricted area"; - auth_basic_user_file /etc/nginx/.htpasswd; - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/install/debian/9/templates/web/nginx/private-force-https.tpl b/install/debian/9/templates/web/nginx/private-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/install/debian/9/templates/web/nginx/private-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/install/debian/9/templates/web/nginx/proxy_ip.tpl b/install/debian/9/templates/web/nginx/proxy_ip.tpl deleted file mode 100644 index ae195617..00000000 --- a/install/debian/9/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/debian/9/templates/web/php-fpm/default.tpl b/install/debian/9/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/debian/9/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/9/templates/web/php-fpm/no-php.tpl b/install/debian/9/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/debian/9/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/debian/9/templates/web/php-fpm/socket.tpl b/install/debian/9/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/debian/9/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/debian/9/templates/web/skel/document_errors/403.html b/install/debian/9/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/debian/9/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/debian/9/templates/web/skel/document_errors/404.html b/install/debian/9/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/debian/9/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/debian/9/templates/web/skel/document_errors/50x.html b/install/debian/9/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/debian/9/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/debian/9/templates/web/skel/public_html/index.html b/install/debian/9/templates/web/skel/public_html/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/9/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/9/templates/web/skel/public_html/robots.txt b/install/debian/9/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/9/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/9/templates/web/skel/public_shtml/index.html b/install/debian/9/templates/web/skel/public_shtml/index.html deleted file mode 100755 index c2895cf2..00000000 --- a/install/debian/9/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/debian/9/templates/web/skel/public_shtml/robots.txt b/install/debian/9/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/debian/9/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/debian/9/templates/web/suspend/.htaccess b/install/debian/9/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/debian/9/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/debian/9/templates/web/suspend/index.html b/install/debian/9/templates/web/suspend/index.html deleted file mode 100755 index f2d04e1f..00000000 --- a/install/debian/9/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

SUSPENDED

-

This website has been suspended.

-
- Please contact the technical support department. -
- - diff --git a/install/debian/9/templates/web/webalizer/webalizer.tpl b/install/debian/9/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/debian/9/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/debian/9/vsftpd/vsftpd.conf b/install/debian/9/vsftpd/vsftpd.conf deleted file mode 100644 index 1ca1a992..00000000 --- a/install/debian/9/vsftpd/vsftpd.conf +++ /dev/null @@ -1,26 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -#allow_writable_chroot=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_max_port=12100 -pasv_min_port=12000 -use_localtime=YES diff --git a/install/rhel/5/nginx/nginx.conf b/install/rhel/5/nginx/nginx.conf index 0a37ebbc..e0575030 100644 --- a/install/rhel/5/nginx/nginx.conf +++ b/install/rhel/5/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/rhel/5/nginx/phpmyadmin.inc b/install/rhel/5/nginx/phpmyadmin.inc index ee003007..efd6f4c4 100644 --- a/install/rhel/5/nginx/phpmyadmin.inc +++ b/install/rhel/5/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpMyAdmin; + alias /usr/share/phpMyAdmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/rhel/5/nginx/phppgadmin.inc b/install/rhel/5/nginx/phppgadmin.inc index 61dea1c9..333e560a 100644 --- a/install/rhel/5/nginx/phppgadmin.inc +++ b/install/rhel/5/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phpPgAdmin; + alias /usr/share/phpPgAdmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phpPgAdmin/$1; diff --git a/install/rhel/5/nginx/webmail.inc b/install/rhel/5/nginx/webmail.inc index d9cc181d..2d0fbe29 100644 --- a/install/rhel/5/nginx/webmail.inc +++ b/install/rhel/5/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /usr/share/roundcubemail; + alias /usr/share/roundcubemail/; location ~ /(config|temp|logs) { return 404; diff --git a/install/rhel/5/pma/config.inc.conf b/install/rhel/5/pma/config.inc.conf index f7584089..47ae207e 100644 --- a/install/rhel/5/pma/config.inc.conf +++ b/install/rhel/5/pma/config.inc.conf @@ -16,12 +16,6 @@ */ $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* * Servers configuration */ diff --git a/install/rhel/5/sudo/admin b/install/rhel/5/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/rhel/5/sudo/admin +++ b/install/rhel/5/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/5/templates/web/httpd/basedir.stpl b/install/rhel/5/templates/web/httpd/basedir.stpl index 2a3f9fbd..4ced9f38 100644 --- a/install/rhel/5/templates/web/httpd/basedir.stpl +++ b/install/rhel/5/templates/web/httpd/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/rhel/5/templates/web/httpd/hosting.stpl b/install/rhel/5/templates/web/httpd/hosting.stpl index f94fdb64..f94ba186 100644 --- a/install/rhel/5/templates/web/httpd/hosting.stpl +++ b/install/rhel/5/templates/web/httpd/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/rhel/5/templates/web/httpd/phpcgi.stpl b/install/rhel/5/templates/web/httpd/phpcgi.stpl index d544411c..591693a4 100644 --- a/install/rhel/5/templates/web/httpd/phpcgi.stpl +++ b/install/rhel/5/templates/web/httpd/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/rhel/5/templates/web/httpd/phpfcgid.stpl b/install/rhel/5/templates/web/httpd/phpfcgid.stpl index 38c5dd17..3bb82cca 100644 --- a/install/rhel/5/templates/web/httpd/phpfcgid.stpl +++ b/install/rhel/5/templates/web/httpd/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/rhel/5/templates/web/nginx/caching.stpl b/install/rhel/5/templates/web/nginx/caching.stpl index 720b880b..67b2f6c2 100755 --- a/install/rhel/5/templates/web/nginx/caching.stpl +++ b/install/rhel/5/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/caching.tpl b/install/rhel/5/templates/web/nginx/caching.tpl index fc721982..6d727c67 100755 --- a/install/rhel/5/templates/web/nginx/caching.tpl +++ b/install/rhel/5/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/default.stpl b/install/rhel/5/templates/web/nginx/default.stpl index 92804815..53ad8d1b 100755 --- a/install/rhel/5/templates/web/nginx/default.stpl +++ b/install/rhel/5/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/default.tpl b/install/rhel/5/templates/web/nginx/default.tpl index e49081a5..c1fec114 100755 --- a/install/rhel/5/templates/web/nginx/default.tpl +++ b/install/rhel/5/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/hosting.stpl b/install/rhel/5/templates/web/nginx/hosting.stpl index 10dae25e..aca458a4 100755 --- a/install/rhel/5/templates/web/nginx/hosting.stpl +++ b/install/rhel/5/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/rhel/5/templates/web/nginx/hosting.tpl b/install/rhel/5/templates/web/nginx/hosting.tpl index de42b9df..44d87496 100755 --- a/install/rhel/5/templates/web/nginx/hosting.tpl +++ b/install/rhel/5/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/http2.stpl b/install/rhel/5/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/rhel/5/templates/web/nginx/http2.stpl +++ b/install/rhel/5/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/http2.tpl b/install/rhel/5/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/rhel/5/templates/web/nginx/http2.tpl +++ b/install/rhel/5/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/sendy.stpl b/install/rhel/5/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/rhel/5/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/rhel/6/dovecot/conf.d/20-imap.conf b/install/rhel/6/dovecot/conf.d/20-imap.conf index fe1d2d75..2e740d49 100644 --- a/install/rhel/6/dovecot/conf.d/20-imap.conf +++ b/install/rhel/6/dovecot/conf.d/20-imap.conf @@ -2,15 +2,25 @@ ## IMAP specific settings ## -plugin { - autocreate = Trash - autocreate2 = Spam - autocreate3 = Sent - autocreate4 = Drafts - #autocreate5 = Custom - autosubscribe = Trash - autosubscribe2 = Spam - autosubscribe3 = Sent - autosubscribe4 = Drafts - #autosubscribe5 = Custom -} +protocol imap { + namespace inbox { + inbox = yes + + mailbox Trash { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Trash + } + mailbox Sent { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Sent + } + mailbox Spam { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Junk + } + mailbox Drafts { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Drafts + } + } +} \ No newline at end of file diff --git a/install/rhel/6/nginx/nginx.conf b/install/rhel/6/nginx/nginx.conf index 0a37ebbc..e0575030 100644 --- a/install/rhel/6/nginx/nginx.conf +++ b/install/rhel/6/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/rhel/6/nginx/phpmyadmin.inc b/install/rhel/6/nginx/phpmyadmin.inc index 122823d7..9c5a6882 100644 --- a/install/rhel/6/nginx/phpmyadmin.inc +++ b/install/rhel/6/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpMyAdmin; + alias /usr/share/phpMyAdmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/rhel/6/nginx/phppgadmin.inc b/install/rhel/6/nginx/phppgadmin.inc index 61dea1c9..333e560a 100644 --- a/install/rhel/6/nginx/phppgadmin.inc +++ b/install/rhel/6/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phpPgAdmin; + alias /usr/share/phpPgAdmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phpPgAdmin/$1; diff --git a/install/rhel/6/nginx/webmail.inc b/install/rhel/6/nginx/webmail.inc index d9cc181d..2d0fbe29 100644 --- a/install/rhel/6/nginx/webmail.inc +++ b/install/rhel/6/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /usr/share/roundcubemail; + alias /usr/share/roundcubemail/; location ~ /(config|temp|logs) { return 404; diff --git a/install/rhel/6/pma/config.inc.conf b/install/rhel/6/pma/config.inc.conf index f7584089..47ae207e 100644 --- a/install/rhel/6/pma/config.inc.conf +++ b/install/rhel/6/pma/config.inc.conf @@ -16,12 +16,6 @@ */ $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* * Servers configuration */ diff --git a/install/rhel/6/roundcube/vesta.php b/install/rhel/6/roundcube/vesta.php index 1e9523a5..fee26078 100644 --- a/install/rhel/6/roundcube/vesta.php +++ b/install/rhel/6/roundcube/vesta.php @@ -48,7 +48,7 @@ class rcube_vesta_password $context = stream_context_create(); $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); + result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); $result = stream_context_set_option($context, 'ssl', 'verify_host', false); $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); diff --git a/install/rhel/6/sudo/admin b/install/rhel/6/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/rhel/6/sudo/admin +++ b/install/rhel/6/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/6/templates/web/httpd/basedir.stpl b/install/rhel/6/templates/web/httpd/basedir.stpl index 2a3f9fbd..4ced9f38 100644 --- a/install/rhel/6/templates/web/httpd/basedir.stpl +++ b/install/rhel/6/templates/web/httpd/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/rhel/6/templates/web/httpd/hosting.stpl b/install/rhel/6/templates/web/httpd/hosting.stpl index 06bd6183..f1c1c111 100644 --- a/install/rhel/6/templates/web/httpd/hosting.stpl +++ b/install/rhel/6/templates/web/httpd/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/rhel/6/templates/web/httpd/phpcgi.stpl b/install/rhel/6/templates/web/httpd/phpcgi.stpl index d544411c..591693a4 100644 --- a/install/rhel/6/templates/web/httpd/phpcgi.stpl +++ b/install/rhel/6/templates/web/httpd/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/rhel/6/templates/web/httpd/phpfcgid.stpl b/install/rhel/6/templates/web/httpd/phpfcgid.stpl index 38c5dd17..3bb82cca 100644 --- a/install/rhel/6/templates/web/httpd/phpfcgid.stpl +++ b/install/rhel/6/templates/web/httpd/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/rhel/6/templates/web/nginx/caching.stpl b/install/rhel/6/templates/web/nginx/caching.stpl index 720b880b..67b2f6c2 100755 --- a/install/rhel/6/templates/web/nginx/caching.stpl +++ b/install/rhel/6/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/caching.tpl b/install/rhel/6/templates/web/nginx/caching.tpl index fc721982..6d727c67 100755 --- a/install/rhel/6/templates/web/nginx/caching.tpl +++ b/install/rhel/6/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/default.stpl b/install/rhel/6/templates/web/nginx/default.stpl index 92804815..53ad8d1b 100755 --- a/install/rhel/6/templates/web/nginx/default.stpl +++ b/install/rhel/6/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/default.tpl b/install/rhel/6/templates/web/nginx/default.tpl index e49081a5..c1fec114 100755 --- a/install/rhel/6/templates/web/nginx/default.tpl +++ b/install/rhel/6/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/hosting.stpl b/install/rhel/6/templates/web/nginx/hosting.stpl index 10dae25e..aca458a4 100755 --- a/install/rhel/6/templates/web/nginx/hosting.stpl +++ b/install/rhel/6/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/rhel/6/templates/web/nginx/hosting.tpl b/install/rhel/6/templates/web/nginx/hosting.tpl index de42b9df..44d87496 100755 --- a/install/rhel/6/templates/web/nginx/hosting.tpl +++ b/install/rhel/6/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/http2.stpl b/install/rhel/6/templates/web/nginx/http2.stpl index 0810e9d4..40e79aef 100644 --- a/install/rhel/6/templates/web/nginx/http2.stpl +++ b/install/rhel/6/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/http2.tpl b/install/rhel/6/templates/web/nginx/http2.tpl index 9344a7a9..826276bd 100644 --- a/install/rhel/6/templates/web/nginx/http2.tpl +++ b/install/rhel/6/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/sendy.stpl b/install/rhel/6/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/rhel/6/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/rhel/7/dovecot/conf.d/15-mailboxes.conf b/install/rhel/7/dovecot/conf.d/15-mailboxes.conf deleted file mode 100644 index 7b2bab97..00000000 --- a/install/rhel/7/dovecot/conf.d/15-mailboxes.conf +++ /dev/null @@ -1,29 +0,0 @@ -## Mailbox definitions -## - - -# NOTE: Assumes "namespace inbox" has been defined in 10-mail.conf. -namespace inbox { - mailbox Drafts { - special_use = \Drafts - auto = subscribe - } - - mailbox Junk { - special_use = \Junk - auto = subscribe - } - - mailbox Trash { - special_use = \Trash - auto = subscribe - } - - mailbox Sent { - special_use = \Sent - auto = subscribe - } - mailbox "Sent Messages" { - special_use = \Sent - } -} diff --git a/install/rhel/7/dovecot/conf.d/20-imap.conf b/install/rhel/7/dovecot/conf.d/20-imap.conf index fe1d2d75..2e740d49 100644 --- a/install/rhel/7/dovecot/conf.d/20-imap.conf +++ b/install/rhel/7/dovecot/conf.d/20-imap.conf @@ -2,15 +2,25 @@ ## IMAP specific settings ## -plugin { - autocreate = Trash - autocreate2 = Spam - autocreate3 = Sent - autocreate4 = Drafts - #autocreate5 = Custom - autosubscribe = Trash - autosubscribe2 = Spam - autosubscribe3 = Sent - autosubscribe4 = Drafts - #autosubscribe5 = Custom -} +protocol imap { + namespace inbox { + inbox = yes + + mailbox Trash { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Trash + } + mailbox Sent { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Sent + } + mailbox Spam { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Junk + } + mailbox Drafts { + auto = subscribe #Autocreate/subscribe mailbox? no, create or subscribe values + special_use = \Drafts + } + } +} \ No newline at end of file diff --git a/install/rhel/7/nginx/nginx.conf b/install/rhel/7/nginx/nginx.conf index 0a37ebbc..e0575030 100644 --- a/install/rhel/7/nginx/nginx.conf +++ b/install/rhel/7/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/rhel/7/nginx/phpmyadmin.inc b/install/rhel/7/nginx/phpmyadmin.inc index 79e17c58..457ee11c 100644 --- a/install/rhel/7/nginx/phpmyadmin.inc +++ b/install/rhel/7/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpMyAdmin; + alias /usr/share/phpMyAdmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/rhel/7/nginx/phppgadmin.inc b/install/rhel/7/nginx/phppgadmin.inc index 61dea1c9..333e560a 100644 --- a/install/rhel/7/nginx/phppgadmin.inc +++ b/install/rhel/7/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phpPgAdmin; + alias /usr/share/phpPgAdmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phpPgAdmin/$1; diff --git a/install/rhel/7/nginx/webmail.inc b/install/rhel/7/nginx/webmail.inc index 63679d35..123e4af5 100644 --- a/install/rhel/7/nginx/webmail.inc +++ b/install/rhel/7/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /usr/share/roundcubemail; + alias /usr/share/roundcubemail/; location ~ /(config|temp|logs) { return 404; diff --git a/install/rhel/7/pma/config.inc.conf b/install/rhel/7/pma/config.inc.conf index 1a65fd6c..47ae207e 100644 --- a/install/rhel/7/pma/config.inc.conf +++ b/install/rhel/7/pma/config.inc.conf @@ -4,32 +4,24 @@ * phpMyAdmin sample configuration, you can use it as base for * manual configuration. For easier setup you can use setup/ * - * All directives are explained in documentation in the doc/ folder - * or at . + * All directives are explained in Documentation.html and on phpMyAdmin + * wiki . * - * @package PhpMyAdmin + * @package phpMyAdmin */ -/** +/* * This is needed for cookie based authentication to encrypt password in - * cookie. Needs to be 32 chars long. + * cookie */ $cfg['blowfish_secret'] = '%blowfish_secret%'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ -/** -======= -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* * Servers configuration */ $i = 0; -/** +/* * First server */ $i++; @@ -37,64 +29,44 @@ $i++; $cfg['Servers'][$i]['auth_type'] = 'cookie'; /* Server parameters */ $cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['connect_type'] = 'tcp'; $cfg['Servers'][$i]['compress'] = false; +/* Select mysqli if your server has it */ +$cfg['Servers'][$i]['extension'] = 'mysql'; $cfg['Servers'][$i]['AllowNoPassword'] = false; -/** +/* * phpMyAdmin configuration storage settings. */ /* User used to manipulate with storage */ -$cfg['Servers'][$i]['controlhost'] = ''; -$cfg['Servers'][$i]['controlport'] = ''; -$cfg['Servers'][$i]['controluser'] = 'phpmyadmin'; -$cfg['Servers'][$i]['controlpass'] = '%phpmyadmin_pass%'; +// $cfg['Servers'][$i]['controluser'] = 'pma'; +// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; /* Storage database and tables */ -$cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -$cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -$cfg['Servers'][$i]['relation'] = 'pma__relation'; -$cfg['Servers'][$i]['table_info'] = 'pma__table_info'; -$cfg['Servers'][$i]['table_coords'] = 'pma__table_coords'; -$cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages'; -$cfg['Servers'][$i]['column_info'] = 'pma__column_info'; -$cfg['Servers'][$i]['history'] = 'pma__history'; -$cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs'; -$cfg['Servers'][$i]['tracking'] = 'pma__tracking'; -$cfg['Servers'][$i]['userconfig'] = 'pma__userconfig'; -$cfg['Servers'][$i]['recent'] = 'pma__recent'; -$cfg['Servers'][$i]['favorite'] = 'pma__favorite'; -$cfg['Servers'][$i]['users'] = 'pma__users'; -$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups'; -$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding'; -$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches'; -$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns'; -$cfg['Servers'][$i]['designer_settings'] = 'pma__designer_settings'; -$cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; +// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; +// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark'; +// $cfg['Servers'][$i]['relation'] = 'pma_relation'; +// $cfg['Servers'][$i]['table_info'] = 'pma_table_info'; +// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords'; +// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages'; +// $cfg['Servers'][$i]['column_info'] = 'pma_column_info'; +// $cfg['Servers'][$i]['history'] = 'pma_history'; +// $cfg['Servers'][$i]['tracking'] = 'pma_tracking'; +// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; +// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig'; +/* Contrib / Swekey authentication */ +// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; -/** +/* * End of servers configuration */ -/** +/* * Directories for saving/loading files from server */ -$cfg['UploadDir'] = '/var/lib/phpMyAdmin/upload'; -$cfg['SaveDir'] = '/var/lib/phpMyAdmin/save'; - -/* - * Temp dir for faster beahivour - * -*/ -$cfg['TempDir'] = '/tmp'; - - -/** - * Whether to display icons or text or both icons and text in table row - * action segment. Value can be either of 'icons', 'text' or 'both'. - * default = 'both' - */ -//$cfg['RowActionType'] = 'icons'; +$cfg['UploadDir'] = ''; +$cfg['SaveDir'] = ''; /** * Defines whether a user should be displayed a "show all (records)" @@ -106,21 +78,25 @@ $cfg['TempDir'] = '/tmp'; /** * Number of rows displayed when browsing a result set. If the result * set contains more rows, "Previous" and "Next". - * Possible values: 25, 50, 100, 250, 500 - * default = 25 + * default = 30 */ //$cfg['MaxRows'] = 50; /** - * Disallow editing of binary fields - * valid values are: - * false allow editing - * 'blob' allow editing except for BLOB fields - * 'noblob' disallow editing except for BLOB fields - * 'all' disallow editing - * default = 'blob' + * Use graphically less intense menu tabs + * default = false */ -//$cfg['ProtectBinary'] = false; +//$cfg['LightTabs'] = true; + +/** + * disallow editing of binary fields + * valid values are: + * false allow editing + * 'blob' allow editing except for BLOB fields + * 'all' disallow editing + * default = blob + */ +//$cfg['ProtectBinary'] = 'false'; /** * Default language to use, if not browser-defined or user-defined @@ -131,6 +107,12 @@ $cfg['TempDir'] = '/tmp'; //$cfg['DefaultLang'] = 'en'; //$cfg['DefaultLang'] = 'de'; +/** + * default display direction (horizontal|vertical|horizontalflipped) + */ +//$cfg['DefaultDisplay'] = 'vertical'; + + /** * How many columns should be used for table display of a database? * (a value larger than 1 results in some information being hidden) @@ -149,21 +131,13 @@ $cfg['TempDir'] = '/tmp'; /** * When using DB-based query history, how many entries should be kept? + * * default = 25 */ //$cfg['QueryHistoryMax'] = 100; -/** - * Whether or not to query the user before sending the error report to - * the phpMyAdmin team when a JavaScript error occurs - * - * Available options - * ('ask' | 'always' | 'never') - * default = 'ask' - */ -//$cfg['SendErrorReports'] = 'always'; - -/** - * You can find more configuration options in the documentation - * in the doc/ folder or at . +/* + * You can find more configuration options in Documentation.html + * or here: http://wiki.phpmyadmin.net/pma/Config */ +?> diff --git a/install/rhel/7/sudo/admin b/install/rhel/7/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/rhel/7/sudo/admin +++ b/install/rhel/7/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/rhel/7/templates/web/httpd/basedir.stpl b/install/rhel/7/templates/web/httpd/basedir.stpl index 210edc13..95221539 100644 --- a/install/rhel/7/templates/web/httpd/basedir.stpl +++ b/install/rhel/7/templates/web/httpd/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/rhel/7/templates/web/httpd/hosting.stpl b/install/rhel/7/templates/web/httpd/hosting.stpl index 699c413b..673c9c01 100644 --- a/install/rhel/7/templates/web/httpd/hosting.stpl +++ b/install/rhel/7/templates/web/httpd/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/rhel/7/templates/web/httpd/phpcgi.stpl b/install/rhel/7/templates/web/httpd/phpcgi.stpl index 1eb39e0a..1f7b3547 100644 --- a/install/rhel/7/templates/web/httpd/phpcgi.stpl +++ b/install/rhel/7/templates/web/httpd/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/rhel/7/templates/web/httpd/phpfcgid.stpl b/install/rhel/7/templates/web/httpd/phpfcgid.stpl index 31f09bc1..6d7e81df 100644 --- a/install/rhel/7/templates/web/httpd/phpfcgid.stpl +++ b/install/rhel/7/templates/web/httpd/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/rhel/7/templates/web/nginx/caching.stpl b/install/rhel/7/templates/web/nginx/caching.stpl index 720b880b..67b2f6c2 100755 --- a/install/rhel/7/templates/web/nginx/caching.stpl +++ b/install/rhel/7/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/caching.tpl b/install/rhel/7/templates/web/nginx/caching.tpl index fc721982..6d727c67 100755 --- a/install/rhel/7/templates/web/nginx/caching.tpl +++ b/install/rhel/7/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/default.stpl b/install/rhel/7/templates/web/nginx/default.stpl index 92804815..53ad8d1b 100755 --- a/install/rhel/7/templates/web/nginx/default.stpl +++ b/install/rhel/7/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/default.tpl b/install/rhel/7/templates/web/nginx/default.tpl index e49081a5..c1fec114 100755 --- a/install/rhel/7/templates/web/nginx/default.tpl +++ b/install/rhel/7/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/hosting.stpl b/install/rhel/7/templates/web/nginx/hosting.stpl index 10dae25e..aca458a4 100755 --- a/install/rhel/7/templates/web/nginx/hosting.stpl +++ b/install/rhel/7/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/httpd/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/rhel/7/templates/web/nginx/hosting.tpl b/install/rhel/7/templates/web/nginx/hosting.tpl index de42b9df..44d87496 100755 --- a/install/rhel/7/templates/web/nginx/hosting.tpl +++ b/install/rhel/7/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/http2.stpl b/install/rhel/7/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/rhel/7/templates/web/nginx/http2.stpl +++ b/install/rhel/7/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/http2.tpl b/install/rhel/7/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/rhel/7/templates/web/nginx/http2.tpl +++ b/install/rhel/7/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/sendy.stpl b/install/rhel/7/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/rhel/7/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/rhel/8/vsftpd/vsftpd.conf b/install/rhel/8/vsftpd/vsftpd.conf deleted file mode 100644 index 75e0104f..00000000 --- a/install/rhel/8/vsftpd/vsftpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_promiscuous=YES -pasv_min_port=12000 -pasv_max_port=12100 -max_per_ip=10 -max_clients=100 -use_localtime=YES -utf8_filesystem=YES -ssl_enable=YES -allow_anon_ssl=NO -require_ssl_reuse=NO -ssl_ciphers=HIGH -ssl_tlsv1=YES -ssl_sslv2=NO -ssl_sslv3=NO -force_local_data_ssl=NO -force_local_logins_ssl=NO -rsa_cert_file=/usr/local/vesta/ssl/certificate.crt -rsa_private_key_file=/usr/local/vesta/ssl/certificate.key diff --git a/install/ubuntu/12.04/nginx/nginx.conf b/install/ubuntu/12.04/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/12.04/nginx/nginx.conf +++ b/install/ubuntu/12.04/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/12.04/nginx/phpmyadmin.inc b/install/ubuntu/12.04/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/12.04/nginx/phpmyadmin.inc +++ b/install/ubuntu/12.04/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/12.04/nginx/phppgadmin.inc b/install/ubuntu/12.04/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/12.04/nginx/phppgadmin.inc +++ b/install/ubuntu/12.04/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/12.04/nginx/webmail.inc b/install/ubuntu/12.04/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/12.04/nginx/webmail.inc +++ b/install/ubuntu/12.04/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/12.04/pma/config.inc.php b/install/ubuntu/12.04/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/12.04/pma/config.inc.php +++ b/install/ubuntu/12.04/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/12.04/sudo/admin b/install/ubuntu/12.04/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/12.04/sudo/admin +++ b/install/ubuntu/12.04/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl index fe0b5b40..dda3aa76 100644 --- a/install/ubuntu/12.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl index e1442ce2..627325e0 100644 --- a/install/ubuntu/12.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl index 40ce5fb2..aa807091 100644 --- a/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl index 5d27efcd..88cea0e6 100644 --- a/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/12.04/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.stpl b/install/ubuntu/12.04/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/12.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/caching.tpl b/install/ubuntu/12.04/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/12.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/default.stpl b/install/ubuntu/12.04/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/12.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/default.tpl b/install/ubuntu/12.04/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/12.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/12.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/12.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/http2.stpl b/install/ubuntu/12.04/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/12.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/http2.tpl b/install/ubuntu/12.04/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/12.04/templates/web/nginx/http2.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/12.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/12.10/nginx/nginx.conf b/install/ubuntu/12.10/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/12.10/nginx/nginx.conf +++ b/install/ubuntu/12.10/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/12.10/nginx/phpmyadmin.inc b/install/ubuntu/12.10/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/12.10/nginx/phpmyadmin.inc +++ b/install/ubuntu/12.10/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/12.10/nginx/phppgadmin.inc b/install/ubuntu/12.10/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/12.10/nginx/phppgadmin.inc +++ b/install/ubuntu/12.10/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/12.10/nginx/webmail.inc b/install/ubuntu/12.10/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/12.10/nginx/webmail.inc +++ b/install/ubuntu/12.10/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/12.10/pma/config.inc.php b/install/ubuntu/12.10/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/12.10/pma/config.inc.php +++ b/install/ubuntu/12.10/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/12.10/sudo/admin b/install/ubuntu/12.10/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/12.10/sudo/admin +++ b/install/ubuntu/12.10/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl index fe0b5b40..dda3aa76 100644 --- a/install/ubuntu/12.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl index e1442ce2..627325e0 100644 --- a/install/ubuntu/12.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl index 40ce5fb2..aa807091 100644 --- a/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl index 5d27efcd..88cea0e6 100644 --- a/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/12.10/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.stpl b/install/ubuntu/12.10/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/12.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/caching.tpl b/install/ubuntu/12.10/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/12.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/default.stpl b/install/ubuntu/12.10/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/12.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/default.tpl b/install/ubuntu/12.10/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/12.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/12.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/12.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/http2.stpl b/install/ubuntu/12.10/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/12.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/http2.tpl b/install/ubuntu/12.10/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/12.10/templates/web/nginx/http2.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/12.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/13.04/nginx/nginx.conf b/install/ubuntu/13.04/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/13.04/nginx/nginx.conf +++ b/install/ubuntu/13.04/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/13.04/nginx/phpmyadmin.inc b/install/ubuntu/13.04/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/13.04/nginx/phpmyadmin.inc +++ b/install/ubuntu/13.04/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/13.04/nginx/phppgadmin.inc b/install/ubuntu/13.04/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/13.04/nginx/phppgadmin.inc +++ b/install/ubuntu/13.04/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/13.04/nginx/webmail.inc b/install/ubuntu/13.04/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/13.04/nginx/webmail.inc +++ b/install/ubuntu/13.04/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/13.04/pma/config.inc.php b/install/ubuntu/13.04/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/13.04/pma/config.inc.php +++ b/install/ubuntu/13.04/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/13.04/sudo/admin b/install/ubuntu/13.04/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/13.04/sudo/admin +++ b/install/ubuntu/13.04/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl index fe0b5b40..dda3aa76 100644 --- a/install/ubuntu/13.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl index be7ef310..ce0763ae 100644 --- a/install/ubuntu/13.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl index 40ce5fb2..aa807091 100644 --- a/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl index 5d27efcd..88cea0e6 100644 --- a/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/13.04/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.stpl b/install/ubuntu/13.04/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/13.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/caching.tpl b/install/ubuntu/13.04/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/13.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/default.stpl b/install/ubuntu/13.04/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/13.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/default.tpl b/install/ubuntu/13.04/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/13.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/13.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/13.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/http2.stpl b/install/ubuntu/13.04/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/13.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/http2.tpl b/install/ubuntu/13.04/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/13.04/templates/web/nginx/http2.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/13.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/13.10/nginx/nginx.conf b/install/ubuntu/13.10/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/13.10/nginx/nginx.conf +++ b/install/ubuntu/13.10/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/13.10/nginx/phpmyadmin.inc b/install/ubuntu/13.10/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/13.10/nginx/phpmyadmin.inc +++ b/install/ubuntu/13.10/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/13.10/nginx/phppgadmin.inc b/install/ubuntu/13.10/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/13.10/nginx/phppgadmin.inc +++ b/install/ubuntu/13.10/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/13.10/nginx/webmail.inc b/install/ubuntu/13.10/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/13.10/nginx/webmail.inc +++ b/install/ubuntu/13.10/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/13.10/pma/config.inc.php b/install/ubuntu/13.10/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/13.10/pma/config.inc.php +++ b/install/ubuntu/13.10/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/13.10/sudo/admin b/install/ubuntu/13.10/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/13.10/sudo/admin +++ b/install/ubuntu/13.10/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/13.10/templates/web/apache2/basedir.stpl b/install/ubuntu/13.10/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/13.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/13.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/13.10/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.stpl b/install/ubuntu/13.10/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/13.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/caching.tpl b/install/ubuntu/13.10/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/13.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/default.stpl b/install/ubuntu/13.10/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/13.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/default.tpl b/install/ubuntu/13.10/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/13.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/13.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/13.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/http2.stpl b/install/ubuntu/13.10/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/13.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/http2.tpl b/install/ubuntu/13.10/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/13.10/templates/web/nginx/http2.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/13.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/14.04/nginx/nginx.conf b/install/ubuntu/14.04/nginx/nginx.conf index c44ab650..1932d171 100644 --- a/install/ubuntu/14.04/nginx/nginx.conf +++ b/install/ubuntu/14.04/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/14.04/nginx/phpmyadmin.inc b/install/ubuntu/14.04/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/14.04/nginx/phpmyadmin.inc +++ b/install/ubuntu/14.04/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/14.04/nginx/phppgadmin.inc b/install/ubuntu/14.04/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/14.04/nginx/phppgadmin.inc +++ b/install/ubuntu/14.04/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/14.04/nginx/webmail.inc b/install/ubuntu/14.04/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/14.04/nginx/webmail.inc +++ b/install/ubuntu/14.04/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/14.04/pma/config.inc.php b/install/ubuntu/14.04/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/14.04/pma/config.inc.php +++ b/install/ubuntu/14.04/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/14.04/sudo/admin b/install/ubuntu/14.04/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/14.04/sudo/admin +++ b/install/ubuntu/14.04/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/14.04/templates/web/apache2/basedir.stpl b/install/ubuntu/14.04/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/14.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/14.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/14.04/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.stpl b/install/ubuntu/14.04/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/14.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/caching.tpl b/install/ubuntu/14.04/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/14.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/default.stpl b/install/ubuntu/14.04/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/14.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/default.tpl b/install/ubuntu/14.04/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/14.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/14.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/14.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/http2.stpl b/install/ubuntu/14.04/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/14.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/http2.tpl b/install/ubuntu/14.04/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/14.04/templates/web/nginx/http2.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/14.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/14.10/nginx/nginx.conf b/install/ubuntu/14.10/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/14.10/nginx/nginx.conf +++ b/install/ubuntu/14.10/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/14.10/nginx/phpmyadmin.inc b/install/ubuntu/14.10/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/14.10/nginx/phpmyadmin.inc +++ b/install/ubuntu/14.10/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/14.10/nginx/phppgadmin.inc b/install/ubuntu/14.10/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/14.10/nginx/phppgadmin.inc +++ b/install/ubuntu/14.10/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/14.10/nginx/webmail.inc b/install/ubuntu/14.10/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/14.10/nginx/webmail.inc +++ b/install/ubuntu/14.10/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/14.10/pma/config.inc.php b/install/ubuntu/14.10/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/14.10/pma/config.inc.php +++ b/install/ubuntu/14.10/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/14.10/sudo/admin b/install/ubuntu/14.10/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/14.10/sudo/admin +++ b/install/ubuntu/14.10/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/14.10/templates/web/apache2/basedir.stpl b/install/ubuntu/14.10/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/14.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/14.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/14.10/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.stpl b/install/ubuntu/14.10/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/14.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/caching.tpl b/install/ubuntu/14.10/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/14.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/default.stpl b/install/ubuntu/14.10/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/14.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/default.tpl b/install/ubuntu/14.10/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/14.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/14.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/14.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/http2.stpl b/install/ubuntu/14.10/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/14.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/http2.tpl b/install/ubuntu/14.10/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/14.10/templates/web/nginx/http2.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/14.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/15.04/nginx/nginx.conf b/install/ubuntu/15.04/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/15.04/nginx/nginx.conf +++ b/install/ubuntu/15.04/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/15.04/nginx/phpmyadmin.inc b/install/ubuntu/15.04/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/15.04/nginx/phpmyadmin.inc +++ b/install/ubuntu/15.04/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/15.04/nginx/phppgadmin.inc b/install/ubuntu/15.04/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/15.04/nginx/phppgadmin.inc +++ b/install/ubuntu/15.04/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/15.04/nginx/webmail.inc b/install/ubuntu/15.04/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/15.04/nginx/webmail.inc +++ b/install/ubuntu/15.04/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/15.04/pma/config.inc.php b/install/ubuntu/15.04/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/15.04/pma/config.inc.php +++ b/install/ubuntu/15.04/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/15.04/sudo/admin b/install/ubuntu/15.04/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/15.04/sudo/admin +++ b/install/ubuntu/15.04/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/15.04/templates/web/apache2/basedir.stpl b/install/ubuntu/15.04/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/15.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/15.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/15.04/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.stpl b/install/ubuntu/15.04/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/15.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/caching.tpl b/install/ubuntu/15.04/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/15.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/default.stpl b/install/ubuntu/15.04/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/15.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/default.tpl b/install/ubuntu/15.04/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/15.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/15.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/15.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/http2.stpl b/install/ubuntu/15.04/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/15.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/http2.tpl b/install/ubuntu/15.04/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/15.04/templates/web/nginx/http2.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/15.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/15.10/nginx/nginx.conf b/install/ubuntu/15.10/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/15.10/nginx/nginx.conf +++ b/install/ubuntu/15.10/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/15.10/nginx/phpmyadmin.inc b/install/ubuntu/15.10/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/15.10/nginx/phpmyadmin.inc +++ b/install/ubuntu/15.10/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/15.10/nginx/phppgadmin.inc b/install/ubuntu/15.10/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/15.10/nginx/phppgadmin.inc +++ b/install/ubuntu/15.10/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/15.10/nginx/webmail.inc b/install/ubuntu/15.10/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/15.10/nginx/webmail.inc +++ b/install/ubuntu/15.10/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/15.10/pma/config.inc.php b/install/ubuntu/15.10/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/15.10/pma/config.inc.php +++ b/install/ubuntu/15.10/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/15.10/sudo/admin b/install/ubuntu/15.10/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/15.10/sudo/admin +++ b/install/ubuntu/15.10/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/15.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/15.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/15.10/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.stpl b/install/ubuntu/15.10/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/15.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/caching.tpl b/install/ubuntu/15.10/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/15.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/default.stpl b/install/ubuntu/15.10/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/15.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/default.tpl b/install/ubuntu/15.10/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/15.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/15.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/15.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/http2.stpl b/install/ubuntu/15.10/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/15.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/http2.tpl b/install/ubuntu/15.10/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/15.10/templates/web/nginx/http2.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/15.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/16.04/dovecot/dovecot.conf b/install/ubuntu/16.04/dovecot/dovecot.conf index 163460ba..311a3351 100644 --- a/install/ubuntu/16.04/dovecot/dovecot.conf +++ b/install/ubuntu/16.04/dovecot/dovecot.conf @@ -3,7 +3,7 @@ listen = *, :: base_dir = /var/run/dovecot/ !include conf.d/*.conf -namespace inbox { +namespace { type = private separator = / prefix = diff --git a/install/ubuntu/16.04/nginx/nginx.conf b/install/ubuntu/16.04/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/16.04/nginx/nginx.conf +++ b/install/ubuntu/16.04/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/16.04/nginx/phpmyadmin.inc b/install/ubuntu/16.04/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/16.04/nginx/phpmyadmin.inc +++ b/install/ubuntu/16.04/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/16.04/nginx/phppgadmin.inc b/install/ubuntu/16.04/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/16.04/nginx/phppgadmin.inc +++ b/install/ubuntu/16.04/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/16.04/nginx/webmail.inc b/install/ubuntu/16.04/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/16.04/nginx/webmail.inc +++ b/install/ubuntu/16.04/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/16.04/pma/config.inc.php b/install/ubuntu/16.04/pma/config.inc.php index fb131d65..d8a903e4 100644 --- a/install/ubuntu/16.04/pma/config.inc.php +++ b/install/ubuntu/16.04/pma/config.inc.php @@ -139,12 +139,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/16.04/roundcube/vesta.php b/install/ubuntu/16.04/roundcube/vesta.php index b6646b2b..99e1d4bc 100644 --- a/install/ubuntu/16.04/roundcube/vesta.php +++ b/install/ubuntu/16.04/roundcube/vesta.php @@ -6,9 +6,8 @@ * @version 1.0 * @author Serghey Rodin */ -class rcube_vesta_password -{ - function save($curpass, $passwd) + + function password_save($curpass, $passwd) { $rcmail = rcmail::get_instance(); $vesta_host = $rcmail->config->get('password_vesta_host'); @@ -70,4 +69,3 @@ class rcube_vesta_password } } -} \ No newline at end of file diff --git a/install/ubuntu/16.04/sudo/admin b/install/ubuntu/16.04/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/16.04/sudo/admin +++ b/install/ubuntu/16.04/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/16.04/templates/web/apache2/basedir.stpl b/install/ubuntu/16.04/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/16.04/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/16.04/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/16.04/templates/web/apache2/hosting.stpl b/install/ubuntu/16.04/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/16.04/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/16.04/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/16.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/16.04/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/16.04/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/16.04/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/16.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/16.04/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/16.04/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/16.04/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/16.04/templates/web/nginx/caching.stpl b/install/ubuntu/16.04/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/16.04/templates/web/nginx/caching.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/caching.tpl b/install/ubuntu/16.04/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/16.04/templates/web/nginx/caching.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/default.stpl b/install/ubuntu/16.04/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/16.04/templates/web/nginx/default.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/default.tpl b/install/ubuntu/16.04/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/16.04/templates/web/nginx/default.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/hosting.stpl b/install/ubuntu/16.04/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/16.04/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/16.04/templates/web/nginx/hosting.tpl b/install/ubuntu/16.04/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/16.04/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/http2.stpl b/install/ubuntu/16.04/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/16.04/templates/web/nginx/http2.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/http2.tpl b/install/ubuntu/16.04/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/16.04/templates/web/nginx/http2.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/16.04/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/16.10/nginx/nginx.conf b/install/ubuntu/16.10/nginx/nginx.conf index 6bc999f9..e7256de7 100644 --- a/install/ubuntu/16.10/nginx/nginx.conf +++ b/install/ubuntu/16.10/nginx/nginx.conf @@ -50,7 +50,6 @@ http { # Compression gzip on; - gzip_vary on; gzip_comp_level 9; gzip_min_length 512; gzip_buffers 8 64k; diff --git a/install/ubuntu/16.10/nginx/phpmyadmin.inc b/install/ubuntu/16.10/nginx/phpmyadmin.inc index cdfc93c4..1feb8546 100644 --- a/install/ubuntu/16.10/nginx/phpmyadmin.inc +++ b/install/ubuntu/16.10/nginx/phpmyadmin.inc @@ -1,5 +1,5 @@ location /phpmyadmin { - alias /usr/share/phpmyadmin; + alias /usr/share/phpmyadmin/; location ~ /(libraries|setup) { return 404; diff --git a/install/ubuntu/16.10/nginx/phppgadmin.inc b/install/ubuntu/16.10/nginx/phppgadmin.inc index 47cfcf4e..cd1e5806 100644 --- a/install/ubuntu/16.10/nginx/phppgadmin.inc +++ b/install/ubuntu/16.10/nginx/phppgadmin.inc @@ -1,5 +1,5 @@ location /phppgadmin { - alias /usr/share/phppgadmin; + alias /usr/share/phppgadmin/; location ~ ^/phppgadmin/(.*\.php)$ { alias /usr/share/phppgadmin/$1; diff --git a/install/ubuntu/16.10/nginx/webmail.inc b/install/ubuntu/16.10/nginx/webmail.inc index 768c9049..ad66895b 100644 --- a/install/ubuntu/16.10/nginx/webmail.inc +++ b/install/ubuntu/16.10/nginx/webmail.inc @@ -1,5 +1,5 @@ location /webmail { - alias /var/lib/roundcube; + alias /var/lib/roundcube/; location ~ /(config|temp|logs) { return 404; diff --git a/install/ubuntu/16.10/pma/config.inc.php b/install/ubuntu/16.10/pma/config.inc.php index 36093369..a643a065 100644 --- a/install/ubuntu/16.10/pma/config.inc.php +++ b/install/ubuntu/16.10/pma/config.inc.php @@ -137,12 +137,6 @@ if (!empty($dbname)) { $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -/* - * Temp dir for faster beahivour - * - */ -$cfg['TempDir'] = '/tmp'; - /* Support additional configurations */ foreach (glob('/etc/phpmyadmin/conf.d/*.php') as $filename) { diff --git a/install/ubuntu/16.10/roundcube/vesta.php b/install/ubuntu/16.10/roundcube/vesta.php index b4a2a6b6..99e1d4bc 100644 --- a/install/ubuntu/16.10/roundcube/vesta.php +++ b/install/ubuntu/16.10/roundcube/vesta.php @@ -6,8 +6,8 @@ * @version 1.0 * @author Serghey Rodin */ -class rcube_vesta_password { - function save($curpass, $passwd) + + function password_save($curpass, $passwd) { $rcmail = rcmail::get_instance(); $vesta_host = $rcmail->config->get('password_vesta_host'); @@ -69,4 +69,3 @@ class rcube_vesta_password { } } -} \ No newline at end of file diff --git a/install/ubuntu/16.10/sudo/admin b/install/ubuntu/16.10/sudo/admin index 331fa1f2..4226bdd4 100644 --- a/install/ubuntu/16.10/sudo/admin +++ b/install/ubuntu/16.10/sudo/admin @@ -4,5 +4,5 @@ Defaults:admin !syslog Defaults:admin !requiretty Defaults:root !requiretty -# sudo is limited to vesta scripts +admin ALL=(ALL) ALL admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/16.10/templates/web/apache2/basedir.stpl b/install/ubuntu/16.10/templates/web/apache2/basedir.stpl index 2db1d52c..d978d4c4 100644 --- a/install/ubuntu/16.10/templates/web/apache2/basedir.stpl +++ b/install/ubuntu/16.10/templates/web/apache2/basedir.stpl @@ -15,7 +15,7 @@ AllowOverride All SSLRequireSSL Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" diff --git a/install/ubuntu/16.10/templates/web/apache2/hosting.stpl b/install/ubuntu/16.10/templates/web/apache2/hosting.stpl index c9c19512..8892072b 100644 --- a/install/ubuntu/16.10/templates/web/apache2/hosting.stpl +++ b/install/ubuntu/16.10/templates/web/apache2/hosting.stpl @@ -22,7 +22,7 @@ php_admin_flag mysql.allow_persistent off php_admin_flag safe_mode off php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube + php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/16.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/16.10/templates/web/apache2/phpcgi.stpl index ae560dbe..731355bc 100644 --- a/install/ubuntu/16.10/templates/web/apache2/phpcgi.stpl +++ b/install/ubuntu/16.10/templates/web/apache2/phpcgi.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp Action phpcgi-script /cgi-bin/php diff --git a/install/ubuntu/16.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/16.10/templates/web/apache2/phpfcgid.stpl index bc3688d9..156c8a91 100644 --- a/install/ubuntu/16.10/templates/web/apache2/phpfcgid.stpl +++ b/install/ubuntu/16.10/templates/web/apache2/phpfcgid.stpl @@ -15,7 +15,7 @@ SSLRequireSSL AllowOverride All Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp + php_admin_value open_basedir %docroot%:%home%/%user%/tmp php_admin_value upload_tmp_dir %home%/%user%/tmp php_admin_value session.save_path %home%/%user%/tmp diff --git a/install/ubuntu/16.10/templates/web/nginx/caching.stpl b/install/ubuntu/16.10/templates/web/nginx/caching.stpl index 61b74814..5e0e4064 100755 --- a/install/ubuntu/16.10/templates/web/nginx/caching.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/caching.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -34,7 +35,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/caching.tpl b/install/ubuntu/16.10/templates/web/nginx/caching.tpl index 73de28d5..36761b65 100755 --- a/install/ubuntu/16.10/templates/web/nginx/caching.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/caching.tpl @@ -32,7 +32,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/default.stpl b/install/ubuntu/16.10/templates/web/nginx/default.stpl index 418305a8..fa538060 100755 --- a/install/ubuntu/16.10/templates/web/nginx/default.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/default.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/default.tpl b/install/ubuntu/16.10/templates/web/nginx/default.tpl index bebd47a2..4d5c774b 100755 --- a/install/ubuntu/16.10/templates/web/nginx/default.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/default.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/hosting.stpl b/install/ubuntu/16.10/templates/web/nginx/hosting.stpl index fc70c266..d778d633 100755 --- a/install/ubuntu/16.10/templates/web/nginx/hosting.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/hosting.stpl @@ -1,6 +1,7 @@ server { - listen %ip%:%proxy_ssl_port% ssl; + listen %ip%:%proxy_ssl_port%; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; error_log /var/log/%web_system%/domains/%domain%.error.log error; @@ -25,13 +26,12 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} location ~ /\.bzr/ {return 404;} - disable_symlinks if_not_owner from=%sdocroot%; + disable_symlinks if_not_owner from=%docroot%; include %home%/%user%/conf/web/snginx.%domain%.conf*; } diff --git a/install/ubuntu/16.10/templates/web/nginx/hosting.tpl b/install/ubuntu/16.10/templates/web/nginx/hosting.tpl index a41d4054..15961c95 100755 --- a/install/ubuntu/16.10/templates/web/nginx/hosting.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/hosting.tpl @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/http2.stpl b/install/ubuntu/16.10/templates/web/nginx/http2.stpl index 5a958ca4..76dd2f8e 100644 --- a/install/ubuntu/16.10/templates/web/nginx/http2.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/http2.stpl @@ -1,16 +1,17 @@ server { - listen %ip%:%proxy_ssl_port% ssl http2; + listen %ip%:%proxy_ssl_port% http2; server_name %domain_idn% %alias_idn%; + ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass https://%ip%:%web_ssl_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -25,7 +26,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/http2.tpl b/install/ubuntu/16.10/templates/web/nginx/http2.tpl index bebd47a2..c1fec114 100644 --- a/install/ubuntu/16.10/templates/web/nginx/http2.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/http2.tpl @@ -1,14 +1,14 @@ server { listen %ip%:%proxy_port%; server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; + error_log /var/log/httpd/domains/%domain%.error.log error; location / { proxy_pass http://%ip%:%web_port%; location ~* ^.+\.(%proxy_extentions%)$ { root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; + access_log /var/log/httpd/domains/%domain%.log combined; + access_log /var/log/httpd/domains/%domain%.bytes bytes; expires max; try_files $uri @fallback; } @@ -23,7 +23,6 @@ server { } location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} location ~ /\.svn/ {return 404;} location ~ /\.git/ {return 404;} location ~ /\.hg/ {return 404;} diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl index 9d984000..91a70936 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.stpl @@ -10,53 +10,69 @@ server { ssl on; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl index 0ae7568b..ac32dcd9 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal6.tpl @@ -7,52 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; } location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; + try_files $uri @rewrite; location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; + expires max; } - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # For Drupal 6 and bwlow: + # Some modules enforce no slash (/) at the end of the URL + # Else this rewrite block wouldn't be needed (GlobalRedirect) + rewrite ^/(.*)$ /index.php?q=$1; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl index 0d7930fa..3b9dabf5 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.stpl @@ -11,56 +11,68 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl index 6b41f319..1b979475 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal7.tpl @@ -7,56 +7,69 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; + location ~ [^/]\.php(/|$) { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl index 6fd64db6..50d85b68 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.stpl @@ -11,62 +11,70 @@ server { ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; + location = /favicon.ico { + log_not_found off; + access_log off; } - + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl index 452aa9e6..71b538bf 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/drupal8.tpl @@ -7,62 +7,71 @@ server { access_log /var/log/nginx/domains/%domain%.bytes bytes; error_log /var/log/nginx/domains/%domain%.error.log error; - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - + location = /favicon.ico { + log_not_found off; + access_log off; + } + + location = /robots.txt { + allow all; + log_not_found off; + access_log off; + } + + # Very rarely should these ever be accessed outside of your lan + location ~* \.(txt|log)$ { + allow 192.168.0.0/16; + deny all; + } + + location ~ \..*/.*\.php$ { + return 403; + } + + # No no for private + location ~ ^/sites/.*/private/ { + return 403; + } + + # Block access to "hidden" files and directories whose names begin with a + # period. This includes directories used by version control systems such + # as Subversion or Git to store control files. + location ~ (^|/)\. { + return 403; + } + location / { - location = /favicon.ico { - log_not_found off; - access_log off; + try_files $uri @rewrite; + + location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { + expires max; } - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { + location ~ [^/]\.php(/|$)|^/update.php { fastcgi_split_path_info ^(.+?\.php)(|/.*)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } + if (!-f $document_root$fastcgi_script_name) { + return 404; + } + + fastcgi_pass %backend_lsnr%; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $request_filename; + fastcgi_intercept_errors on; + include /etc/nginx/fastcgi_params; + } + } + + location @rewrite { + # You have 2 options here + # For D7 and above: + # Clean URLs are handled in drupal_environment_initialize(). + rewrite ^ /index.php; + } + + location ~ ^/sites/.*/files/styles/ { + try_files $uri @rewrite; + } error_page 403 /error/404.html; error_page 404 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl index a721dd81..5ffc9ed5 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.stpl @@ -37,7 +37,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl index b92861b0..297fe0e8 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/pyrocms.tpl @@ -33,7 +33,7 @@ server { location = /robots.txt { access_log off; log_not_found off; } location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } + location ~ /\. { access_log off; log_not_found off; deny all; } location ~ ~$ { access_log off; log_not_found off; deny all; } error_page 403 /error/404.html; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/sendy.stpl index e7f3dcc6..0b351000 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/sendy.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/sendy.stpl @@ -3,7 +3,7 @@ server { server_name %domain_idn% %alias_idn%; ssl_certificate %ssl_pem%; ssl_certificate_key %ssl_key%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl index 0d9793ae..0d933b30 100644 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl @@ -1,7 +1,7 @@ server { listen %ip%:%web_ssl_port%; server_name %domain_idn% %alias_idn%; - root %sdocroot%; + root %docroot%; index index.php index.html index.htm; access_log /var/log/nginx/domains/%domain%.log combined; access_log /var/log/nginx/domains/%domain%.bytes bytes; diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl deleted file mode 100644 index f33ed507..00000000 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index-https.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl b/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl deleted file mode 100644 index c0a5239e..00000000 --- a/install/ubuntu/16.10/templates/web/nginx/php-fpm/wordpress2_wp_super_cache.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - set $cache_uri $request_uri; - - if ($request_method = POST) { - set $cache_uri 'null cache'; - } - - if ($query_string != "") { - set $cache_uri 'null cache'; - } - - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php - |wp-.*.php|/feed/|index.php|wp-comments-popup.php - |wp-links-opml.php|wp-locations.php |sitemap(_index)?.xml - |[a-z0-9_-]+-sitemap([0-9]+)?.xml)") { - set $cache_uri 'null cache'; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+ - |wp-postpass|wordpress_logged_in|woocommerce_cart_hash|woocommerce_items_in_cart|wp_woocommerce_session_") { - set $cache_uri 'null cache'; - } - - location / { - try_files /wp-content/cache/supercache/$http_host/$cache_uri/index.html $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/apache2/apache2.conf b/install/ubuntu/17.04/apache2/apache2.conf deleted file mode 100644 index 2756132a..00000000 --- a/install/ubuntu/17.04/apache2/apache2.conf +++ /dev/null @@ -1,94 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 30 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/ubuntu/17.04/apache2/status.conf b/install/ubuntu/17.04/apache2/status.conf deleted file mode 100644 index da9d9633..00000000 --- a/install/ubuntu/17.04/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from all - diff --git a/install/ubuntu/17.04/bind/named.conf b/install/ubuntu/17.04/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/ubuntu/17.04/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/ubuntu/17.04/clamav/clamd.conf b/install/ubuntu/17.04/clamav/clamd.conf deleted file mode 100644 index 4e04356e..00000000 --- a/install/ubuntu/17.04/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean false -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -DetectBrokenExecutables false -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 25M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/ubuntu/17.04/deb_signing.key b/install/ubuntu/17.04/deb_signing.key deleted file mode 100644 index 2ad2db8b..00000000 --- a/install/ubuntu/17.04/deb_signing.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD -G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x -QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf -fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 -oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY -2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g -PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb -VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN -QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh -IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 -Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 -WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN -BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz -QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 -k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC -YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt -i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS -ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA -CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR -+EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 -XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC -CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN -qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq -ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== -=J2HJ ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/17.04/dovecot/conf.d/10-auth.conf b/install/ubuntu/17.04/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/ubuntu/17.04/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/17.04/dovecot/conf.d/10-logging.conf b/install/ubuntu/17.04/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/ubuntu/17.04/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/ubuntu/17.04/dovecot/conf.d/10-mail.conf b/install/ubuntu/17.04/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/ubuntu/17.04/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/17.04/dovecot/conf.d/10-master.conf b/install/ubuntu/17.04/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/ubuntu/17.04/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/ubuntu/17.04/dovecot/conf.d/10-ssl.conf b/install/ubuntu/17.04/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 24cbf3e2..00000000 --- a/install/ubuntu/17.04/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,5 +0,0 @@ -ssl = yes -ssl_protocols = !SSLv2 !SSLv3 - -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/ubuntu/17.04/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/17.04/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/ubuntu/17.04/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/ubuntu/17.04/dovecot/dovecot.conf b/install/ubuntu/17.04/dovecot/dovecot.conf deleted file mode 100644 index 311a3351..00000000 --- a/install/ubuntu/17.04/dovecot/dovecot.conf +++ /dev/null @@ -1,24 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf - -namespace { - type = private - separator = / - prefix = - inbox = yes - - mailbox Sent { - auto = subscribe - special_use = \Sent - } - mailbox Drafts { - auto = subscribe - special_use = \Drafts - } - mailbox Trash { - auto = subscribe - special_use = \Trash - } -} diff --git a/install/ubuntu/17.04/exim/dnsbl.conf b/install/ubuntu/17.04/exim/dnsbl.conf deleted file mode 100644 index 5166b255..00000000 --- a/install/ubuntu/17.04/exim/dnsbl.conf +++ /dev/null @@ -1,2 +0,0 @@ -bl.spamcop.net -zen.spamhaus.org diff --git a/install/ubuntu/17.04/exim/exim4.conf.template b/install/ubuntu/17.04/exim/exim4.conf.template deleted file mode 100644 index fc346486..00000000 --- a/install/ubuntu/17.04/exim/exim4.conf.template +++ /dev/null @@ -1,382 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 5s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### -begin acl - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth required - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = * - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{1024K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = debian-spamd:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -userforward: - driver = redirect - check_local_user - file = $home/.forward - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/ubuntu/17.04/exim/spam-blocks.conf b/install/ubuntu/17.04/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/ubuntu/17.04/fail2ban/action.d/vesta.conf b/install/ubuntu/17.04/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/ubuntu/17.04/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/17.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/17.04/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 69670a56..00000000 --- a/install/ubuntu/17.04/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/ubuntu/17.04/fail2ban/jail.local b/install/ubuntu/17.04/fail2ban/jail.local deleted file mode 100644 index 013f81c4..00000000 --- a/install/ubuntu/17.04/fail2ban/jail.local +++ /dev/null @@ -1,51 +0,0 @@ -[DEFAULT] -ignoreip = 127.0.0.1/8 - -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog -maxretry = 5 - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log -maxretry = 5 - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 - -[roundcube-auth] -enabled = false -filter = roundcube-auth -port = http,https -logpath = /var/log/roundcube/errors -maxretry = 5 diff --git a/install/ubuntu/17.04/firewall/ports.conf b/install/ubuntu/17.04/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/ubuntu/17.04/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/17.04/firewall/rules.conf b/install/ubuntu/17.04/firewall/rules.conf deleted file mode 100644 index fba98e1e..00000000 --- a/install/ubuntu/17.04/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/17.04/logrotate/apache2 b/install/ubuntu/17.04/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/ubuntu/17.04/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/ubuntu/17.04/logrotate/dovecot b/install/ubuntu/17.04/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/ubuntu/17.04/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/ubuntu/17.04/logrotate/nginx b/install/ubuntu/17.04/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/ubuntu/17.04/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/ubuntu/17.04/logrotate/vesta b/install/ubuntu/17.04/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/ubuntu/17.04/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/ubuntu/17.04/mysql/my-large.cnf b/install/ubuntu/17.04/mysql/my-large.cnf deleted file mode 100644 index 7201377c..00000000 --- a/install/ubuntu/17.04/mysql/my-large.cnf +++ /dev/null @@ -1,41 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/17.04/mysql/my-medium.cnf b/install/ubuntu/17.04/mysql/my-medium.cnf deleted file mode 100644 index 1c10ab9a..00000000 --- a/install/ubuntu/17.04/mysql/my-medium.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/17.04/mysql/my-small.cnf b/install/ubuntu/17.04/mysql/my-small.cnf deleted file mode 100644 index 26a80478..00000000 --- a/install/ubuntu/17.04/mysql/my-small.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/17.04/nginx/nginx.conf b/install/ubuntu/17.04/nginx/nginx.conf deleted file mode 100644 index 6bc999f9..00000000 --- a/install/ubuntu/17.04/nginx/nginx.conf +++ /dev/null @@ -1,137 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_vary on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffers 32 4k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/12; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - #set_real_ip_from 2400:cb00::/32; - #set_real_ip_from 2606:4700::/32; - #set_real_ip_from 2803:f800::/32; - #set_real_ip_from 2405:b500::/32; - #set_real_ip_from 2405:8100::/32; - #set_real_ip_from 2c0f:f248::/32; - #set_real_ip_from 2a06:98c0::/29; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/ubuntu/17.04/nginx/phpmyadmin.inc b/install/ubuntu/17.04/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/ubuntu/17.04/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/ubuntu/17.04/nginx/phppgadmin.inc b/install/ubuntu/17.04/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/ubuntu/17.04/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/17.04/nginx/status.conf b/install/ubuntu/17.04/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/ubuntu/17.04/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/ubuntu/17.04/nginx/webmail.inc b/install/ubuntu/17.04/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/ubuntu/17.04/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/17.04/packages/default.pkg b/install/ubuntu/17.04/packages/default.pkg deleted file mode 100644 index c2a93574..00000000 --- a/install/ubuntu/17.04/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='unlimited' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.04/packages/gainsboro.pkg b/install/ubuntu/17.04/packages/gainsboro.pkg deleted file mode 100644 index 76d7dae2..00000000 --- a/install/ubuntu/17.04/packages/gainsboro.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='10' -WEB_ALIASES='10' -DNS_DOMAINS='10' -DNS_RECORDS='10' -MAIL_DOMAINS='10' -MAIL_ACCOUNTS='10' -DATABASES='10' -CRON_JOBS='10' -DISK_QUOTA='10000' -BANDWIDTH='10000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='1' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.04/packages/palegreen.pkg b/install/ubuntu/17.04/packages/palegreen.pkg deleted file mode 100644 index 3db5fe57..00000000 --- a/install/ubuntu/17.04/packages/palegreen.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='hosting' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='50' -WEB_ALIASES='50' -DNS_DOMAINS='50' -DNS_RECORDS='50' -MAIL_DOMAINS='50' -MAIL_ACCOUNTS='50' -DATABASES='50' -CRON_JOBS='50' -DISK_QUOTA='50000' -BANDWIDTH='50000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='5' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.04/packages/slategrey.pkg b/install/ubuntu/17.04/packages/slategrey.pkg deleted file mode 100644 index d89e796f..00000000 --- a/install/ubuntu/17.04/packages/slategrey.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='10000' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.04/pga/config.inc.php b/install/ubuntu/17.04/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/ubuntu/17.04/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/ubuntu/17.04/pga/phppgadmin.conf b/install/ubuntu/17.04/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/ubuntu/17.04/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/ubuntu/17.04/php-fpm/www.conf b/install/ubuntu/17.04/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/ubuntu/17.04/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/ubuntu/17.04/pma/apache.conf b/install/ubuntu/17.04/pma/apache.conf deleted file mode 100644 index 4da6ce84..00000000 --- a/install/ubuntu/17.04/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/ - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/ubuntu/17.04/pma/config.inc.php b/install/ubuntu/17.04/pma/config.inc.php deleted file mode 100644 index 36093369..00000000 --- a/install/ubuntu/17.04/pma/config.inc.php +++ /dev/null @@ -1,152 +0,0 @@ - - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 20 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 - - - Umask 002 - IdentLookups off - AllowOverwrite yes - - AllowAll - - diff --git a/install/ubuntu/17.04/roundcube/apache.conf b/install/ubuntu/17.04/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/ubuntu/17.04/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/ubuntu/17.04/roundcube/config.inc.php b/install/ubuntu/17.04/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/ubuntu/17.04/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/ubuntu/17.04/roundcube/main.inc.php b/install/ubuntu/17.04/roundcube/main.inc.php deleted file mode 100644 index 44b19793..00000000 --- a/install/ubuntu/17.04/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = false; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = true; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'larry'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 30 seconds -$rcmail_config['draft_autosave'] = 30; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/ubuntu/17.04/roundcube/vesta.php b/install/ubuntu/17.04/roundcube/vesta.php deleted file mode 100644 index b6646b2b..00000000 --- a/install/ubuntu/17.04/roundcube/vesta.php +++ /dev/null @@ -1,73 +0,0 @@ - - */ -class rcube_vesta_password -{ - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} \ No newline at end of file diff --git a/install/ubuntu/17.04/sudo/admin b/install/ubuntu/17.04/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/ubuntu/17.04/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/17.04/templates/dns/child-ns.tpl b/install/ubuntu/17.04/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/ubuntu/17.04/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/17.04/templates/dns/default.tpl b/install/ubuntu/17.04/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/ubuntu/17.04/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/17.04/templates/dns/gmail.tpl b/install/ubuntu/17.04/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/ubuntu/17.04/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/17.04/templates/web/apache2/basedir.stpl b/install/ubuntu/17.04/templates/web/apache2/basedir.stpl deleted file mode 100644 index d978d4c4..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/basedir.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/basedir.tpl b/install/ubuntu/17.04/templates/web/apache2/basedir.tpl deleted file mode 100644 index 96c94a1b..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/basedir.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/default.stpl b/install/ubuntu/17.04/templates/web/apache2/default.stpl deleted file mode 100644 index ec34c279..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/default.stpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/default.tpl b/install/ubuntu/17.04/templates/web/apache2/default.tpl deleted file mode 100644 index 3a227015..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/default.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/hosting.stpl b/install/ubuntu/17.04/templates/web/apache2/hosting.stpl deleted file mode 100644 index 8892072b..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/hosting.stpl +++ /dev/null @@ -1,49 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/hosting.tpl b/install/ubuntu/17.04/templates/web/apache2/hosting.tpl deleted file mode 100644 index 1eb26910..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/hosting.tpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/phpcgi.sh b/install/ubuntu/17.04/templates/web/apache2/phpcgi.sh deleted file mode 100755 index 6565e103..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/phpcgi.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/17.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/17.04/templates/web/apache2/phpcgi.stpl deleted file mode 100644 index 731355bc..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/phpcgi.stpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/17.04/templates/web/apache2/phpcgi.tpl deleted file mode 100644 index c6796d29..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/phpcgi.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/phpfcgid.sh b/install/ubuntu/17.04/templates/web/apache2/phpfcgid.sh deleted file mode 100755 index e8058249..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/phpfcgid.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script="#!/bin/sh -PHPRC=/usr/local/lib -export PHPRC -export PHP_FCGI_MAX_REQUESTS=1000 -export PHP_FCGI_CHILDREN=20 -exec /usr/bin/php-cgi -" -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/17.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/17.04/templates/web/apache2/phpfcgid.stpl deleted file mode 100644 index 156c8a91..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/phpfcgid.stpl +++ /dev/null @@ -1,39 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - php_admin_value open_basedir none - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/17.04/templates/web/apache2/phpfcgid.tpl deleted file mode 100644 index a4c01269..00000000 --- a/install/ubuntu/17.04/templates/web/apache2/phpfcgid.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.04/templates/web/awstats/awstats.tpl b/install/ubuntu/17.04/templates/web/awstats/awstats.tpl deleted file mode 100755 index 9a92e0fd..00000000 --- a/install/ubuntu/17.04/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1 -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/17.04/templates/web/awstats/index.tpl b/install/ubuntu/17.04/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/ubuntu/17.04/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/ubuntu/17.04/templates/web/awstats/nav.tpl b/install/ubuntu/17.04/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/ubuntu/17.04/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/ubuntu/17.04/templates/web/nginx/caching.sh b/install/ubuntu/17.04/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/ubuntu/17.04/templates/web/nginx/caching.stpl b/install/ubuntu/17.04/templates/web/nginx/caching.stpl deleted file mode 100755 index 61b74814..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/caching.tpl b/install/ubuntu/17.04/templates/web/nginx/caching.tpl deleted file mode 100755 index 73de28d5..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/default.stpl b/install/ubuntu/17.04/templates/web/nginx/default.stpl deleted file mode 100755 index 418305a8..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/default.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.04/templates/web/nginx/default.tpl b/install/ubuntu/17.04/templates/web/nginx/default.tpl deleted file mode 100755 index bebd47a2..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/default.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.04/templates/web/nginx/hosting.sh b/install/ubuntu/17.04/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/ubuntu/17.04/templates/web/nginx/hosting.stpl b/install/ubuntu/17.04/templates/web/nginx/hosting.stpl deleted file mode 100755 index 3e3567d6..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.04/templates/web/nginx/hosting.tpl b/install/ubuntu/17.04/templates/web/nginx/hosting.tpl deleted file mode 100755 index a41d4054..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.04/templates/web/nginx/http2.stpl b/install/ubuntu/17.04/templates/web/nginx/http2.stpl deleted file mode 100644 index 5a958ca4..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/http2.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.04/templates/web/nginx/http2.tpl b/install/ubuntu/17.04/templates/web/nginx/http2.tpl deleted file mode 100644 index bebd47a2..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/http2.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index d85bcce3..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 9c24c3ea..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,61 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index d7186314..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index 4f0b9ec7..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,127 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index 5cb55311..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index f85032ba..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 9d984000..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index 0ae7568b..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 0d7930fa..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index 6b41f319..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 6fd64db6..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index 452aa9e6..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index 704405f3..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index 477f6f01..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index fdab43aa..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,198 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index f410ab77..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index f15a68c5..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index bc8b53a3..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,47 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index d6697d7a..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,70 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/opencart.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 908b9aeb..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 891566b9..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 78c1bb78..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,73 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index a721dd81..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/sendy.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index 5cb55311..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index e0aeb524..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index 0d933b30..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/17.04/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/17.04/templates/web/nginx/proxy_ip.tpl deleted file mode 100755 index ae195617..00000000 --- a/install/ubuntu/17.04/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/ubuntu/17.04/templates/web/php-fpm/default.tpl b/install/ubuntu/17.04/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/ubuntu/17.04/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/17.04/templates/web/php-fpm/no-php.tpl b/install/ubuntu/17.04/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/ubuntu/17.04/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/17.04/templates/web/php-fpm/socket.tpl b/install/ubuntu/17.04/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/ubuntu/17.04/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/17.04/templates/web/skel/document_errors/403.html b/install/ubuntu/17.04/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/ubuntu/17.04/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/ubuntu/17.04/templates/web/skel/document_errors/404.html b/install/ubuntu/17.04/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/ubuntu/17.04/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/ubuntu/17.04/templates/web/skel/document_errors/50x.html b/install/ubuntu/17.04/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/ubuntu/17.04/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/ubuntu/17.04/templates/web/skel/public_html/index.html b/install/ubuntu/17.04/templates/web/skel/public_html/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/17.04/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/17.04/templates/web/skel/public_html/robots.txt b/install/ubuntu/17.04/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/17.04/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/17.04/templates/web/skel/public_shtml/index.html b/install/ubuntu/17.04/templates/web/skel/public_shtml/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/17.04/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/17.04/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/17.04/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/17.04/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/17.04/templates/web/suspend/.htaccess b/install/ubuntu/17.04/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/ubuntu/17.04/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/ubuntu/17.04/templates/web/suspend/index.html b/install/ubuntu/17.04/templates/web/suspend/index.html deleted file mode 100755 index f2d04e1f..00000000 --- a/install/ubuntu/17.04/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

SUSPENDED

-

This website has been suspended.

-
- Please contact the technical support department. -
- - diff --git a/install/ubuntu/17.04/templates/web/webalizer/webalizer.tpl b/install/ubuntu/17.04/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/ubuntu/17.04/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/ubuntu/17.04/vsftpd/vsftpd.conf b/install/ubuntu/17.04/vsftpd/vsftpd.conf deleted file mode 100644 index 034b016d..00000000 --- a/install/ubuntu/17.04/vsftpd/vsftpd.conf +++ /dev/null @@ -1,27 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_min_port=12000 -pasv_max_port=12100 -max_per_ip=10 -max_clients=100 -use_localtime=YES diff --git a/install/ubuntu/17.10/apache2/apache2.conf b/install/ubuntu/17.10/apache2/apache2.conf deleted file mode 100644 index 2756132a..00000000 --- a/install/ubuntu/17.10/apache2/apache2.conf +++ /dev/null @@ -1,94 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 30 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/ubuntu/17.10/apache2/status.conf b/install/ubuntu/17.10/apache2/status.conf deleted file mode 100644 index da9d9633..00000000 --- a/install/ubuntu/17.10/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from all - diff --git a/install/ubuntu/17.10/bind/named.conf b/install/ubuntu/17.10/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/ubuntu/17.10/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/ubuntu/17.10/clamav/clamd.conf b/install/ubuntu/17.10/clamav/clamd.conf deleted file mode 100644 index 4e04356e..00000000 --- a/install/ubuntu/17.10/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean false -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -DetectBrokenExecutables false -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 25M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/ubuntu/17.10/deb_signing.key b/install/ubuntu/17.10/deb_signing.key deleted file mode 100644 index 2ad2db8b..00000000 --- a/install/ubuntu/17.10/deb_signing.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD -G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x -QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf -fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 -oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY -2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g -PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb -VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN -QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh -IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 -Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 -WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN -BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz -QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 -k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC -YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt -i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS -ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA -CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR -+EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 -XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC -CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN -qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq -ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== -=J2HJ ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/17.10/dovecot/conf.d/10-auth.conf b/install/ubuntu/17.10/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/ubuntu/17.10/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/17.10/dovecot/conf.d/10-logging.conf b/install/ubuntu/17.10/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/ubuntu/17.10/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/ubuntu/17.10/dovecot/conf.d/10-mail.conf b/install/ubuntu/17.10/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 55313419..00000000 --- a/install/ubuntu/17.10/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,4 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv diff --git a/install/ubuntu/17.10/dovecot/conf.d/10-master.conf b/install/ubuntu/17.10/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/ubuntu/17.10/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/ubuntu/17.10/dovecot/conf.d/10-ssl.conf b/install/ubuntu/17.10/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 24cbf3e2..00000000 --- a/install/ubuntu/17.10/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,5 +0,0 @@ -ssl = yes -ssl_protocols = !SSLv2 !SSLv3 - -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/ubuntu/17.10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/17.10/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/ubuntu/17.10/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/ubuntu/17.10/dovecot/dovecot.conf b/install/ubuntu/17.10/dovecot/dovecot.conf deleted file mode 100644 index 311a3351..00000000 --- a/install/ubuntu/17.10/dovecot/dovecot.conf +++ /dev/null @@ -1,24 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf - -namespace { - type = private - separator = / - prefix = - inbox = yes - - mailbox Sent { - auto = subscribe - special_use = \Sent - } - mailbox Drafts { - auto = subscribe - special_use = \Drafts - } - mailbox Trash { - auto = subscribe - special_use = \Trash - } -} diff --git a/install/ubuntu/17.10/exim/dnsbl.conf b/install/ubuntu/17.10/exim/dnsbl.conf deleted file mode 100644 index 5166b255..00000000 --- a/install/ubuntu/17.10/exim/dnsbl.conf +++ /dev/null @@ -1,2 +0,0 @@ -bl.spamcop.net -zen.spamhaus.org diff --git a/install/ubuntu/17.10/exim/exim4.conf.template b/install/ubuntu/17.10/exim/exim4.conf.template deleted file mode 100644 index fc346486..00000000 --- a/install/ubuntu/17.10/exim/exim4.conf.template +++ /dev/null @@ -1,382 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 5s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### -begin acl - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth required - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = * - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{1024K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = debian-spamd:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -userforward: - driver = redirect - check_local_user - file = $home/.forward - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/ubuntu/17.10/exim/spam-blocks.conf b/install/ubuntu/17.10/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/ubuntu/17.10/fail2ban/action.d/vesta.conf b/install/ubuntu/17.10/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/ubuntu/17.10/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/17.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/17.10/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 69670a56..00000000 --- a/install/ubuntu/17.10/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/ubuntu/17.10/fail2ban/jail.local b/install/ubuntu/17.10/fail2ban/jail.local deleted file mode 100644 index 013f81c4..00000000 --- a/install/ubuntu/17.10/fail2ban/jail.local +++ /dev/null @@ -1,51 +0,0 @@ -[DEFAULT] -ignoreip = 127.0.0.1/8 - -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog -maxretry = 5 - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log -maxretry = 5 - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 - -[roundcube-auth] -enabled = false -filter = roundcube-auth -port = http,https -logpath = /var/log/roundcube/errors -maxretry = 5 diff --git a/install/ubuntu/17.10/firewall/ports.conf b/install/ubuntu/17.10/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/ubuntu/17.10/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/17.10/firewall/rules.conf b/install/ubuntu/17.10/firewall/rules.conf deleted file mode 100644 index fba98e1e..00000000 --- a/install/ubuntu/17.10/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/17.10/logrotate/apache2 b/install/ubuntu/17.10/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/ubuntu/17.10/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/ubuntu/17.10/logrotate/dovecot b/install/ubuntu/17.10/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/ubuntu/17.10/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/ubuntu/17.10/logrotate/nginx b/install/ubuntu/17.10/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/ubuntu/17.10/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/ubuntu/17.10/logrotate/vesta b/install/ubuntu/17.10/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/ubuntu/17.10/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/ubuntu/17.10/mysql/my-large.cnf b/install/ubuntu/17.10/mysql/my-large.cnf deleted file mode 100644 index 7201377c..00000000 --- a/install/ubuntu/17.10/mysql/my-large.cnf +++ /dev/null @@ -1,41 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/17.10/mysql/my-medium.cnf b/install/ubuntu/17.10/mysql/my-medium.cnf deleted file mode 100644 index 1c10ab9a..00000000 --- a/install/ubuntu/17.10/mysql/my-medium.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/17.10/mysql/my-small.cnf b/install/ubuntu/17.10/mysql/my-small.cnf deleted file mode 100644 index 26a80478..00000000 --- a/install/ubuntu/17.10/mysql/my-small.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/17.10/nginx/nginx.conf b/install/ubuntu/17.10/nginx/nginx.conf deleted file mode 100644 index 6bc999f9..00000000 --- a/install/ubuntu/17.10/nginx/nginx.conf +++ /dev/null @@ -1,137 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -error_log /var/log/nginx/error.log crit; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 1m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_vary on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffers 32 4k; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/12; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - #set_real_ip_from 2400:cb00::/32; - #set_real_ip_from 2606:4700::/32; - #set_real_ip_from 2803:f800::/32; - #set_real_ip_from 2405:b500::/32; - #set_real_ip_from 2405:8100::/32; - #set_real_ip_from 2c0f:f248::/32; - #set_real_ip_from 2a06:98c0::/29; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/ubuntu/17.10/nginx/phpmyadmin.inc b/install/ubuntu/17.10/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/ubuntu/17.10/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/ubuntu/17.10/nginx/phppgadmin.inc b/install/ubuntu/17.10/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/ubuntu/17.10/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/17.10/nginx/status.conf b/install/ubuntu/17.10/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/ubuntu/17.10/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/ubuntu/17.10/nginx/webmail.inc b/install/ubuntu/17.10/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/ubuntu/17.10/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/17.10/packages/default.pkg b/install/ubuntu/17.10/packages/default.pkg deleted file mode 100644 index c2a93574..00000000 --- a/install/ubuntu/17.10/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='unlimited' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.10/packages/gainsboro.pkg b/install/ubuntu/17.10/packages/gainsboro.pkg deleted file mode 100644 index 76d7dae2..00000000 --- a/install/ubuntu/17.10/packages/gainsboro.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='10' -WEB_ALIASES='10' -DNS_DOMAINS='10' -DNS_RECORDS='10' -MAIL_DOMAINS='10' -MAIL_ACCOUNTS='10' -DATABASES='10' -CRON_JOBS='10' -DISK_QUOTA='10000' -BANDWIDTH='10000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='1' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.10/packages/palegreen.pkg b/install/ubuntu/17.10/packages/palegreen.pkg deleted file mode 100644 index 3db5fe57..00000000 --- a/install/ubuntu/17.10/packages/palegreen.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='hosting' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='50' -WEB_ALIASES='50' -DNS_DOMAINS='50' -DNS_RECORDS='50' -MAIL_DOMAINS='50' -MAIL_ACCOUNTS='50' -DATABASES='50' -CRON_JOBS='50' -DISK_QUOTA='50000' -BANDWIDTH='50000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='5' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.10/packages/slategrey.pkg b/install/ubuntu/17.10/packages/slategrey.pkg deleted file mode 100644 index d89e796f..00000000 --- a/install/ubuntu/17.10/packages/slategrey.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='10000' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/17.10/pga/config.inc.php b/install/ubuntu/17.10/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/ubuntu/17.10/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/ubuntu/17.10/pga/phppgadmin.conf b/install/ubuntu/17.10/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/ubuntu/17.10/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/ubuntu/17.10/php-fpm/www.conf b/install/ubuntu/17.10/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/ubuntu/17.10/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/ubuntu/17.10/pma/apache.conf b/install/ubuntu/17.10/pma/apache.conf deleted file mode 100644 index 4da6ce84..00000000 --- a/install/ubuntu/17.10/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/ - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/ubuntu/17.10/pma/config.inc.php b/install/ubuntu/17.10/pma/config.inc.php deleted file mode 100644 index 36093369..00000000 --- a/install/ubuntu/17.10/pma/config.inc.php +++ /dev/null @@ -1,152 +0,0 @@ - - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 20 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 - - - Umask 002 - IdentLookups off - AllowOverwrite yes - - AllowAll - - diff --git a/install/ubuntu/17.10/roundcube/apache.conf b/install/ubuntu/17.10/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/ubuntu/17.10/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/ubuntu/17.10/roundcube/config.inc.php b/install/ubuntu/17.10/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/ubuntu/17.10/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/ubuntu/17.10/roundcube/main.inc.php b/install/ubuntu/17.10/roundcube/main.inc.php deleted file mode 100644 index 44b19793..00000000 --- a/install/ubuntu/17.10/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcubemail/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = false; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = true; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'larry'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 30 seconds -$rcmail_config['draft_autosave'] = 30; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/ubuntu/17.10/roundcube/vesta.php b/install/ubuntu/17.10/roundcube/vesta.php deleted file mode 100644 index c271004d..00000000 --- a/install/ubuntu/17.10/roundcube/vesta.php +++ /dev/null @@ -1,72 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} diff --git a/install/ubuntu/17.10/sudo/admin b/install/ubuntu/17.10/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/ubuntu/17.10/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/17.10/templates/dns/child-ns.tpl b/install/ubuntu/17.10/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/ubuntu/17.10/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/17.10/templates/dns/default.tpl b/install/ubuntu/17.10/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/ubuntu/17.10/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/17.10/templates/dns/gmail.tpl b/install/ubuntu/17.10/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/ubuntu/17.10/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/17.10/templates/web/apache2/basedir.stpl b/install/ubuntu/17.10/templates/web/apache2/basedir.stpl deleted file mode 100644 index d978d4c4..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/basedir.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/basedir.tpl b/install/ubuntu/17.10/templates/web/apache2/basedir.tpl deleted file mode 100644 index 96c94a1b..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/basedir.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/default.stpl b/install/ubuntu/17.10/templates/web/apache2/default.stpl deleted file mode 100644 index ec34c279..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/default.stpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/default.tpl b/install/ubuntu/17.10/templates/web/apache2/default.tpl deleted file mode 100644 index 3a227015..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/default.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/hosting.stpl b/install/ubuntu/17.10/templates/web/apache2/hosting.stpl deleted file mode 100644 index 8892072b..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/hosting.stpl +++ /dev/null @@ -1,49 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/hosting.tpl b/install/ubuntu/17.10/templates/web/apache2/hosting.tpl deleted file mode 100644 index 1eb26910..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/hosting.tpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/phpcgi.sh b/install/ubuntu/17.10/templates/web/apache2/phpcgi.sh deleted file mode 100755 index 6565e103..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/phpcgi.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/17.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/17.10/templates/web/apache2/phpcgi.stpl deleted file mode 100644 index 731355bc..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/phpcgi.stpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/17.10/templates/web/apache2/phpcgi.tpl deleted file mode 100644 index c6796d29..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/phpcgi.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/phpfcgid.sh b/install/ubuntu/17.10/templates/web/apache2/phpfcgid.sh deleted file mode 100755 index e8058249..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/phpfcgid.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script="#!/bin/sh -PHPRC=/usr/local/lib -export PHPRC -export PHP_FCGI_MAX_REQUESTS=1000 -export PHP_FCGI_CHILDREN=20 -exec /usr/bin/php-cgi -" -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/17.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/17.10/templates/web/apache2/phpfcgid.stpl deleted file mode 100644 index 156c8a91..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/phpfcgid.stpl +++ /dev/null @@ -1,39 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - php_admin_value open_basedir none - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/17.10/templates/web/apache2/phpfcgid.tpl deleted file mode 100644 index a4c01269..00000000 --- a/install/ubuntu/17.10/templates/web/apache2/phpfcgid.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/17.10/templates/web/awstats/awstats.tpl b/install/ubuntu/17.10/templates/web/awstats/awstats.tpl deleted file mode 100755 index 9a92e0fd..00000000 --- a/install/ubuntu/17.10/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1 -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/17.10/templates/web/awstats/index.tpl b/install/ubuntu/17.10/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/ubuntu/17.10/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/ubuntu/17.10/templates/web/awstats/nav.tpl b/install/ubuntu/17.10/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/ubuntu/17.10/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/ubuntu/17.10/templates/web/nginx/caching.sh b/install/ubuntu/17.10/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/ubuntu/17.10/templates/web/nginx/caching.stpl b/install/ubuntu/17.10/templates/web/nginx/caching.stpl deleted file mode 100755 index 61b74814..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/caching.tpl b/install/ubuntu/17.10/templates/web/nginx/caching.tpl deleted file mode 100755 index 73de28d5..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/default.stpl b/install/ubuntu/17.10/templates/web/nginx/default.stpl deleted file mode 100755 index 418305a8..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/default.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.10/templates/web/nginx/default.tpl b/install/ubuntu/17.10/templates/web/nginx/default.tpl deleted file mode 100755 index bebd47a2..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/default.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.10/templates/web/nginx/hosting.sh b/install/ubuntu/17.10/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/ubuntu/17.10/templates/web/nginx/hosting.stpl b/install/ubuntu/17.10/templates/web/nginx/hosting.stpl deleted file mode 100755 index 3e3567d6..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.10/templates/web/nginx/hosting.tpl b/install/ubuntu/17.10/templates/web/nginx/hosting.tpl deleted file mode 100755 index a41d4054..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.10/templates/web/nginx/http2.stpl b/install/ubuntu/17.10/templates/web/nginx/http2.stpl deleted file mode 100644 index 5a958ca4..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/http2.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.10/templates/web/nginx/http2.tpl b/install/ubuntu/17.10/templates/web/nginx/http2.tpl deleted file mode 100644 index bebd47a2..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/http2.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index d85bcce3..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 9c24c3ea..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,61 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index d7186314..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index 4f0b9ec7..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,127 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index 5cb55311..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index f85032ba..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 9d984000..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index 0ae7568b..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 0d7930fa..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index 6b41f319..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 6fd64db6..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,94 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index 452aa9e6..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index 704405f3..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index 477f6f01..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index fdab43aa..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,198 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index f410ab77..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index f15a68c5..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index bc8b53a3..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,47 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index d6697d7a..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,70 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/opencart.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 908b9aeb..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 891566b9..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 78c1bb78..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,73 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index a721dd81..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/sendy.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index 5cb55311..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index e0aeb524..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index 0d933b30..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/17.10/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/17.10/templates/web/nginx/proxy_ip.tpl deleted file mode 100755 index ae195617..00000000 --- a/install/ubuntu/17.10/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/ubuntu/17.10/templates/web/php-fpm/default.tpl b/install/ubuntu/17.10/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/ubuntu/17.10/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/17.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/17.10/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/ubuntu/17.10/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/17.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/17.10/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/ubuntu/17.10/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/17.10/templates/web/skel/document_errors/403.html b/install/ubuntu/17.10/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/ubuntu/17.10/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/ubuntu/17.10/templates/web/skel/document_errors/404.html b/install/ubuntu/17.10/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/ubuntu/17.10/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/ubuntu/17.10/templates/web/skel/document_errors/50x.html b/install/ubuntu/17.10/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/ubuntu/17.10/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/ubuntu/17.10/templates/web/skel/public_html/index.html b/install/ubuntu/17.10/templates/web/skel/public_html/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/17.10/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/17.10/templates/web/skel/public_html/robots.txt b/install/ubuntu/17.10/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/17.10/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/17.10/templates/web/skel/public_shtml/index.html b/install/ubuntu/17.10/templates/web/skel/public_shtml/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/17.10/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/17.10/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/17.10/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/17.10/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/17.10/templates/web/suspend/.htaccess b/install/ubuntu/17.10/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/ubuntu/17.10/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/ubuntu/17.10/templates/web/suspend/index.html b/install/ubuntu/17.10/templates/web/suspend/index.html deleted file mode 100755 index f2d04e1f..00000000 --- a/install/ubuntu/17.10/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

SUSPENDED

-

This website has been suspended.

-
- Please contact the technical support department. -
- - diff --git a/install/ubuntu/17.10/templates/web/webalizer/webalizer.tpl b/install/ubuntu/17.10/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/ubuntu/17.10/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/ubuntu/17.10/vsftpd/vsftpd.conf b/install/ubuntu/17.10/vsftpd/vsftpd.conf deleted file mode 100644 index 034b016d..00000000 --- a/install/ubuntu/17.10/vsftpd/vsftpd.conf +++ /dev/null @@ -1,27 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_min_port=12000 -pasv_max_port=12100 -max_per_ip=10 -max_clients=100 -use_localtime=YES diff --git a/install/ubuntu/18.04/apache2/apache2.conf b/install/ubuntu/18.04/apache2/apache2.conf deleted file mode 100644 index 2756132a..00000000 --- a/install/ubuntu/18.04/apache2/apache2.conf +++ /dev/null @@ -1,94 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 30 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/ubuntu/18.04/apache2/status.conf b/install/ubuntu/18.04/apache2/status.conf deleted file mode 100644 index da9d9633..00000000 --- a/install/ubuntu/18.04/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from all - diff --git a/install/ubuntu/18.04/bind/named.conf b/install/ubuntu/18.04/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/ubuntu/18.04/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/ubuntu/18.04/clamav/clamd.conf b/install/ubuntu/18.04/clamav/clamd.conf deleted file mode 100644 index 4e04356e..00000000 --- a/install/ubuntu/18.04/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean false -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -DetectBrokenExecutables false -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 25M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/ubuntu/18.04/deb_signing.key b/install/ubuntu/18.04/deb_signing.key deleted file mode 100644 index 2ad2db8b..00000000 --- a/install/ubuntu/18.04/deb_signing.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD -G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x -QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf -fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 -oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY -2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g -PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb -VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN -QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh -IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 -Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 -WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN -BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz -QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 -k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC -YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt -i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS -ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA -CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR -+EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 -XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC -CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN -qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq -ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== -=J2HJ ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/18.04/dovecot/conf.d/10-auth.conf b/install/ubuntu/18.04/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/ubuntu/18.04/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/18.04/dovecot/conf.d/10-logging.conf b/install/ubuntu/18.04/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/ubuntu/18.04/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/ubuntu/18.04/dovecot/conf.d/10-mail.conf b/install/ubuntu/18.04/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 7a20878a..00000000 --- a/install/ubuntu/18.04/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,9 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv -namespace inbox { - inbox = yes -} -first_valid_uid = 1000 -mbox_write_locks = fcntl diff --git a/install/ubuntu/18.04/dovecot/conf.d/10-master.conf b/install/ubuntu/18.04/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/ubuntu/18.04/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/ubuntu/18.04/dovecot/conf.d/10-ssl.conf b/install/ubuntu/18.04/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 24cbf3e2..00000000 --- a/install/ubuntu/18.04/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,5 +0,0 @@ -ssl = yes -ssl_protocols = !SSLv2 !SSLv3 - -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/ubuntu/18.04/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/18.04/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/ubuntu/18.04/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/ubuntu/18.04/dovecot/dovecot.conf b/install/ubuntu/18.04/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/ubuntu/18.04/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/ubuntu/18.04/exim/dnsbl.conf b/install/ubuntu/18.04/exim/dnsbl.conf deleted file mode 100644 index 5166b255..00000000 --- a/install/ubuntu/18.04/exim/dnsbl.conf +++ /dev/null @@ -1,2 +0,0 @@ -bl.spamcop.net -zen.spamhaus.org diff --git a/install/ubuntu/18.04/exim/exim4.conf.template b/install/ubuntu/18.04/exim/exim4.conf.template deleted file mode 100644 index c904441f..00000000 --- a/install/ubuntu/18.04/exim/exim4.conf.template +++ /dev/null @@ -1,382 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 5s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### -begin acl - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth required - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = * - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{1024K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = debian-spamd:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -userforward: - driver = redirect - check_local_user - file = $home/.forward - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/ubuntu/18.04/exim/spam-blocks.conf b/install/ubuntu/18.04/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/ubuntu/18.04/fail2ban/action.d/vesta.conf b/install/ubuntu/18.04/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/ubuntu/18.04/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/18.04/fail2ban/filter.d/vesta.conf b/install/ubuntu/18.04/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 69670a56..00000000 --- a/install/ubuntu/18.04/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/ubuntu/18.04/fail2ban/jail.local b/install/ubuntu/18.04/fail2ban/jail.local deleted file mode 100644 index 013f81c4..00000000 --- a/install/ubuntu/18.04/fail2ban/jail.local +++ /dev/null @@ -1,51 +0,0 @@ -[DEFAULT] -ignoreip = 127.0.0.1/8 - -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog -maxretry = 5 - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log -maxretry = 5 - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 - -[roundcube-auth] -enabled = false -filter = roundcube-auth -port = http,https -logpath = /var/log/roundcube/errors -maxretry = 5 diff --git a/install/ubuntu/18.04/firewall/ports.conf b/install/ubuntu/18.04/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/ubuntu/18.04/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/18.04/firewall/rules.conf b/install/ubuntu/18.04/firewall/rules.conf deleted file mode 100644 index fba98e1e..00000000 --- a/install/ubuntu/18.04/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/18.04/logrotate/apache2 b/install/ubuntu/18.04/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/ubuntu/18.04/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/ubuntu/18.04/logrotate/dovecot b/install/ubuntu/18.04/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/ubuntu/18.04/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/ubuntu/18.04/logrotate/nginx b/install/ubuntu/18.04/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/ubuntu/18.04/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/ubuntu/18.04/logrotate/vesta b/install/ubuntu/18.04/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/ubuntu/18.04/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/ubuntu/18.04/mysql/my-large.cnf b/install/ubuntu/18.04/mysql/my-large.cnf deleted file mode 100644 index 7201377c..00000000 --- a/install/ubuntu/18.04/mysql/my-large.cnf +++ /dev/null @@ -1,41 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/18.04/mysql/my-medium.cnf b/install/ubuntu/18.04/mysql/my-medium.cnf deleted file mode 100644 index 1c10ab9a..00000000 --- a/install/ubuntu/18.04/mysql/my-medium.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/18.04/mysql/my-small.cnf b/install/ubuntu/18.04/mysql/my-small.cnf deleted file mode 100644 index 26a80478..00000000 --- a/install/ubuntu/18.04/mysql/my-small.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/18.04/nginx/nginx.conf b/install/ubuntu/18.04/nginx/nginx.conf deleted file mode 100644 index 790aee49..00000000 --- a/install/ubuntu/18.04/nginx/nginx.conf +++ /dev/null @@ -1,138 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -error_log /var/log/nginx/error.log; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 60s; - client_body_timeout 60s; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 60s; - keepalive_timeout 30s; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_static on; - gzip_vary on; - gzip_comp_level 6; - gzip_min_length 1024; - gzip_buffers 16 8k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_buffers 32 4k; - proxy_connect_timeout 30s; - proxy_send_timeout 90s; - proxy_read_timeout 90s; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/12; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - #set_real_ip_from 2400:cb00::/32; - #set_real_ip_from 2606:4700::/32; - #set_real_ip_from 2803:f800::/32; - #set_real_ip_from 2405:b500::/32; - #set_real_ip_from 2405:8100::/32; - #set_real_ip_from 2c0f:f248::/32; - #set_real_ip_from 2a06:98c0::/29; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/ubuntu/18.04/nginx/phpmyadmin.inc b/install/ubuntu/18.04/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/ubuntu/18.04/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/ubuntu/18.04/nginx/phppgadmin.inc b/install/ubuntu/18.04/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/ubuntu/18.04/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/18.04/nginx/status.conf b/install/ubuntu/18.04/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/ubuntu/18.04/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/ubuntu/18.04/nginx/webmail.inc b/install/ubuntu/18.04/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/ubuntu/18.04/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/18.04/packages/default.pkg b/install/ubuntu/18.04/packages/default.pkg deleted file mode 100644 index c2a93574..00000000 --- a/install/ubuntu/18.04/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='unlimited' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.04/packages/gainsboro.pkg b/install/ubuntu/18.04/packages/gainsboro.pkg deleted file mode 100644 index 76d7dae2..00000000 --- a/install/ubuntu/18.04/packages/gainsboro.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='10' -WEB_ALIASES='10' -DNS_DOMAINS='10' -DNS_RECORDS='10' -MAIL_DOMAINS='10' -MAIL_ACCOUNTS='10' -DATABASES='10' -CRON_JOBS='10' -DISK_QUOTA='10000' -BANDWIDTH='10000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='1' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.04/packages/palegreen.pkg b/install/ubuntu/18.04/packages/palegreen.pkg deleted file mode 100644 index 3db5fe57..00000000 --- a/install/ubuntu/18.04/packages/palegreen.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='hosting' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='50' -WEB_ALIASES='50' -DNS_DOMAINS='50' -DNS_RECORDS='50' -MAIL_DOMAINS='50' -MAIL_ACCOUNTS='50' -DATABASES='50' -CRON_JOBS='50' -DISK_QUOTA='50000' -BANDWIDTH='50000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='5' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.04/packages/slategrey.pkg b/install/ubuntu/18.04/packages/slategrey.pkg deleted file mode 100644 index d89e796f..00000000 --- a/install/ubuntu/18.04/packages/slategrey.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='10000' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.04/pga/config.inc.php b/install/ubuntu/18.04/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/ubuntu/18.04/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/ubuntu/18.04/pga/phppgadmin.conf b/install/ubuntu/18.04/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/ubuntu/18.04/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/ubuntu/18.04/php-fpm/www.conf b/install/ubuntu/18.04/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/ubuntu/18.04/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/ubuntu/18.04/pma/apache.conf b/install/ubuntu/18.04/pma/apache.conf deleted file mode 100644 index 4da6ce84..00000000 --- a/install/ubuntu/18.04/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/ - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/ubuntu/18.04/pma/config.inc.php b/install/ubuntu/18.04/pma/config.inc.php deleted file mode 100644 index 36093369..00000000 --- a/install/ubuntu/18.04/pma/config.inc.php +++ /dev/null @@ -1,152 +0,0 @@ - - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 20 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 - - - Umask 002 - IdentLookups off - AllowOverwrite yes - - AllowAll - - diff --git a/install/ubuntu/18.04/roundcube/apache.conf b/install/ubuntu/18.04/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/ubuntu/18.04/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/ubuntu/18.04/roundcube/config.inc.php b/install/ubuntu/18.04/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/ubuntu/18.04/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/ubuntu/18.04/roundcube/main.inc.php b/install/ubuntu/18.04/roundcube/main.inc.php deleted file mode 100644 index 32e0d473..00000000 --- a/install/ubuntu/18.04/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcube/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = false; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail'; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = true; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'larry'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 30 seconds -$rcmail_config['draft_autosave'] = 30; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/ubuntu/18.04/roundcube/vesta.php b/install/ubuntu/18.04/roundcube/vesta.php deleted file mode 100644 index b4a2a6b6..00000000 --- a/install/ubuntu/18.04/roundcube/vesta.php +++ /dev/null @@ -1,72 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} \ No newline at end of file diff --git a/install/ubuntu/18.04/sudo/admin b/install/ubuntu/18.04/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/ubuntu/18.04/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/18.04/templates/dns/child-ns.tpl b/install/ubuntu/18.04/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/ubuntu/18.04/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/18.04/templates/dns/default.tpl b/install/ubuntu/18.04/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/ubuntu/18.04/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/18.04/templates/dns/gmail.tpl b/install/ubuntu/18.04/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/ubuntu/18.04/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/18.04/templates/web/apache2/basedir.stpl b/install/ubuntu/18.04/templates/web/apache2/basedir.stpl deleted file mode 100644 index d978d4c4..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/basedir.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/basedir.tpl b/install/ubuntu/18.04/templates/web/apache2/basedir.tpl deleted file mode 100644 index 96c94a1b..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/basedir.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/default.stpl b/install/ubuntu/18.04/templates/web/apache2/default.stpl deleted file mode 100644 index ec34c279..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/default.stpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/default.tpl b/install/ubuntu/18.04/templates/web/apache2/default.tpl deleted file mode 100644 index 3a227015..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/default.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/hosting.stpl b/install/ubuntu/18.04/templates/web/apache2/hosting.stpl deleted file mode 100644 index 8892072b..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/hosting.stpl +++ /dev/null @@ -1,49 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/hosting.tpl b/install/ubuntu/18.04/templates/web/apache2/hosting.tpl deleted file mode 100644 index 1eb26910..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/hosting.tpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/phpcgi.sh b/install/ubuntu/18.04/templates/web/apache2/phpcgi.sh deleted file mode 100755 index 6565e103..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/phpcgi.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/18.04/templates/web/apache2/phpcgi.stpl b/install/ubuntu/18.04/templates/web/apache2/phpcgi.stpl deleted file mode 100644 index 731355bc..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/phpcgi.stpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/phpcgi.tpl b/install/ubuntu/18.04/templates/web/apache2/phpcgi.tpl deleted file mode 100644 index c6796d29..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/phpcgi.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.sh b/install/ubuntu/18.04/templates/web/apache2/phpfcgid.sh deleted file mode 100755 index e8058249..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script="#!/bin/sh -PHPRC=/usr/local/lib -export PHPRC -export PHP_FCGI_MAX_REQUESTS=1000 -export PHP_FCGI_CHILDREN=20 -exec /usr/bin/php-cgi -" -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/18.04/templates/web/apache2/phpfcgid.stpl deleted file mode 100644 index 156c8a91..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.stpl +++ /dev/null @@ -1,39 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - php_admin_value open_basedir none - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/18.04/templates/web/apache2/phpfcgid.tpl deleted file mode 100644 index a4c01269..00000000 --- a/install/ubuntu/18.04/templates/web/apache2/phpfcgid.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.04/templates/web/awstats/awstats.tpl b/install/ubuntu/18.04/templates/web/awstats/awstats.tpl deleted file mode 100755 index 9a92e0fd..00000000 --- a/install/ubuntu/18.04/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1 -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/18.04/templates/web/awstats/index.tpl b/install/ubuntu/18.04/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/ubuntu/18.04/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/ubuntu/18.04/templates/web/awstats/nav.tpl b/install/ubuntu/18.04/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/ubuntu/18.04/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/ubuntu/18.04/templates/web/nginx/caching.sh b/install/ubuntu/18.04/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/ubuntu/18.04/templates/web/nginx/caching.stpl b/install/ubuntu/18.04/templates/web/nginx/caching.stpl deleted file mode 100755 index 61b74814..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/caching.tpl b/install/ubuntu/18.04/templates/web/nginx/caching.tpl deleted file mode 100755 index 73de28d5..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/default.stpl b/install/ubuntu/18.04/templates/web/nginx/default.stpl deleted file mode 100755 index 418305a8..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/default.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.04/templates/web/nginx/default.tpl b/install/ubuntu/18.04/templates/web/nginx/default.tpl deleted file mode 100755 index bebd47a2..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/default.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.04/templates/web/nginx/hosting.sh b/install/ubuntu/18.04/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/ubuntu/18.04/templates/web/nginx/hosting.stpl b/install/ubuntu/18.04/templates/web/nginx/hosting.stpl deleted file mode 100755 index 3e3567d6..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.04/templates/web/nginx/hosting.tpl b/install/ubuntu/18.04/templates/web/nginx/hosting.tpl deleted file mode 100755 index a41d4054..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.04/templates/web/nginx/http2.stpl b/install/ubuntu/18.04/templates/web/nginx/http2.stpl deleted file mode 100644 index 5a958ca4..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/http2.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.04/templates/web/nginx/http2.tpl b/install/ubuntu/18.04/templates/web/nginx/http2.tpl deleted file mode 100644 index bebd47a2..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/http2.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index 003e9180..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 51f1f408..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index e8dd8bf6..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index 96495ee8..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,126 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index 38de83d2..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index c9387bfb..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 6b20ba9d..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index 0ae7568b..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 041ebba0..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index 6b41f319..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 231d9441..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,93 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index 452aa9e6..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index 886b586e..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index 8e6e8774..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index 5d05ea72..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,197 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index 23ce8eb8..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,68 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index 10629c65..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 7b3aff96..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index 223eb97a..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/opencart.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 5b6e55e8..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,58 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index b43fdc75..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 0a4a412f..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index b8bf770a..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/sendy.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/vbulletin5.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/vbulletin5.stpl deleted file mode 100644 index eebb3e42..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/vbulletin5.stpl +++ /dev/null @@ -1,105 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # legacy css being handled separate for performance - location = /css\.php { - rewrite ^ /core/css.php break; - } - - # make install available from presentation - location ^~ /install { - rewrite ^/install/ /core/install/ break; - } - - # any request to not existing item gets redirected through routestring - location / { - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - } - - # make admincp available from presentation - location ^~ /admincp { - if (!-f $request_filename) { - rewrite ^/admincp/(.*)$ /index.php?routestring=admincp/$1 last; - } - } - - # process any php scripts, not found gets redirected through routestring - location ~ \.php$ { - # handles legacy scripts - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 break; - } - - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout 180; - fastcgi_buffers 256 16k; - fastcgi_buffer_size 32k; - fastcgi_temp_file_write_size 256k; - - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/vbulletin5.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/vbulletin5.tpl deleted file mode 100644 index 2c5c9988..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/vbulletin5.tpl +++ /dev/null @@ -1,100 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # legacy css being handled separate for performance - location = /css\.php { - rewrite ^ /core/css.php break; - } - - # make install available from presentation - location ^~ /install { - rewrite ^/install/ /core/install/ break; - } - - # any request to not existing item gets redirected through routestring - location / { - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - } - - # make admincp available from presentation - location ^~ /admincp { - if (!-f $request_filename) { - rewrite ^/admincp/(.*)$ /index.php?routestring=admincp/$1 last; - } - } - - # process any php scripts, not found gets redirected through routestring - location ~ \.php$ { - # handles legacy scripts - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 break; - } - - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout 180; - fastcgi_buffers 256 16k; - fastcgi_buffer_size 32k; - fastcgi_temp_file_write_size 256k; - - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index 38de83d2..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index 39cce361..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index 264ca01a..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.04/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/18.04/templates/web/nginx/proxy_ip.tpl deleted file mode 100755 index ae195617..00000000 --- a/install/ubuntu/18.04/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/ubuntu/18.04/templates/web/php-fpm/default.tpl b/install/ubuntu/18.04/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/ubuntu/18.04/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/18.04/templates/web/php-fpm/no-php.tpl b/install/ubuntu/18.04/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/ubuntu/18.04/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/18.04/templates/web/php-fpm/socket.tpl b/install/ubuntu/18.04/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/ubuntu/18.04/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/18.04/templates/web/skel/document_errors/403.html b/install/ubuntu/18.04/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/ubuntu/18.04/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/ubuntu/18.04/templates/web/skel/document_errors/404.html b/install/ubuntu/18.04/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/ubuntu/18.04/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/ubuntu/18.04/templates/web/skel/document_errors/50x.html b/install/ubuntu/18.04/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/ubuntu/18.04/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/ubuntu/18.04/templates/web/skel/public_html/index.html b/install/ubuntu/18.04/templates/web/skel/public_html/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/18.04/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/18.04/templates/web/skel/public_html/robots.txt b/install/ubuntu/18.04/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/18.04/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/18.04/templates/web/skel/public_shtml/index.html b/install/ubuntu/18.04/templates/web/skel/public_shtml/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/18.04/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/18.04/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/18.04/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/18.04/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/18.04/templates/web/suspend/.htaccess b/install/ubuntu/18.04/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/ubuntu/18.04/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/ubuntu/18.04/templates/web/suspend/index.html b/install/ubuntu/18.04/templates/web/suspend/index.html deleted file mode 100755 index f2d04e1f..00000000 --- a/install/ubuntu/18.04/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

SUSPENDED

-

This website has been suspended.

-
- Please contact the technical support department. -
- - diff --git a/install/ubuntu/18.04/templates/web/webalizer/webalizer.tpl b/install/ubuntu/18.04/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/ubuntu/18.04/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/ubuntu/18.04/vsftpd/vsftpd.conf b/install/ubuntu/18.04/vsftpd/vsftpd.conf deleted file mode 100644 index 75e0104f..00000000 --- a/install/ubuntu/18.04/vsftpd/vsftpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_promiscuous=YES -pasv_min_port=12000 -pasv_max_port=12100 -max_per_ip=10 -max_clients=100 -use_localtime=YES -utf8_filesystem=YES -ssl_enable=YES -allow_anon_ssl=NO -require_ssl_reuse=NO -ssl_ciphers=HIGH -ssl_tlsv1=YES -ssl_sslv2=NO -ssl_sslv3=NO -force_local_data_ssl=NO -force_local_logins_ssl=NO -rsa_cert_file=/usr/local/vesta/ssl/certificate.crt -rsa_private_key_file=/usr/local/vesta/ssl/certificate.key diff --git a/install/ubuntu/18.10/apache2/apache2.conf b/install/ubuntu/18.10/apache2/apache2.conf deleted file mode 100644 index 2756132a..00000000 --- a/install/ubuntu/18.10/apache2/apache2.conf +++ /dev/null @@ -1,94 +0,0 @@ -# It is split into several files forming the configuration hierarchy outlined -# below, all located in the /etc/apache2/ directory: -# -# /etc/apache2/ -# |-- apache2.conf -# | `-- ports.conf -# |-- mods-enabled -# | |-- *.load -# | `-- *.conf -# |-- conf.d -# | `-- * - -# Global configuration -PidFile ${APACHE_PID_FILE} -Timeout 30 -KeepAlive Off -MaxKeepAliveRequests 100 -KeepAliveTimeout 10 - - - StartServers 8 - MinSpareServers 5 - MaxSpareServers 20 - ServerLimit 256 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - - - StartServers 2 - MinSpareThreads 25 - MaxSpareThreads 75 - ThreadLimit 64 - ThreadsPerChild 25 - MaxClients 200 - MaxRequestsPerChild 4000 - - -# These need to be set in /etc/apache2/envvars -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} -#User www-data -#Group www-data - -AccessFileName .htaccess - - - Order allow,deny - Deny from all - Satisfy all - - -DefaultType None -HostnameLookups Off - -ErrorLog ${APACHE_LOG_DIR}/error.log -LogLevel warn - -# Include module configuration: -Include mods-enabled/*.load -Include mods-enabled/*.conf - -# Include list of ports to listen on and which to use for name based vhosts -Include ports.conf - -LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined -LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%h %l %u %t \"%r\" %>s %O" common -LogFormat "%{Referer}i -> %U" referer -LogFormat "%{User-agent}i" agent -LogFormat "%b" bytes - -Include conf.d/ - -# Include the virtual host configurations: -#Include sites-enabled/ - -ErrorDocument 403 /error/403.html -ErrorDocument 404 /error/404.html -ErrorDocument 500 /error/50x.html -ErrorDocument 501 /error/50x.html -ErrorDocument 502 /error/50x.html -ErrorDocument 503 /error/50x.html -ErrorDocument 506 /error/50x.html diff --git a/install/ubuntu/18.10/apache2/status.conf b/install/ubuntu/18.10/apache2/status.conf deleted file mode 100644 index da9d9633..00000000 --- a/install/ubuntu/18.10/apache2/status.conf +++ /dev/null @@ -1,8 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - Allow from all - diff --git a/install/ubuntu/18.10/bind/named.conf b/install/ubuntu/18.10/bind/named.conf deleted file mode 100644 index ed6ece88..00000000 --- a/install/ubuntu/18.10/bind/named.conf +++ /dev/null @@ -1,12 +0,0 @@ -// This is the primary configuration file for the BIND DNS server named. -// -// Please read /usr/share/doc/bind9/README.Debian.gz for information on the -// structure of BIND configuration files in Debian, *BEFORE* you customize -// this configuration file. -// -// If you are just adding zones, please do that in /etc/bind/named.conf.local - -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; - diff --git a/install/ubuntu/18.10/clamav/clamd.conf b/install/ubuntu/18.10/clamav/clamd.conf deleted file mode 100644 index 4e04356e..00000000 --- a/install/ubuntu/18.10/clamav/clamd.conf +++ /dev/null @@ -1,61 +0,0 @@ -#Automatically Generated by clamav-base postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-base -#Please read /usr/share/doc/clamav-base/README.Debian.gz for details -LocalSocket /var/run/clamav/clamd.ctl -FixStaleSocket true -LocalSocketGroup clamav -LocalSocketMode 666 -# TemporaryDirectory is not set to its default /tmp here to make overriding -# the default with environment variables TMPDIR/TMP/TEMP possible -User clamav -# AllowSupplementaryGroups true -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogFacility LOG_LOCAL6 -LogClean false -LogVerbose true -PidFile /var/run/clamav/clamd.pid -DatabaseDirectory /var/lib/clamav -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -ScanOLE2 true -ScanHTML true -DetectBrokenExecutables false -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -StreamMaxLength 25M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -OfficialDatabaseOnly false -CrossFilesystems true diff --git a/install/ubuntu/18.10/deb_signing.key b/install/ubuntu/18.10/deb_signing.key deleted file mode 100644 index 2ad2db8b..00000000 --- a/install/ubuntu/18.10/deb_signing.key +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.12 (GNU/Linux) - -mQENBFJIGbEBCAC8SHOOFo7iDTbnC2GhNZ+uBGCh226Dn1QPoFZNFM/DNakHZ6rD -G3wzr8++eKz4fJual/VLllE2N9XDPuxbozb3LLkcyY1WzJqtIXbXhFGQ/SuIeT+x -QY90XU6t2Ckze2c+zUniAWmJ8GSyVmXOoc9JxAQ1u47wvGXLzrjWXc8u8PNRYXuf -fZplTL+dFu9P0d6lP8FGsV+r9wXvvazpRTz3+H8PKrGCYT55ZQIEdG9Jgamylto2 -oVPFXkwGML+TLw6oeCIBuz2y2vtivphW4MJ3ifQjDj7k3n+DTIxfDFs8lB6VRhhY -2nMHCrcZC6U2mhmXmr6O4s1fu6irBVx05ejPABEBAAG0IFNlcmdoZXkgUm9kaW4g -PHNraWRAdmVzdGFjcC5jb20+iQE4BBMBAgAiBQJSSBmxAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRBCxbITCh93FPdqB/93GjV9g+wBfeZYLHQK9MDU2wBb -VloYOJJae6IvYKYQVAJayD3PbHdpxrF8s9e23vdnmb9jKu6jX6oV54EIyqP2HPiN -QYc8wcea+eSHerznBixCtoQh8mtdWGFeN71zU/ig7L5qlOVF/EmxDVZTFUeivFxh -IV6qyBnktQKktE45585yKZyyLtfGoXA54DGK69OtJFh+wdkKEMmUXocMl7wUrxW6 -Cx2CuKeEXEgvwu8mRHQi3S3T9XP456qWEn5dWyMVcP660IzEuZfSJApZusNK7zG3 -WMy0/EuX7xHNY3mcNxTOUN1LsO7iHnhHD9+iKWJo9parGkMZzc92MpjDK/g7uQEN -BFJIGbEBCAC7k5QEA9WQM7E3ceNaeLMrA9lXfuzaNCcySq7ONdVAa5PxzbSKdHvz -QFoL1VFqBTYQ038lbil1XqnoM0zvIfAI3LcpS8sq92El/vPxp6jZh2Ari9Uw7x95 -k2cZMgI67g+zQMGdjVRA155nFQRCgg000xU4F7JA6+WsuLlVUmccsDv7YWJExMtC -YPxiuz5DFu8RALnw4Ckts+dbwsrcvUHhkm9b6RAsdCKjjRpUZjLgdltjH83gUVvt -i1YmdjjsVpt95dtsaG+ad852g/Rk8EdxNMkjPF6HLA67CLADP9wYaj80yPcPtylS -ycvPtcclVeHkFBRVM8xZpQd4iD19MWI1ABEBAAGJAR8EGAECAAkFAlJIGbECGwwA -CgkQQsWyEwofdxQ7tQgAhB0FwTs7L8Qr63DHC2yAnXVxgtTAY1/36CccNXVculyR -+EkLcwahms9AKhz7eQb+Mud+5vH0GRohLp2npgO38CjVUfIP5d+Y6dsthmrkF6p8 -XdV1dVK9vWX+i/YZSw/Mded30Cq4P2Yhq9EaemMT0rtli8lz2NnkZ9dFJZk1lzJC -CZmRpbjSNWqRU4f7qyh21lYk/OC/0XE8fh8CaO23TZ+6gBionoCztwb7NyC9OArN -qYlNnbmh9iNqdblykPS3bkjf34n2xyMgnIehNrM89tk8PY4UfNPhgT1TMD9W3Svq -ynNZvLuF/FIDwDeC1qcfjGbfDn9fXO/lMIIRooQYKQ== -=J2HJ ------END PGP PUBLIC KEY BLOCK----- diff --git a/install/ubuntu/18.10/dovecot/conf.d/10-auth.conf b/install/ubuntu/18.10/dovecot/conf.d/10-auth.conf deleted file mode 100644 index dfcc8311..00000000 --- a/install/ubuntu/18.10/dovecot/conf.d/10-auth.conf +++ /dev/null @@ -1,4 +0,0 @@ -disable_plaintext_auth = no -auth_verbose = yes -auth_mechanisms = plain login -!include auth-passwdfile.conf.ext diff --git a/install/ubuntu/18.10/dovecot/conf.d/10-logging.conf b/install/ubuntu/18.10/dovecot/conf.d/10-logging.conf deleted file mode 100644 index a5f207d5..00000000 --- a/install/ubuntu/18.10/dovecot/conf.d/10-logging.conf +++ /dev/null @@ -1 +0,0 @@ -log_path = /var/log/dovecot.log diff --git a/install/ubuntu/18.10/dovecot/conf.d/10-mail.conf b/install/ubuntu/18.10/dovecot/conf.d/10-mail.conf deleted file mode 100644 index 7a20878a..00000000 --- a/install/ubuntu/18.10/dovecot/conf.d/10-mail.conf +++ /dev/null @@ -1,9 +0,0 @@ -mail_privileged_group = mail -mail_access_groups = mail -mail_location = maildir:%h/mail/%d/%n -pop3_uidl_format = %08Xu%08Xv -namespace inbox { - inbox = yes -} -first_valid_uid = 1000 -mbox_write_locks = fcntl diff --git a/install/ubuntu/18.10/dovecot/conf.d/10-master.conf b/install/ubuntu/18.10/dovecot/conf.d/10-master.conf deleted file mode 100644 index a75a9aaa..00000000 --- a/install/ubuntu/18.10/dovecot/conf.d/10-master.conf +++ /dev/null @@ -1,29 +0,0 @@ -service imap-login { - inet_listener imap { - } - inet_listener imaps { - } -} - -service pop3-login { - inet_listener pop3 { - } - inet_listener pop3s { - } -} - - -service imap { -} - -service pop3 { -} - -service auth { - unix_listener auth-client { - group = mail - mode = 0660 - user = dovecot - } - user = dovecot -} diff --git a/install/ubuntu/18.10/dovecot/conf.d/10-ssl.conf b/install/ubuntu/18.10/dovecot/conf.d/10-ssl.conf deleted file mode 100644 index 24cbf3e2..00000000 --- a/install/ubuntu/18.10/dovecot/conf.d/10-ssl.conf +++ /dev/null @@ -1,5 +0,0 @@ -ssl = yes -ssl_protocols = !SSLv2 !SSLv3 - -ssl_cert = = 2.1.4) : %v.%u - # Dovecot v0.99.x : %v.%u - # tpop3d : %Mf - # - # Note that Outlook 2003 seems to have problems with %v.%u format which was - # Dovecot's default, so if you're building a new server it would be a good - # idea to change this. %08Xu%08Xv should be pretty fail-safe. - # - #pop3_uidl_format = %08Xu%08Xv - - # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes - # won't change those UIDLs. Currently this works only with Maildir. - #pop3_save_uidl = no - - # What to do about duplicate UIDLs if they exist? - # allow: Show duplicates to clients. - # rename: Append a temporary -2, -3, etc. counter after the UIDL. - #pop3_uidl_duplicates = allow - - # POP3 logout format string: - # %i - total number of bytes read from client - # %o - total number of bytes sent to client - # %t - number of TOP commands - # %p - number of bytes sent to client as a result of TOP command - # %r - number of RETR commands - # %b - number of bytes sent to client as a result of RETR command - # %d - number of deleted messages - # %m - number of messages (before deletion) - # %s - mailbox size in bytes (before deletion) - # %u - old/new UIDL hash. may help finding out if UIDLs changed unexpectedly - #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s - - # Maximum number of POP3 connections allowed for a user from each IP address. - # NOTE: The username is compared case-sensitively. - #mail_max_userip_connections = 10 - - # Space separated list of plugins to load (default is global mail_plugins). - #mail_plugins = $mail_plugins - - # Workarounds for various client bugs: - # outlook-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. - # oe-ns-eoh: - # Outlook Express and Netscape Mail breaks if end of headers-line is - # missing. This option simply sends it if it's missing. - # The list is space-separated. - #pop3_client_workarounds = -} diff --git a/install/ubuntu/18.10/dovecot/conf.d/auth-passwdfile.conf.ext b/install/ubuntu/18.10/dovecot/conf.d/auth-passwdfile.conf.ext deleted file mode 100644 index 75e6e115..00000000 --- a/install/ubuntu/18.10/dovecot/conf.d/auth-passwdfile.conf.ext +++ /dev/null @@ -1,9 +0,0 @@ -passdb { - driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd -} - -userdb { - driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd -} diff --git a/install/ubuntu/18.10/dovecot/dovecot.conf b/install/ubuntu/18.10/dovecot/dovecot.conf deleted file mode 100644 index 0a855351..00000000 --- a/install/ubuntu/18.10/dovecot/dovecot.conf +++ /dev/null @@ -1,4 +0,0 @@ -protocols = imap pop3 -listen = *, :: -base_dir = /var/run/dovecot/ -!include conf.d/*.conf diff --git a/install/ubuntu/18.10/exim/dnsbl.conf b/install/ubuntu/18.10/exim/dnsbl.conf deleted file mode 100644 index 5166b255..00000000 --- a/install/ubuntu/18.10/exim/dnsbl.conf +++ /dev/null @@ -1,2 +0,0 @@ -bl.spamcop.net -zen.spamhaus.org diff --git a/install/ubuntu/18.10/exim/exim4.conf.template b/install/ubuntu/18.10/exim/exim4.conf.template deleted file mode 100644 index c904441f..00000000 --- a/install/ubuntu/18.10/exim/exim4.conf.template +++ /dev/null @@ -1,382 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/run/clamav/clamd.ctl -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 5s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### -begin acl - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth required - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = * - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{1024K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = debian-spamd:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -userforward: - driver = redirect - check_local_user - file = $home/.forward - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/install/ubuntu/18.10/exim/spam-blocks.conf b/install/ubuntu/18.10/exim/spam-blocks.conf deleted file mode 100644 index e69de29b..00000000 diff --git a/install/ubuntu/18.10/fail2ban/action.d/vesta.conf b/install/ubuntu/18.10/fail2ban/action.d/vesta.conf deleted file mode 100644 index 0edfc349..00000000 --- a/install/ubuntu/18.10/fail2ban/action.d/vesta.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for vesta - -[Definition] - -actionstart = /usr/local/vesta/bin/v-add-firewall-chain -actionstop = /usr/local/vesta/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/vesta/bin/v-add-firewall-ban -actionunban = /usr/local/vesta/bin/v-delete-firewall-ban diff --git a/install/ubuntu/18.10/fail2ban/filter.d/vesta.conf b/install/ubuntu/18.10/fail2ban/filter.d/vesta.conf deleted file mode 100644 index 69670a56..00000000 --- a/install/ubuntu/18.10/fail2ban/filter.d/vesta.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccesfull Vesta authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/ubuntu/18.10/fail2ban/jail.local b/install/ubuntu/18.10/fail2ban/jail.local deleted file mode 100644 index 013f81c4..00000000 --- a/install/ubuntu/18.10/fail2ban/jail.local +++ /dev/null @@ -1,51 +0,0 @@ -[DEFAULT] -ignoreip = 127.0.0.1/8 - -[ssh-iptables] -enabled = true -filter = sshd -action = vesta[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = vesta[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = vesta[name=MAIL] -logpath = /var/log/exim4/mainlog -maxretry = 5 - -[dovecot-iptables] -enabled = true -filter = dovecot -action = vesta[name=MAIL] -logpath = /var/log/dovecot.log -maxretry = 5 - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = vesta[name=DB] -logpath = /var/log/mysql.log -maxretry = 5 - -[vesta-iptables] -enabled = true -filter = vesta -action = vesta[name=VESTA] -logpath = /var/log/vesta/auth.log -maxretry = 5 - -[roundcube-auth] -enabled = false -filter = roundcube-auth -port = http,https -logpath = /var/log/roundcube/errors -maxretry = 5 diff --git a/install/ubuntu/18.10/firewall/ports.conf b/install/ubuntu/18.10/firewall/ports.conf deleted file mode 100644 index b730d012..00000000 --- a/install/ubuntu/18.10/firewall/ports.conf +++ /dev/null @@ -1,17 +0,0 @@ -PROTOCOL='TCP' PORT='20' -PROTOCOL='TCP' PORT='21' -PROTOCOL='TCP' PORT='22' -PROTOCOL='TCP' PORT='25' -PROTOCOL='TCP' PORT='53' -PROTOCOL='UDP' PORT='53' -PROTOCOL='TCP' PORT='80' -PROTOCOL='TCP' PORT='443' -PROTOCOL='TCP' PORT='110' -PROTOCOL='UDP' PORT='123' -PROTOCOL='TCP' PORT='143' -PROTOCOL='TCP' PORT='3306' -PROTOCOL='TCP' PORT='5432' -PROTOCOL='TCP' PORT='8080' -PROTOCOL='TCP' PORT='8433' -PROTOCOL='TCP' PORT='8083' -PROTOCOL='TCP' PORT='12000:12100' diff --git a/install/ubuntu/18.10/firewall/rules.conf b/install/ubuntu/18.10/firewall/rules.conf deleted file mode 100644 index fba98e1e..00000000 --- a/install/ubuntu/18.10/firewall/rules.conf +++ /dev/null @@ -1,11 +0,0 @@ -RULE='1' ACTION='ACCEPT' PROTOCOL='ICMP' PORT='0' IP='0.0.0.0/0' COMMENT='PING' SUSPENDED='no' TIME='17:13:48' DATE='2014-09-16' -RULE='2' ACTION='ACCEPT' PROTOCOL='TCP' PORT='8083' IP='0.0.0.0/0' COMMENT='VESTA' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='3' ACTION='ACCEPT' PROTOCOL='TCP' PORT='3306,5432' IP='0.0.0.0/0' COMMENT='DB' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='4' ACTION='ACCEPT' PROTOCOL='TCP' PORT='143,993' IP='0.0.0.0/0' COMMENT='IMAP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='5' ACTION='ACCEPT' PROTOCOL='TCP' PORT='110,995' IP='0.0.0.0/0' COMMENT='POP3' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='6' ACTION='ACCEPT' PROTOCOL='TCP' PORT='25,465,587,2525' IP='0.0.0.0/0' COMMENT='SMTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='7' ACTION='ACCEPT' PROTOCOL='TCP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='8' ACTION='ACCEPT' PROTOCOL='UDP' PORT='53' IP='0.0.0.0/0' COMMENT='DNS' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='9' ACTION='ACCEPT' PROTOCOL='TCP' PORT='21,12000-12100' IP='0.0.0.0/0' COMMENT='FTP' SUSPENDED='no' TIME='07:40:16' DATE='2014-05-25' -RULE='10' ACTION='ACCEPT' PROTOCOL='TCP' PORT='80,443' IP='0.0.0.0/0' COMMENT='WEB' SUSPENDED='no' TIME='17:04:27' DATE='2014-09-24' -RULE='11' ACTION='ACCEPT' PROTOCOL='TCP' PORT='22' IP='0.0.0.0/0' COMMENT='SSH' SUSPENDED='no' TIME='17:14:41' DATE='2014-09-16' diff --git a/install/ubuntu/18.10/logrotate/apache2 b/install/ubuntu/18.10/logrotate/apache2 deleted file mode 100644 index 27629d0d..00000000 --- a/install/ubuntu/18.10/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 root adm - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /var/run/nginx.pid ] || kill -USR1 `cat /var/run/nginx.pid` - endscript - prerotate - if [ -d /etc/logrotate.d/httpd-prerotate ]; then \ - run-parts /etc/logrotate.d/httpd-prerotate; \ - fi; \ - endscript -} diff --git a/install/ubuntu/18.10/logrotate/dovecot b/install/ubuntu/18.10/logrotate/dovecot deleted file mode 100644 index ac4fd6e9..00000000 --- a/install/ubuntu/18.10/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - weekly - rotate 4 - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} diff --git a/install/ubuntu/18.10/logrotate/nginx b/install/ubuntu/18.10/logrotate/nginx deleted file mode 100644 index d667f213..00000000 --- a/install/ubuntu/18.10/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - daily - missingok - rotate 52 - compress - delaycompress - notifempty - create 640 nginx adm - sharedscripts - postrotate - [ -f /var/run/nginx.pid ] && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/install/ubuntu/18.10/logrotate/vesta b/install/ubuntu/18.10/logrotate/vesta deleted file mode 100644 index 027a3439..00000000 --- a/install/ubuntu/18.10/logrotate/vesta +++ /dev/null @@ -1,7 +0,0 @@ -/usr/local/vesta/log/*.log { - missingok - notifempty - size 30k - yearly - create 0600 root root -} diff --git a/install/ubuntu/18.10/mysql/my-large.cnf b/install/ubuntu/18.10/mysql/my-large.cnf deleted file mode 100644 index 7201377c..00000000 --- a/install/ubuntu/18.10/mysql/my-large.cnf +++ /dev/null @@ -1,41 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 256M -max_allowed_packet = 32M -table_open_cache = 256 -sort_buffer_size = 1M -read_buffer_size = 1M -read_rnd_buffer_size = 4M -myisam_sort_buffer_size = 64M -thread_cache_size = 8 -query_cache_size= 16M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=200 -max_user_connections=50 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/18.10/mysql/my-medium.cnf b/install/ubuntu/18.10/mysql/my-medium.cnf deleted file mode 100644 index 1c10ab9a..00000000 --- a/install/ubuntu/18.10/mysql/my-medium.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16M -max_allowed_packet = 16M -table_open_cache = 64 -sort_buffer_size = 512K -net_buffer_length = 8K -read_buffer_size = 256K -read_rnd_buffer_size = 512K -myisam_sort_buffer_size = 8M - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=70 -max_user_connections=30 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/18.10/mysql/my-small.cnf b/install/ubuntu/18.10/mysql/my-small.cnf deleted file mode 100644 index 26a80478..00000000 --- a/install/ubuntu/18.10/mysql/my-small.cnf +++ /dev/null @@ -1,40 +0,0 @@ -[client] -port=3306 -socket=/var/run/mysqld/mysqld.sock - -[mysqld_safe] -socket=/var/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/var/run/mysqld/mysqld.pid -socket=/var/run/mysqld/mysqld.sock -port=3306 -basedir=/usr -datadir=/var/lib/mysql -tmpdir=/tmp -lc-messages-dir=/usr/share/mysql -log_error=/var/log/mysql/error.log - -symbolic-links=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 4 -sort_buffer_size = 64K -read_buffer_size = 256K -read_rnd_buffer_size = 256K -net_buffer_length = 2K -thread_stack = 240K - -#innodb_use_native_aio = 0 -innodb_file_per_table - -max_connections=30 -max_user_connections=20 -wait_timeout=10 -interactive_timeout=50 -long_query_time=5 - -!includedir /etc/mysql/conf.d/ diff --git a/install/ubuntu/18.10/nginx/nginx.conf b/install/ubuntu/18.10/nginx/nginx.conf deleted file mode 100644 index 790aee49..00000000 --- a/install/ubuntu/18.10/nginx/nginx.conf +++ /dev/null @@ -1,138 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -error_log /var/log/nginx/error.log; -pid /var/run/nginx.pid; - - -# Worker config -events { - worker_connections 1024; - use epoll; - multi_accept on; -} - - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 60s; - client_body_timeout 60s; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 60s; - keepalive_timeout 30s; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - #access_log /var/log/nginx/access.log main; - access_log off; - - - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_static on; - gzip_vary on; - gzip_comp_level 6; - gzip_min_length 1024; - gzip_buffers 16 8k; - gzip_types text/plain text/css text/javascript text/js text/xml application/json application/javascript application/x-javascript application/xml application/xml+rss application/x-font-ttf image/svg+xml font/opentype; - gzip_proxied any; - gzip_disable "MSIE [1-6]\."; - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_buffers 32 4k; - proxy_connect_timeout 30s; - proxy_send_timeout 90s; - proxy_read_timeout 90s; - - - # Cloudflare https://www.cloudflare.com/ips - set_real_ip_from 103.21.244.0/22; - set_real_ip_from 103.22.200.0/22; - set_real_ip_from 103.31.4.0/22; - set_real_ip_from 104.16.0.0/12; - set_real_ip_from 108.162.192.0/18; - set_real_ip_from 131.0.72.0/22; - set_real_ip_from 141.101.64.0/18; - set_real_ip_from 162.158.0.0/15; - set_real_ip_from 172.64.0.0/13; - set_real_ip_from 173.245.48.0/20; - set_real_ip_from 188.114.96.0/20; - set_real_ip_from 190.93.240.0/20; - set_real_ip_from 197.234.240.0/22; - set_real_ip_from 198.41.128.0/17; - #set_real_ip_from 2400:cb00::/32; - #set_real_ip_from 2606:4700::/32; - #set_real_ip_from 2803:f800::/32; - #set_real_ip_from 2405:b500::/32; - #set_real_ip_from 2405:8100::/32; - #set_real_ip_from 2c0f:f248::/32; - #set_real_ip_from 2a06:98c0::/29; - real_ip_header CF-Connecting-IP; - - - # SSL PCI Compliance - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Cache settings - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$host$request_uri $cookie_user"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Expires Cache-Control; - proxy_cache_use_stale error timeout invalid_header http_502; - proxy_cache_valid any 1d; - - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - - # File cache settings - open_file_cache max=10000 inactive=30s; - open_file_cache_valid 60s; - open_file_cache_min_uses 2; - open_file_cache_errors off; - - - # Wildcard include - include /etc/nginx/conf.d/*.conf; -} diff --git a/install/ubuntu/18.10/nginx/phpmyadmin.inc b/install/ubuntu/18.10/nginx/phpmyadmin.inc deleted file mode 100644 index cdfc93c4..00000000 --- a/install/ubuntu/18.10/nginx/phpmyadmin.inc +++ /dev/null @@ -1,18 +0,0 @@ -location /phpmyadmin { - alias /usr/share/phpmyadmin; - - location ~ /(libraries|setup) { - return 404; - } - - location ~ ^/phpmyadmin/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } - location ~* ^/phpmyadmin/(.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt))$ { - root /usr/share/; - } -} diff --git a/install/ubuntu/18.10/nginx/phppgadmin.inc b/install/ubuntu/18.10/nginx/phppgadmin.inc deleted file mode 100644 index 47cfcf4e..00000000 --- a/install/ubuntu/18.10/nginx/phppgadmin.inc +++ /dev/null @@ -1,11 +0,0 @@ -location /phppgadmin { - alias /usr/share/phppgadmin; - - location ~ ^/phppgadmin/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/18.10/nginx/status.conf b/install/ubuntu/18.10/nginx/status.conf deleted file mode 100644 index c0bcd069..00000000 --- a/install/ubuntu/18.10/nginx/status.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 127.0.0.1:8084 default; - server_name _; - server_name_in_redirect off; - location / { - stub_status on; - access_log off; - } -} diff --git a/install/ubuntu/18.10/nginx/webmail.inc b/install/ubuntu/18.10/nginx/webmail.inc deleted file mode 100644 index 768c9049..00000000 --- a/install/ubuntu/18.10/nginx/webmail.inc +++ /dev/null @@ -1,15 +0,0 @@ -location /webmail { - alias /var/lib/roundcube; - - location ~ /(config|temp|logs) { - return 404; - } - - location ~ ^/webmail/(.*\.php)$ { - alias /var/lib/roundcube/$1; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $request_filename; - } -} diff --git a/install/ubuntu/18.10/packages/default.pkg b/install/ubuntu/18.10/packages/default.pkg deleted file mode 100644 index c2a93574..00000000 --- a/install/ubuntu/18.10/packages/default.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='unlimited' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.10/packages/gainsboro.pkg b/install/ubuntu/18.10/packages/gainsboro.pkg deleted file mode 100644 index 76d7dae2..00000000 --- a/install/ubuntu/18.10/packages/gainsboro.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='10' -WEB_ALIASES='10' -DNS_DOMAINS='10' -DNS_RECORDS='10' -MAIL_DOMAINS='10' -MAIL_ACCOUNTS='10' -DATABASES='10' -CRON_JOBS='10' -DISK_QUOTA='10000' -BANDWIDTH='10000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='1' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.10/packages/palegreen.pkg b/install/ubuntu/18.10/packages/palegreen.pkg deleted file mode 100644 index 3db5fe57..00000000 --- a/install/ubuntu/18.10/packages/palegreen.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='hosting' -PROXY_TEMPLATE='hosting' -DNS_TEMPLATE='default' -WEB_DOMAINS='50' -WEB_ALIASES='50' -DNS_DOMAINS='50' -DNS_RECORDS='50' -MAIL_DOMAINS='50' -MAIL_ACCOUNTS='50' -DATABASES='50' -CRON_JOBS='50' -DISK_QUOTA='50000' -BANDWIDTH='50000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='5' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.10/packages/slategrey.pkg b/install/ubuntu/18.10/packages/slategrey.pkg deleted file mode 100644 index d89e796f..00000000 --- a/install/ubuntu/18.10/packages/slategrey.pkg +++ /dev/null @@ -1,18 +0,0 @@ -WEB_TEMPLATE='default' -PROXY_TEMPLATE='default' -DNS_TEMPLATE='default' -WEB_DOMAINS='100' -WEB_ALIASES='100' -DNS_DOMAINS='100' -DNS_RECORDS='100' -MAIL_DOMAINS='100' -MAIL_ACCOUNTS='100' -DATABASES='100' -CRON_JOBS='100' -DISK_QUOTA='10000' -BANDWIDTH='100000' -NS='ns1.domain.tld,ns2.domain.tld' -SHELL='nologin' -BACKUPS='3' -TIME='18:00:00' -DATE='2017-12-28' diff --git a/install/ubuntu/18.10/pga/config.inc.php b/install/ubuntu/18.10/pga/config.inc.php deleted file mode 100644 index 1eec9776..00000000 --- a/install/ubuntu/18.10/pga/config.inc.php +++ /dev/null @@ -1,159 +0,0 @@ - diff --git a/install/ubuntu/18.10/pga/phppgadmin.conf b/install/ubuntu/18.10/pga/phppgadmin.conf deleted file mode 100644 index f39247d6..00000000 --- a/install/ubuntu/18.10/pga/phppgadmin.conf +++ /dev/null @@ -1,31 +0,0 @@ -Alias /phppgadmin /usr/share/phppgadmin - - - -DirectoryIndex index.php -AllowOverride None - -order deny,allow -deny from all -allow from 127.0.0.0/255.0.0.0 ::1/128 -allow from all - - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_value include_path . - - - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - AddType application/x-httpd-php .php - Action application/x-httpd-php /cgi-bin/php - - - - - diff --git a/install/ubuntu/18.10/php-fpm/www.conf b/install/ubuntu/18.10/php-fpm/www.conf deleted file mode 100644 index 3c87f33c..00000000 --- a/install/ubuntu/18.10/php-fpm/www.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -listen = 127.0.0.1:9000 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 2 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/ubuntu/18.10/pma/apache.conf b/install/ubuntu/18.10/pma/apache.conf deleted file mode 100644 index 4da6ce84..00000000 --- a/install/ubuntu/18.10/pma/apache.conf +++ /dev/null @@ -1,42 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /phpmyadmin /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - - AddType application/x-httpd-php .php - - php_flag magic_quotes_gpc Off - php_flag track_vars On - php_flag register_globals Off - php_admin_flag allow_url_fopen Off - php_value include_path . - php_admin_value upload_tmp_dir /var/lib/phpmyadmin/tmp - php_admin_value open_basedir /usr/share/phpmyadmin/:/etc/phpmyadmin/:/var/lib/phpmyadmin/:/usr/share/php/php-gettext:/usr/share/javascript/ - - - - -# Authorize for setup - - - AuthType Basic - AuthName "phpMyAdmin Setup" - AuthUserFile /etc/phpmyadmin/htpasswd.setup - - Require valid-user - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - diff --git a/install/ubuntu/18.10/pma/config.inc.php b/install/ubuntu/18.10/pma/config.inc.php deleted file mode 100644 index a643a065..00000000 --- a/install/ubuntu/18.10/pma/config.inc.php +++ /dev/null @@ -1,146 +0,0 @@ - - VRootEngine on - VRootAlias /etc/security/pam_env.conf etc/security/pam_env.conf - - -AuthPAMConfig proftpd -AuthOrder mod_auth_pam.c* mod_auth_unix.c -UseReverseDNS off -User proftpd -Group nogroup -MaxInstances 20 -UseSendfile off -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -ListOptions -a -RequireValidShell off -PassivePorts 12000 12100 - - - Umask 002 - IdentLookups off - AllowOverwrite yes - - AllowAll - - diff --git a/install/ubuntu/18.10/roundcube/apache.conf b/install/ubuntu/18.10/roundcube/apache.conf deleted file mode 100644 index a0c87bcc..00000000 --- a/install/ubuntu/18.10/roundcube/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -Alias /roundcube/program/js/tiny_mce/ /usr/share/tinymce/www/ -Alias /roundcube /var/lib/roundcube -Alias /webmail /var/lib/roundcube - -# Access to tinymce files - - Options Indexes MultiViews FollowSymLinks - AllowOverride None - Order allow,deny - allow from all - - - - Options +FollowSymLinks - # This is needed to parse /var/lib/roundcube/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - - - - Options -FollowSymLinks - AllowOverride None - Order allow,deny - Deny from all - diff --git a/install/ubuntu/18.10/roundcube/config.inc.php b/install/ubuntu/18.10/roundcube/config.inc.php deleted file mode 100644 index 0c82b1bc..00000000 --- a/install/ubuntu/18.10/roundcube/config.inc.php +++ /dev/null @@ -1,33 +0,0 @@ - diff --git a/install/ubuntu/18.10/roundcube/main.inc.php b/install/ubuntu/18.10/roundcube/main.inc.php deleted file mode 100644 index 32e0d473..00000000 --- a/install/ubuntu/18.10/roundcube/main.inc.php +++ /dev/null @@ -1,850 +0,0 @@ -/sendmail or to syslog -$rcmail_config['smtp_log'] = true; - -// Log successful logins to /userlogins or to syslog -$rcmail_config['log_logins'] = false; - -// Log session authentication errors to /session or to syslog -$rcmail_config['log_session'] = false; - -// Log SQL queries to /sql or to syslog -$rcmail_config['sql_debug'] = false; - -// Log IMAP conversation to /imap or to syslog -$rcmail_config['imap_debug'] = false; - -// Log LDAP conversation to /ldap or to syslog -$rcmail_config['ldap_debug'] = false; - -// Log SMTP conversation to /smtp or to syslog -$rcmail_config['smtp_debug'] = false; - -// ---------------------------------- -// IMAP -// ---------------------------------- - -// the mail host chosen to perform the log-in -// leave blank to show a textbox at login, give a list of hosts -// to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// Supported replacement variables: -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %s - domain name after the '@' from e-mail address provided at login screen -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['default_host'] = 'localhost'; - -// TCP port used for IMAP connections -$rcmail_config['default_port'] = 143; - -// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['imap_auth_type'] = null; - -// If you know your imap's folder delimiter, you can specify it here. -// Otherwise it will be determined automatically -$rcmail_config['imap_delimiter'] = null; - -// If IMAP server doesn't support NAMESPACE extension, but you're -// using shared folders or personal root folder is non-empty, you'll need to -// set these options. All can be strings or arrays of strings. -// Folders need to be ended with directory separator, e.g. "INBOX." -// (special directory "~" is an exception to this rule) -// These can be used also to overwrite server's namespaces -$rcmail_config['imap_ns_personal'] = null; -$rcmail_config['imap_ns_other'] = null; -$rcmail_config['imap_ns_shared'] = null; - -// By default IMAP capabilities are readed after connection to IMAP server -// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list -// after login. Set to True if you've got this case. -$rcmail_config['imap_force_caps'] = false; - -// By default list of subscribed folders is determined using LIST-EXTENDED -// extension if available. Some servers (dovecot 1.x) returns wrong results -// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225 -// Enable this option to force LSUB command usage instead. -$rcmail_config['imap_force_lsub'] = false; - -// Some server configurations (e.g. Courier) doesn't list folders in all namespaces -// Enable this option to force listing of folders in all namespaces -$rcmail_config['imap_force_ns'] = false; - -// IMAP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['imap_timeout'] = 0; - -// Optional IMAP authentication identifier to be used as authorization proxy -$rcmail_config['imap_auth_cid'] = null; - -// Optional IMAP authentication password to be used for imap_auth_cid -$rcmail_config['imap_auth_pw'] = null; - -// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'. -$rcmail_config['imap_cache'] = null; - -// Enables messages cache. Only 'db' cache is supported. -$rcmail_config['messages_cache'] = false; - - -// ---------------------------------- -// SMTP -// ---------------------------------- - -// SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['smtp_server'] = ''; - -// SMTP port (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) -$rcmail_config['smtp_port'] = 25; - -// SMTP username (if required) if you use %u as the username Roundcube -// will use the current username for login -$rcmail_config['smtp_user'] = ''; - -// SMTP password (if required) if you use %p as the password Roundcube -// will use the current user's password for login -$rcmail_config['smtp_pass'] = ''; - -// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use -// best server supported one) -$rcmail_config['smtp_auth_type'] = ''; - -// Optional SMTP authentication identifier to be used as authorization proxy -$rcmail_config['smtp_auth_cid'] = null; - -// Optional SMTP authentication password to be used for smtp_auth_cid -$rcmail_config['smtp_auth_pw'] = null; - -// SMTP HELO host -// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages -// Leave this blank and you will get the server variable 'server_name' or -// localhost if that isn't defined. -$rcmail_config['smtp_helo_host'] = ''; - -// SMTP connection timeout, in seconds. Default: 0 (no limit) -$rcmail_config['smtp_timeout'] = 0; - -// ---------------------------------- -// SYSTEM -// ---------------------------------- -include_once("/etc/roundcube/debian-db-roundcube.php"); - - -// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA. -// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING! -$rcmail_config['enable_installer'] = false; - -// provide an URL where a user can get support for this Roundcube installation -// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE! -$rcmail_config['support_url'] = ''; - -// replace Roundcube logo with this image -// specify an URL relative to the document root of this Roundcube installation -$rcmail_config['skin_logo'] = null; - -// automatically create a new Roundcube user when log-in the first time. -// a new user will be created once the IMAP login succeeds. -// set to false if only registered users can use this service -$rcmail_config['auto_create_user'] = true; - -// use this folder to store log files (must be writeable for apache user) -// This is used by the 'file' log driver. -$rcmail_config['log_dir'] = '/var/log/roundcube/'; - -// use this folder to store temp files (must be writeable for apache user) -$rcmail_config['temp_dir'] = '/tmp'; - -// lifetime of message cache -// possible units: s, m, h, d, w -$rcmail_config['message_cache_lifetime'] = '10d'; - -// enforce connections over https -// with this option enabled, all non-secure connections will be redirected. -// set the port for the ssl connection as value of this option if it differs from the default 443 -$rcmail_config['force_https'] = false; - -// tell PHP that it should work as under secure connection -// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set) -// e.g. when you're running Roundcube behind a https proxy -// this option is mutually exclusive to 'force_https' and only either one of them should be set to true. -$rcmail_config['use_https'] = false; - -// Allow browser-autocompletion on login form. -// 0 - disabled, 1 - username and host only, 2 - username, host, password -$rcmail_config['login_autocomplete'] = 0; - -// Forces conversion of logins to lower case. -// 0 - disabled, 1 - only domain part, 2 - domain and local part. -// If users authentication is not case-sensitive this must be enabled. -// After enabling it all user records need to be updated, e.g. with query: -// UPDATE users SET username = LOWER(username); -$rcmail_config['login_lc'] = 0; - -// Includes should be interpreted as PHP files -$rcmail_config['skin_include_php'] = false; - -// display software version on login screen -$rcmail_config['display_version'] = false; - -// Session lifetime in minutes -// must be greater than 'keep_alive'/60 -$rcmail_config['session_lifetime'] = 10; - -// session domain: .example.org -$rcmail_config['session_domain'] = ''; - -// session name. Default: 'roundcube_sessid' -$rcmail_config['session_name'] = null; - -// Backend to use for session storage. Can either be 'db' (default) or 'memcache' -// If set to memcache, a list of servers need to be specified in 'memcache_hosts' -// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed -$rcmail_config['session_storage'] = 'db'; - -// Use these hosts for accessing memcached -// Define any number of hosts in the form of hostname:port or unix:///path/to/sock.file -$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211', 'unix:///var/tmp/memcached.sock' ); - -// check client IP in session athorization -$rcmail_config['ip_check'] = false; - -// check referer of incoming requests -$rcmail_config['referer_check'] = false; - -// X-Frame-Options HTTP header value sent to prevent from Clickjacking. -// Possible values: sameorigin|deny. Set to false in order to disable sending them -$rcmail_config['x_frame_options'] = 'sameorigin'; - -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. -$rcmail_config['des_key'] = 'vtIOjLZo9kffJoqzpSbm5r1r'; - -// Automatically add this domain to user names for login -// Only for IMAP servers that require full e-mail addresses for login -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['username_domain'] = ''; - -// This domain will be used to form e-mail addresses of new users -// Specify an array with 'host' => 'domain' values to support multiple hosts -// Supported replacement variables: -// %h - user's IMAP hostname -// %n - http hostname ($_SERVER['SERVER_NAME']) -// %d - domain (http hostname without the first part) -// %z - IMAP domain (IMAP hostname without the first part) -// For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['mail_domain'] = ''; - -// Password charset. -// Use it if your authentication backend doesn't support UTF-8. -// Defaults to ISO-8859-1 for backward compatibility -$rcmail_config['password_charset'] = 'ISO-8859-1'; - -// How many seconds must pass between emails sent by a user -$rcmail_config['sendmail_delay'] = 0; - -// Maximum number of recipients per message. Default: 0 (no limit) -$rcmail_config['max_recipients'] = 0; - -// Maximum allowednumber of members of an address group. Default: 0 (no limit) -// If 'max_recipients' is set this value should be less or equal -$rcmail_config['max_group_members'] = 0; - -// add this user-agent to message headers when sending -$rcmail_config['useragent'] = 'Roundcube Webmail'; - -// use this name to compose page titles -$rcmail_config['product_name'] = 'Roundcube Webmail'; - -// try to load host-specific configuration -// see http://trac.roundcube.net/wiki/Howto_Config for more details -$rcmail_config['include_host_config'] = false; - -// path to a text file which will be added to each sent message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer'] = ''; - -// path to a text file which will be added to each sent HTML message -// paths are relative to the Roundcube root folder -$rcmail_config['generic_message_footer_html'] = ''; - -// add a received header to outgoing mails containing the creators IP and hostname -$rcmail_config['http_received_header'] = false; - -// Whether or not to encrypt the IP address and the host name -// these could, in some circles, be considered as sensitive information; -// however, for the administrator, these could be invaluable help -// when tracking down issues. -$rcmail_config['http_received_header_encrypt'] = false; - -// This string is used as a delimiter for message headers when sending -// a message via mail() function. Leave empty for auto-detection -$rcmail_config['mail_header_delimiter'] = NULL; - -// number of chars allowed for line when wrapping text. -// text wrapping is done when composing/sending messages -$rcmail_config['line_length'] = 72; - -// send plaintext messages as format=flowed -$rcmail_config['send_format_flowed'] = true; - -// don't allow these settings to be overriden by the user -$rcmail_config['dont_override'] = array(); - -// Set identities access level: -// 0 - many identities with possibility to edit all params -// 1 - many identities with possibility to edit all params but not email address -// 2 - one identity with possibility to edit all params -// 3 - one identity with possibility to edit all params but not email address -$rcmail_config['identities_level'] = 0; - -// Mimetypes supported by the browser. -// attachments of these types will open in a preview window -// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf' -$rcmail_config['client_mimetypes'] = null; # null == default - -// mime magic database -$rcmail_config['mime_magic'] = null; - -// path to imagemagick identify binary -$rcmail_config['im_identify_path'] = null; - -// path to imagemagick convert binary -$rcmail_config['im_convert_path'] = null; - -// maximum size of uploaded contact photos in pixel -$rcmail_config['contact_photo_size'] = 160; - -// Enable DNS checking for e-mail address validation -$rcmail_config['email_dns_check'] = false; - -// ---------------------------------- -// PLUGINS -// ---------------------------------- - -// List of active plugins (in plugins/ directory) -$rcmail_config['plugins'] = array('password'); - -// ---------------------------------- -// USER INTERFACE -// ---------------------------------- - -// default messages sort column. Use empty value for default server's sorting, -// or 'arrival', 'date', 'subject', 'from', 'to', 'fromto', 'size', 'cc' -$rcmail_config['message_sort_col'] = ''; - -// default messages sort order -$rcmail_config['message_sort_order'] = 'DESC'; - -// These cols are shown in the message list. Available cols are: -// subject, from, to, fromto, cc, replyto, date, size, status, flag, attachment, 'priority' -$rcmail_config['list_cols'] = array('subject', 'status', 'fromto', 'date', 'size', 'flag', 'attachment'); - -// the default locale setting (leave empty for auto-detection) -// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR -$rcmail_config['language'] = null; - -// use this format for date display (date or strftime format) -$rcmail_config['date_format'] = 'Y-m-d'; - -// give this choice of date formats to the user to select from -$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y'); - -// use this format for time display (date or strftime format) -$rcmail_config['time_format'] = 'H:i'; - -// give this choice of time formats to the user to select from -$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A'); - -// use this format for short date display (derived from date_format and time_format) -$rcmail_config['date_short'] = 'D H:i'; - -// use this format for detailed date/time formatting (derived from date_format and time_format) -$rcmail_config['date_long'] = 'Y-m-d H:i'; - -// store draft message is this mailbox -// leave blank if draft messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['drafts_mbox'] = 'Drafts'; - -// store spam messages in this mailbox -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['junk_mbox'] = 'Spam'; - -// store sent message is this mailbox -// leave blank if sent messages should not be stored -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['sent_mbox'] = 'Sent'; - -// move messages to this folder when deleting them -// leave blank if they should be deleted directly -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['trash_mbox'] = 'Trash'; - -// display these folders separately in the mailbox list. -// these folders will also be displayed with localized names -// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP) -$rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); -$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash'); - -// automatically create the above listed default folders on first login -$rcmail_config['create_default_folders'] = true; - -// protect the default folders from renames, deletes, and subscription changes -$rcmail_config['protect_default_folders'] = true; - -// if in your system 0 quota means no limit set this option to true -$rcmail_config['quota_zero_as_unlimited'] = true; - -// Make use of the built-in spell checker. It is based on GoogieSpell. -// Since Google only accepts connections over https your PHP installatation -// requires to be compiled with Open SSL support -$rcmail_config['enable_spellcheck'] = true; - -// Enables spellchecker exceptions dictionary. -// Setting it to 'shared' will make the dictionary shared by all users. -$rcmail_config['spellcheck_dictionary'] = false; - -// Set the spell checking engine. 'googie' is the default. 'pspell' is also available, -// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here. -$rcmail_config['spellcheck_engine'] = 'googie'; - -// For a locally installed Nox Spell Server, please specify the URI to call it. -// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 -// Leave empty to use the Google spell checking service, what means -// that the message content will be sent to Google in order to check spelling -$rcmail_config['spellcheck_uri'] = ''; - -// These languages can be selected for spell checking. -// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch'); -// Leave empty for default set of available language. -$rcmail_config['spellcheck_languages'] = NULL; - -// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE) -$rcmail_config['spellcheck_ignore_caps'] = false; - -// Makes that words with numbers will be ignored (e.g. g00gle) -$rcmail_config['spellcheck_ignore_nums'] = false; - -// Makes that words with symbols will be ignored (e.g. g@@gle) -$rcmail_config['spellcheck_ignore_syms'] = false; - -// Use this char/string to separate recipients when composing a new message -$rcmail_config['recipients_separator'] = ','; - -// don't let users set pagesize to more than this value if set -$rcmail_config['max_pagesize'] = 200; - -// Minimal value of user's 'keep_alive' setting (in seconds) -// Must be less than 'session_lifetime' -$rcmail_config['min_keep_alive'] = 60; - -// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option. -// By default refresh time is set to 1 second. You can set this value to true -// or any integer value indicating number of seconds. -$rcmail_config['upload_progress'] = false; - -// Specifies for how many seconds the Undo button will be available -// after object delete action. Currently used with supporting address book sources. -// Setting it to 0, disables the feature. -$rcmail_config['undo_timeout'] = 0; - -// ---------------------------------- -// ADDRESSBOOK SETTINGS -// ---------------------------------- - -// This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. -// If set to 'ldap' then it will look at using the first writable LDAP -// address book as the primary address book and it will not display the -// SQL address book in the 'Address Book' view. -$rcmail_config['address_book_type'] = 'sql'; - -// In order to enable public ldap search, configure an array like the Verisign -// example further below. if you would like to test, simply uncomment the example. -// Array key must contain only safe characters, ie. a-zA-Z0-9_ -$rcmail_config['ldap_public'] = array(); - -// If you are going to use LDAP for individual address books, you will need to -// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it. -// -// The recommended directory structure for LDAP is to store all the address book entries -// under the users main entry, e.g.: -// -// o=root -// ou=people -// uid=user@domain -// mail=contact@contactdomain -// -// So the base_dn would be uid=%fu,ou=people,o=root -// The bind_dn would be the same as based_dn or some super user login. -/* - * example config for Verisign directory - * -$rcmail_config['ldap_public']['Verisign'] = array( - 'name' => 'Verisign.com', - // Replacement variables supported in host names: - // %h - user's IMAP hostname - // %n - http hostname ($_SERVER['SERVER_NAME']) - // %d - domain (http hostname without the first part) - // %z - IMAP domain (IMAP hostname without the first part) - // For example %n = mail.domain.tld, %d = domain.tld - 'hosts' => array('directory.verisign.com'), - 'port' => 389, - 'use_tls' => false, - 'ldap_version' => 3, // using LDAPv3 - 'user_specific' => false, // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login. - // %fu - The full username provided, assumes the username is an email - // address, uses the username_domain value if not an email address. - // %u - The username prior to the '@'. - // %d - The domain name after the '@'. - // %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" - // %dn - DN found by ldap search when search_filter/search_base_dn are used - 'base_dn' => '', - 'bind_dn' => '', - 'bind_pass' => '', - // It's possible to bind for an individual address book - // The login name is used to search for the DN to bind with - 'search_base_dn' => '', - 'search_filter' => '', // e.g. '(&(objectClass=posixAccount)(uid=%u))' - // DN and password to bind as before searching for bind DN, if anonymous search is not allowed - 'search_bind_dn' => '', - 'search_bind_pw' => '', - // Default for %dn variable if search doesn't return DN value - 'search_dn_default' => '', - // Optional authentication identifier to be used as SASL authorization proxy - // bind_dn need to be empty - 'auth_cid' => '', - // SASL authentication method (for proxy auth), e.g. DIGEST-MD5 - 'auth_method' => '', - // Indicates if the addressbook shall be hidden from the list. - // With this option enabled you can still search/view contacts. - 'hidden' => false, - // Indicates if the addressbook shall not list contacts but only allows searching. - 'searchonly' => false, - // Indicates if we can write to the LDAP directory or not. - // If writable is true then these fields need to be populated: - // LDAP_Object_Classes, required_fields, LDAP_rdn - 'writable' => false, - // To create a new contact these are the object classes to specify - // (or any other classes you wish to use). - 'LDAP_Object_Classes' => array('top', 'inetOrgPerson'), - // The RDN field that is used for new entries, this field needs - // to be one of the search_fields, the base of base_dn is appended - // to the RDN to insert into the LDAP directory. - 'LDAP_rdn' => 'cn', - // The required fields needed to build a new contact as required by - // the object classes (can include additional fields not required by the object classes). - 'required_fields' => array('cn', 'sn', 'mail'), - 'search_fields' => array('mail', 'cn'), // fields to search in - // mapping of contact fields to directory attributes - // for every attribute one can specify the number of values (limit) allowed. - // default is 1, a wildcard * means unlimited - 'fieldmap' => array( - // Roundcube => LDAP:limit - 'name' => 'cn', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'title' => 'title', - 'email' => 'mail:*', - 'phone:home' => 'homePhone', - 'phone:work' => 'telephoneNumber', - 'phone:mobile' => 'mobile', - 'phone:pager' => 'pager', - 'street' => 'street', - 'zipcode' => 'postalCode', - 'region' => 'st', - 'locality' => 'l', -// if you uncomment country, you need to modify 'sub_fields' above -// 'country' => 'c', - 'department' => 'departmentNumber', - 'notes' => 'description', -// these currently don't work: -// 'phone:workfax' => 'facsimileTelephoneNumber', -// 'photo' => 'jpegPhoto', -// 'organization' => 'o', -// 'manager' => 'manager', -// 'assistant' => 'secretary', - ), - // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country' - 'sub_fields' => array(), - 'sort' => 'cn', // The field to sort the listing by. - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=inetOrgPerson)', // used for basic listing (if not empty) and will be &'d with search queries. example: status=act - 'fuzzy_search' => true, // server allows wildcard search - 'vlv' => false, // Enable Virtual List View to more efficiently fetch paginated data (if server supports it) - 'numsub_filter' => '(objectClass=organizationalUnit)', // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting - 'sizelimit' => '0', // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. - 'timelimit' => '0', // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. - 'referrals' => true|false, // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups - - // definition for contact groups (uncomment if no groups are supported) - // for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above) - // if the groups base_dn is empty, the contact base_dn is used for the groups as well - // -> in this case, assure that groups and contacts are separated due to the concernig filters! - 'groups' => array( - 'base_dn' => '', - 'scope' => 'sub', // search mode: sub|base|list - 'filter' => '(objectClass=groupOfNames)', - 'object_classes' => array("top", "groupOfNames"), - 'member_attr' => 'member', // name of the member attribute, e.g. uniqueMember - 'name_attr' => 'cn', // attribute to be used as group name - ), -); -*/ - -// An ordered array of the ids of the addressbooks that should be searched -// when populating address autocomplete fields server-side. ex: array('sql','Verisign'); -$rcmail_config['autocomplete_addressbooks'] = array('sql'); - -// The minimum number of characters required to be typed in an autocomplete field -// before address books will be searched. Most useful for LDAP directories that -// may need to do lengthy results building given overly-broad searches -$rcmail_config['autocomplete_min_length'] = 1; - -// Number of parallel autocomplete requests. -// If there's more than one address book, n parallel (async) requests will be created, -// where each request will search in one address book. By default (0), all address -// books are searched in one request. -$rcmail_config['autocomplete_threads'] = 0; - -// Max. numer of entries in autocomplete popup. Default: 15. -$rcmail_config['autocomplete_max'] = 15; - -// show address fields in this order -// available placeholders: {street}, {locality}, {zipcode}, {country}, {region} -$rcmail_config['address_template'] = '{street}
{locality} {zipcode}
{country} {region}'; - -// Matching mode for addressbook search (including autocompletion) -// 0 - partial (*abc*), default -// 1 - strict (abc) -// 2 - prefix (abc*) -// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode -$rcmail_config['addressbook_search_mode'] = 0; - -// ---------------------------------- -// USER PREFERENCES -// ---------------------------------- - -// Use this charset as fallback for message decoding -//$rcmail_config['default_charset'] = 'ISO-8859-1'; -$rcmail_config['default_charset'] = 'UTF-8'; - -// skin name: folder from skins/ -$rcmail_config['skin'] = 'larry'; - -// show up to X items in messages list view -$rcmail_config['mail_pagesize'] = 50; - -// show up to X items in contacts list view -$rcmail_config['addressbook_pagesize'] = 50; - -// sort contacts by this col (preferably either one of name, firstname, surname) -$rcmail_config['addressbook_sort_col'] = 'surname'; - -// the way how contact names are displayed in the list -// 0: display name -// 1: (prefix) firstname middlename surname (suffix) -// 2: (prefix) surname firstname middlename (suffix) -// 3: (prefix) surname, firstname middlename (suffix) -$rcmail_config['addressbook_name_listing'] = 0; - -// use this timezone to display date/time -// valid timezone identifers are listed here: php.net/manual/en/timezones.php -// 'auto' will use the browser's timezone settings -$rcmail_config['timezone'] = 'auto'; - -// prefer displaying HTML messages -$rcmail_config['prefer_html'] = true; - -// display remote inline images -// 0 - Never, always ask -// 1 - Ask if sender is not in address book -// 2 - Always show inline images -$rcmail_config['show_images'] = 0; - -// compose html formatted messages by default -// 0 - never, 1 - always, 2 - on reply to HTML message only -$rcmail_config['htmleditor'] = 0; - -// show pretty dates as standard -$rcmail_config['prettydate'] = true; - -// save compose message every 30 seconds -$rcmail_config['draft_autosave'] = 30; - -// default setting if preview pane is enabled -$rcmail_config['preview_pane'] = false; - -// Mark as read when viewed in preview pane (delay in seconds) -// Set to -1 if messages in preview pane should not be marked as read -$rcmail_config['preview_pane_mark_read'] = 0; - -// Clear Trash on logout -$rcmail_config['logout_purge'] = false; - -// Compact INBOX on logout -$rcmail_config['logout_expunge'] = false; - -// Display attached images below the message body -$rcmail_config['inline_images'] = true; - -// Encoding of long/non-ascii attachment names: -// 0 - Full RFC 2231 compatible -// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default) -// 2 - Full 2047 compatible -$rcmail_config['mime_param_folding'] = 1; - -// Set true if deleted messages should not be displayed -// This will make the application run slower -$rcmail_config['skip_deleted'] = false; - -// Set true to Mark deleted messages as read as well as deleted -// False means that a message's read status is not affected by marking it as deleted -$rcmail_config['read_when_deleted'] = true; - -// Set to true to never delete messages immediately -// Use 'Purge' to remove messages marked as deleted -$rcmail_config['flag_for_deletion'] = false; - -// Default interval for keep-alive/check-recent requests (in seconds) -// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime' -$rcmail_config['keep_alive'] = 60; - -// If true all folders will be checked for recent messages -$rcmail_config['check_all_folders'] = false; - -// If true, after message delete/move, the next message will be displayed -$rcmail_config['display_next'] = false; - -// 0 - Do not expand threads -// 1 - Expand all threads automatically -// 2 - Expand only threads with unread messages -$rcmail_config['autoexpand_threads'] = 0; - -// When replying place cursor above original message (top posting) -$rcmail_config['top_posting'] = false; - -// When replying strip original signature from message -$rcmail_config['strip_existing_sig'] = true; - -// Show signature: -// 0 - Never -// 1 - Always -// 2 - New messages only -// 3 - Forwards and Replies only -$rcmail_config['show_sig'] = 1; - -// When replying or forwarding place sender's signature above existing message -$rcmail_config['sig_above'] = false; - -// Use MIME encoding (quoted-printable) for 8bit characters in message body -$rcmail_config['force_7bit'] = false; - -// Defaults of the search field configuration. -// The array can contain a per-folder list of header fields which should be considered when searching -// The entry with key '*' stands for all folders which do not have a specific list set. -// Please note that folder names should to be in sync with $rcmail_config['default_folders'] -$rcmail_config['search_mods'] = null; // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1)); - -// Defaults of the addressbook search field configuration. -$rcmail_config['addressbook_search_mods'] = null; // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1); - -// 'Delete always' -// This setting reflects if mail should be always deleted -// when moving to Trash fails. This is necessary in some setups -// when user is over quota and Trash is included in the quota. -$rcmail_config['delete_always'] = false; - -// Directly delete messages in Junk instead of moving to Trash -$rcmail_config['delete_junk'] = true; - -// Behavior if a received message requests a message delivery notification (read receipt) -// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask) -// 3 = send automatically if sender is in addressbook, otherwise ask the user -// 4 = send automatically if sender is in addressbook, otherwise ignore -$rcmail_config['mdn_requests'] = 0; - -// Return receipt checkbox default state -$rcmail_config['mdn_default'] = 0; - -// Delivery Status Notification checkbox default state -$rcmail_config['dsn_default'] = 0; - -// Place replies in the folder of the message being replied to -$rcmail_config['reply_same_folder'] = false; - -// Sets default mode of Forward feature to "forward as attachment" -$rcmail_config['forward_attachment'] = false; - -// Defines address book (internal index) to which new contacts will be added -// By default it is the first writeable addressbook. -// Note: Use '0' for built-in address book. -$rcmail_config['default_addressbook'] = null; - -// Enables spell checking before sending a message. -$rcmail_config['spellcheck_before_send'] = false; - -// Skip alternative email addresses in autocompletion (show one address per contact) -$rcmail_config['autocomplete_single'] = false; - -// Default font for composed HTML message. -// Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New, -// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana -$rcmail_config['default_font'] = ''; - -// end of config file diff --git a/install/ubuntu/18.10/roundcube/vesta.php b/install/ubuntu/18.10/roundcube/vesta.php deleted file mode 100644 index b4a2a6b6..00000000 --- a/install/ubuntu/18.10/roundcube/vesta.php +++ /dev/null @@ -1,72 +0,0 @@ - - */ -class rcube_vesta_password { - function save($curpass, $passwd) - { - $rcmail = rcmail::get_instance(); - $vesta_host = $rcmail->config->get('password_vesta_host'); - - if (empty($vesta_host)) - { - $vesta_host = 'localhost'; - } - - $vesta_port = $rcmail->config->get('password_vesta_port'); - if (empty($vesta_port)) - { - $vesta_port = '8083'; - } - - $postvars = array( - 'email' => $_SESSION['username'], - 'password' => $curpass, - 'new' => $passwd - ); - - $postdata = http_build_query($postvars); - - $send = 'POST /reset/mail/ HTTP/1.1' . PHP_EOL; - $send .= 'Host: ' . $vesta_host . PHP_EOL; - $send .= 'User-Agent: PHP Script' . PHP_EOL; - $send .= 'Content-length: ' . strlen($postdata) . PHP_EOL; - $send .= 'Content-type: application/x-www-form-urlencoded' . PHP_EOL; - $send .= 'Connection: close' . PHP_EOL; - $send .= PHP_EOL; - $send .= $postdata . PHP_EOL . PHP_EOL; - - //$fp = fsockopen('ssl://' . $vesta_host, $vesta_port); - $errno = ""; - $errstr = ""; - $context = stream_context_create(); - $result = stream_context_set_option($context, 'ssl', 'verify_peer', false); - $result = stream_context_set_option($context, 'ssl', 'verify_peer_name', false); - $result = stream_context_set_option($context, 'ssl', 'verify_host', false); - $result = stream_context_set_option($context, 'ssl', 'allow_self_signed', true); - - $fp = stream_socket_client('ssl://' . $vesta_host . ':'.$vesta_port, $errno, $errstr, 60, STREAM_CLIENT_CONNECT, $context); - fputs($fp, $send); - $result = fread($fp, 2048); - fclose($fp); - - $fp = fopen("/tmp/roundcube.log", 'w'); - fwrite($fp, "test ok"); - fwrite($fp, "\n"); - fclose($fp); - - - if(strpos($result, 'ok') && !strpos($result, 'error')) - { - return PASSWORD_SUCCESS; - } - else { - return PASSWORD_ERROR; - } - - } -} \ No newline at end of file diff --git a/install/ubuntu/18.10/sudo/admin b/install/ubuntu/18.10/sudo/admin deleted file mode 100644 index 331fa1f2..00000000 --- a/install/ubuntu/18.10/sudo/admin +++ /dev/null @@ -1,8 +0,0 @@ -# Created by vesta installer -Defaults env_keep="VESTA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to vesta scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* diff --git a/install/ubuntu/18.10/templates/dns/child-ns.tpl b/install/ubuntu/18.10/templates/dns/child-ns.tpl deleted file mode 100755 index 42c046e4..00000000 --- a/install/ubuntu/18.10/templates/dns/child-ns.tpl +++ /dev/null @@ -1,14 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns1.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='ns2.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ns1' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='ns2' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/18.10/templates/dns/default.tpl b/install/ubuntu/18.10/templates/dns/default.tpl deleted file mode 100755 index e0a37e62..00000000 --- a/install/ubuntu/18.10/templates/dns/default.tpl +++ /dev/null @@ -1,18 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns3%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns4%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns5%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns6%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns7%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns8%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='mail' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='13' RECORD='smtp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='14' RECORD='pop' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='15' RECORD='imap' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='16' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='mail.%domain%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='17' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='18' RECORD='_dmarc' TYPE='TXT' PRIORITY='' VALUE='"v=DMARC1; p=none"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/18.10/templates/dns/gmail.tpl b/install/ubuntu/18.10/templates/dns/gmail.tpl deleted file mode 100755 index 219c9d24..00000000 --- a/install/ubuntu/18.10/templates/dns/gmail.tpl +++ /dev/null @@ -1,12 +0,0 @@ -ID='1' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns1%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='2' RECORD='@' TYPE='NS' PRIORITY='' VALUE='%ns2%.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='3' RECORD='@' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='4' RECORD='ftp' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='5' RECORD='localhost' TYPE='A' PRIORITY='' VALUE='127.0.0.1' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='6' RECORD='www' TYPE='A' PRIORITY='' VALUE='%ip%' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='7' RECORD='@' TYPE='MX' PRIORITY='1' VALUE='ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='8' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT1.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='9' RECORD='@' TYPE='MX' PRIORITY='5' VALUE='ALT2.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='10' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT3.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='11' RECORD='@' TYPE='MX' PRIORITY='10' VALUE='ALT4.ASPMX.L.GOOGLE.COM.' SUSPENDED='no' TIME='%time%' DATE='%date%' -ID='12' RECORD='@' TYPE='TXT' PRIORITY='' VALUE='"v=spf1 a mx ip4:%ip% include:_spf.google.com ~all"' SUSPENDED='no' TIME='%time%' DATE='%date%' diff --git a/install/ubuntu/18.10/templates/web/apache2/basedir.stpl b/install/ubuntu/18.10/templates/web/apache2/basedir.stpl deleted file mode 100644 index d978d4c4..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/basedir.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/basedir.tpl b/install/ubuntu/18.10/templates/web/apache2/basedir.tpl deleted file mode 100644 index 96c94a1b..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/basedir.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/default.stpl b/install/ubuntu/18.10/templates/web/apache2/default.stpl deleted file mode 100644 index ec34c279..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/default.stpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %sdocroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/default.tpl b/install/ubuntu/18.10/templates/web/apache2/default.tpl deleted file mode 100644 index 3a227015..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/default.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/hosting.stpl b/install/ubuntu/18.10/templates/web/apache2/hosting.stpl deleted file mode 100644 index 8892072b..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/hosting.stpl +++ /dev/null @@ -1,49 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/hosting.tpl b/install/ubuntu/18.10/templates/web/apache2/hosting.tpl deleted file mode 100644 index 1eb26910..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/hosting.tpl +++ /dev/null @@ -1,43 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value upload_max_filesize 10M - php_admin_value max_execution_time 20 - php_admin_value post_max_size 8M - php_admin_value memory_limit 32M - php_admin_flag mysql.allow_persistent off - php_admin_flag safe_mode off - php_admin_value sendmail_path "/usr/sbin/sendmail -t -i -f info@%domain_idn%" - php_admin_value open_basedir %docroot%:%home%/%user%/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpMyAdmin:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcubemail:/etc/roundcube:/var/lib/roundcube - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - - AllowOverride All - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/phpcgi.sh b/install/ubuntu/18.10/templates/web/apache2/phpcgi.sh deleted file mode 100755 index 6565e103..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/phpcgi.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini' -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/18.10/templates/web/apache2/phpcgi.stpl b/install/ubuntu/18.10/templates/web/apache2/phpcgi.stpl deleted file mode 100644 index 731355bc..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/phpcgi.stpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/phpcgi.tpl b/install/ubuntu/18.10/templates/web/apache2/phpcgi.tpl deleted file mode 100644 index c6796d29..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/phpcgi.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/phpfcgid.sh b/install/ubuntu/18.10/templates/web/apache2/phpfcgid.sh deleted file mode 100755 index e8058249..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/phpfcgid.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Adding php wrapper -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -wrapper_script="#!/bin/sh -PHPRC=/usr/local/lib -export PHPRC -export PHP_FCGI_MAX_REQUESTS=1000 -export PHP_FCGI_CHILDREN=20 -exec /usr/bin/php-cgi -" -wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter" - -echo "$wrapper_script" > $wrapper_file -chown $user:$user $wrapper_file -chmod -f 751 $wrapper_file - -exit 0 diff --git a/install/ubuntu/18.10/templates/web/apache2/phpfcgid.stpl b/install/ubuntu/18.10/templates/web/apache2/phpfcgid.stpl deleted file mode 100644 index 156c8a91..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/phpfcgid.stpl +++ /dev/null @@ -1,39 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - SSLRequireSSL - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - php_admin_value open_basedir none - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/apache2/phpfcgid.tpl b/install/ubuntu/18.10/templates/web/apache2/phpfcgid.tpl deleted file mode 100644 index a4c01269..00000000 --- a/install/ubuntu/18.10/templates/web/apache2/phpfcgid.tpl +++ /dev/null @@ -1,31 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - Options +Includes -Indexes +ExecCGI - php_admin_value open_basedir %docroot%:%home%/%user%/tmp - php_admin_value upload_tmp_dir %home%/%user%/tmp - php_admin_value session.save_path %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/install/ubuntu/18.10/templates/web/awstats/awstats.tpl b/install/ubuntu/18.10/templates/web/awstats/awstats.tpl deleted file mode 100755 index 9a92e0fd..00000000 --- a/install/ubuntu/18.10/templates/web/awstats/awstats.tpl +++ /dev/null @@ -1,133 +0,0 @@ -LogFile="/var/log/%web_system%/domains/%domain%.log" -LogType=W -LogFormat=1 -LogSeparator=" " -SiteDomain="%domain_idn%" -HostAliases="%alias_idn%" -DirData="%home%/%user%/web/%domain%/stats" -DirCgi="/vstats" -DirIcons="/vstats/icon" -AllowToUpdateStatsFromBrowser=0 -AllowFullYearView=2 -EnableLockForUpdate=1 -DNSStaticCacheFile="dnscache.txt" -DNSLastUpdateCacheFile="dnscachelastupdate.txt" -SkipDNSLookupFor="" -AllowAccessFromWebToAuthenticatedUsersOnly=0 -AllowAccessFromWebToFollowingAuthenticatedUsers="" -AllowAccessFromWebToFollowingIPAddresses="" -CreateDirDataIfNotExists=0 -BuildHistoryFormat=text -BuildReportFormat=html -SaveDatabaseFilesWithPermissionsForEveryone=0 -PurgeLogFile=0 -ArchiveLogRecords=0 -KeepBackupOfHistoricFiles=1 -DefaultFile="index.php index.html" -SkipHosts="127.0.0.1 -SkipUserAgents="" -SkipFiles="" -SkipReferrersBlackList="" -OnlyHosts="" -OnlyUserAgents="" -OnlyUsers="" -OnlyFiles="" -NotPageList="css js class gif jpg jpeg png bmp ico rss xml swf" -ValidHTTPCodes="200 304" -ValidSMTPCodes="1 250" -AuthenticatedUsersNotCaseSensitive=0 -URLNotCaseSensitive=0 -URLWithAnchor=0 -URLQuerySeparators="?;" -URLWithQuery=0 -URLWithQueryWithOnlyFollowingParameters="" -URLWithQueryWithoutFollowingParameters="" -URLReferrerWithQuery=0 -WarningMessages=1 -ErrorMessages="" -DebugMessages=0 -NbOfLinesForCorruptedLog=50 -WrapperScript="" -DecodeUA=0 -MiscTrackerUrl="/js/awstats_misc_tracker.js" -UseFramesWhenCGI=1 -DetailedReportsOnNewWindows=1 -Expires=3600 -MaxRowsInHTMLOutput=1000 -Lang="auto" -DirLang="./lang" -ShowMenu=1 -ShowSummary=UVPHB -ShowMonthStats=UVPHB -ShowDaysOfMonthStats=VPHB -ShowDaysOfWeekStats=PHB -ShowHoursStats=PHB -ShowDomainsStats=PHB -ShowHostsStats=PHBL -ShowAuthenticatedUsers=0 -ShowRobotsStats=HBL -ShowWormsStats=0 -ShowEMailSenders=0 -ShowEMailReceivers=0 -ShowSessionsStats=1 -ShowPagesStats=PBEX -ShowFileTypesStats=HB -ShowFileSizesStats=0 -ShowDownloadsStats=HB -ShowOSStats=1 -ShowBrowsersStats=1 -ShowScreenSizeStats=0 -ShowOriginStats=PH -ShowKeyphrasesStats=1 -ShowKeywordsStats=1 -ShowMiscStats=a -ShowHTTPErrorsStats=1 -ShowSMTPErrorsStats=0 -ShowClusterStats=0 -AddDataArrayMonthStats=1 -AddDataArrayShowDaysOfMonthStats=1 -AddDataArrayShowDaysOfWeekStats=1 -AddDataArrayShowHoursStats=1 -IncludeInternalLinksInOriginSection=0 -MaxNbOfDomain = 10 -MinHitDomain = 1 -MaxNbOfHostsShown = 10 -MinHitHost = 1 -MaxNbOfLoginShown = 10 -MinHitLogin = 1 -MaxNbOfRobotShown = 10 -MinHitRobot = 1 -MaxNbOfDownloadsShown = 10 -MinHitDownloads = 1 -MaxNbOfPageShown = 10 -MinHitFile = 1 -MaxNbOfOsShown = 10 -MinHitOs = 1 -MaxNbOfBrowsersShown = 10 -MinHitBrowser = 1 -MaxNbOfScreenSizesShown = 5 -MinHitScreenSize = 1 -MaxNbOfWindowSizesShown = 5 -MinHitWindowSize = 1 -MaxNbOfRefererShown = 10 -MinHitRefer = 1 -MaxNbOfKeyphrasesShown = 10 -MinHitKeyphrase = 1 -MaxNbOfKeywordsShown = 10 -MinHitKeyword = 1 -MaxNbOfEMailsShown = 20 -MinHitEMail = 1 -FirstDayOfWeek=0 -ShowFlagLinks="" -ShowLinksOnUrl=1 -UseHTTPSLinkForUrl="" -MaxLengthOfShownURL=64 -HTMLHeadSection="" -HTMLEndSection="" -MetaRobot=0 -Logo="awstats_logo6.png" -LogoLink="http://awstats.sourceforge.net" -BarWidth = 260 -BarHeight = 90 -StyleSheet="" -ExtraTrackedRowsLimit=500 diff --git a/install/ubuntu/18.10/templates/web/awstats/index.tpl b/install/ubuntu/18.10/templates/web/awstats/index.tpl deleted file mode 100755 index 9df9bb5c..00000000 --- a/install/ubuntu/18.10/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/ubuntu/18.10/templates/web/awstats/nav.tpl b/install/ubuntu/18.10/templates/web/awstats/nav.tpl deleted file mode 100755 index f29bed68..00000000 --- a/install/ubuntu/18.10/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
vesta
- -
-
- - diff --git a/install/ubuntu/18.10/templates/web/nginx/caching.sh b/install/ubuntu/18.10/templates/web/nginx/caching.sh deleted file mode 100755 index 09d8efe7..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/caching.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -user=$1 -domain=$2 -ip=$3 -home=$4 -docroot=$5 - -str="proxy_cache_path /var/cache/nginx/$domain levels=2" -str="$str keys_zone=$domain:10m inactive=60m max_size=512m;" -conf='/etc/nginx/conf.d/01_caching_pool.conf' -if [ -e "$conf" ]; then - if [ -z "$(grep "=${domain}:" $conf)" ]; then - echo "$str" >> $conf - fi -else - echo "$str" >> $conf -fi - diff --git a/install/ubuntu/18.10/templates/web/nginx/caching.stpl b/install/ubuntu/18.10/templates/web/nginx/caching.stpl deleted file mode 100755 index 61b74814..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/caching.tpl b/install/ubuntu/18.10/templates/web/nginx/caching.tpl deleted file mode 100755 index 73de28d5..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache cache; - proxy_cache_valid 15m; - proxy_cache_valid 404 1m; - proxy_no_cache $no_cache; - proxy_cache_bypass $no_cache; - proxy_cache_bypass $cookie_session $http_x_update; - - location ~* ^.+\.(%proxy_extentions%)$ { - proxy_cache off; - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/default.stpl b/install/ubuntu/18.10/templates/web/nginx/default.stpl deleted file mode 100755 index 418305a8..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/default.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.10/templates/web/nginx/default.tpl b/install/ubuntu/18.10/templates/web/nginx/default.tpl deleted file mode 100755 index bebd47a2..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/default.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.10/templates/web/nginx/hosting.sh b/install/ubuntu/18.10/templates/web/nginx/hosting.sh deleted file mode 100755 index eeed37ef..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# Changing public_html permission -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -chmod 755 $docroot - -exit 0 diff --git a/install/ubuntu/18.10/templates/web/nginx/hosting.stpl b/install/ubuntu/18.10/templates/web/nginx/hosting.stpl deleted file mode 100755 index 3e3567d6..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,38 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.10/templates/web/nginx/hosting.tpl b/install/ubuntu/18.10/templates/web/nginx/hosting.tpl deleted file mode 100755 index a41d4054..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.10/templates/web/nginx/http2.stpl b/install/ubuntu/18.10/templates/web/nginx/http2.stpl deleted file mode 100644 index 5a958ca4..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/http2.stpl +++ /dev/null @@ -1,36 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.10/templates/web/nginx/http2.tpl b/install/ubuntu/18.10/templates/web/nginx/http2.tpl deleted file mode 100644 index bebd47a2..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/http2.tpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index 003e9180..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index f9e90393..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter2.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter2.stpl deleted file mode 100644 index 51f1f408..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter2.stpl +++ /dev/null @@ -1,60 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter2.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter2.tpl deleted file mode 100644 index d2422be2..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter2.tpl +++ /dev/null @@ -1,57 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location = /index.php { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME /var/www/html/ci$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ \.php$ { - return 444; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter3.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter3.stpl deleted file mode 100644 index e8dd8bf6..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter3.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter3.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter3.tpl deleted file mode 100644 index 54f81b99..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/codeigniter3.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index 96495ee8..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,126 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 3ea45347..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,123 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - rewrite "^/page/([0-9]+)(/?)$" /index.php?cstart=$1 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&cstart=$5&news_name=$6&seourl=$6 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page,([0-9]+),(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/print:page,([0-9]+),(.*).html(/?)+$" /engine/print.php?subaction=showfull&year=$1&month=$2&day=$3&news_page=$4&news_name=$5&seourl=$5 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/(.*).html(/?)+$" /index.php?subaction=showfull&year=$1&month=$2&day=$3&news_name=$4&seourl=$4 last; - - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$4&news_page=$2&cstart=$3&seourl=$5&seocat=$1 last; - rewrite "^/([^.]+)/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$2&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$2&newsid=$3&seourl=$4&seocat=$1 last; - rewrite "^/([^.]+)/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&seourl=$3&seocat=$1 last; - - rewrite "^/page,([0-9]+),([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$3&news_page=$1&cstart=$2&seourl=$4 last; - rewrite "^/page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$2&news_page=$1&seourl=$3 last; - rewrite "^/print:page,([0-9]+),([0-9]+)-(.*).html(/?)+$" /engine/print.php?news_page=$1&newsid=$2&seourl=$3 last; - rewrite "^/([0-9]+)-(.*).html(/?)+$" /index.php?newsid=$1&seourl=$2 last; - - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2&day=$3 last; - rewrite "^/([0-9]{4})/([0-9]{2})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&day=$3&cstart=$4 last; - - rewrite "^/([0-9]{4})/([0-9]{2})(/?)+$" /index.php?year=$1&month=$2 last; - rewrite "^/([0-9]{4})/([0-9]{2})/page/([0-9]+)(/?)+$" /index.php?year=$1&month=$2&cstart=$3 last; - - rewrite "^/([0-9]{4})(/?)+$" /index.php?year=$1 last; - rewrite "^/([0-9]{4})/page/([0-9]+)(/?)+$" /index.php?year=$1&cstart=$2 last; - - rewrite "^/tags/([^/]*)(/?)+$" /index.php?do=tags&tag=$1 last; - rewrite "^/tags/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=tags&tag=$1&cstart=$2 last; - - rewrite "^/xfsearch/([^/]*)(/?)+$" /index.php?do=xfsearch&xf=$1 last; - rewrite "^/xfsearch/([^/]*)/page/([0-9]+)(/?)+$" /index.php?do=xfsearch&xf=$1&cstart=$2 last; - - rewrite "^/user/([^/]*)/rss.xml$" /engine/rss.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)(/?)+$" /index.php?subaction=userinfo&user=$1 last; - rewrite "^/user/([^/]*)/page/([0-9]+)(/?)+$" /index.php?subaction=userinfo&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news(/?)+$" /index.php?subaction=allnews&user=$1 last; - rewrite "^/user/([^/]*)/news/page/([0-9]+)(/?)+$" /index.php?subaction=allnews&user=$1&cstart=$2 last; - rewrite "^/user/([^/]*)/news/rss.xml(/?)+$" /engine/rss.php?subaction=allnews&user=$1 last; - - rewrite "^/lastnews(/?)+$" /index.php?do=lastnews last; - rewrite "^/lastnews/page/([0-9]+)(/?)+$" /index.php?do=lastnews&cstart=$1 last; - - rewrite "^/catalog/([^/]*)/rss.xml$" /engine/rss.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)(/?)+$" /index.php?catalog=$1 last; - rewrite "^/catalog/([^/]*)/page/([0-9]+)(/?)+$" /index.php?catalog=$1&cstart=$2 last; - - rewrite "^/newposts(/?)+$" /index.php?subaction=newposts last; - rewrite "^/newposts/page/([0-9]+)(/?)+$" /index.php?subaction=newposts&cstart=$1 last; - - rewrite "^/favorites(/?)+$" /index.php?do=favorites last; - rewrite "^/favorites/page/([0-9]+)(/?)+$" /index.php?do=favorites&cstart=$1 last; - - rewrite "^/rules.html$" /index.php?do=rules last; - rewrite "^/statistics.html$" /index.php?do=stats last; - rewrite "^/addnews.html$" /index.php?do=addnews last; - rewrite "^/rss.xml$" /engine/rss.php last; - rewrite "^/sitemap.xml$" /uploads/sitemap.xml last; - - if (!-d $request_filename) { - rewrite "^/([^.]+)/page/([0-9]+)(/?)+$" /index.php?do=cat&category=$1&cstart=$2 last; - rewrite "^/([^.]+)/?$" /index.php?do=cat&category=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^.]+)/rss.xml$" /engine/rss.php?do=cat&category=$1 last; - rewrite "^/page,([0-9]+),([^/]+).html$" /index.php?do=static&page=$2&news_page=$1 last; - rewrite "^/print:([^/]+).html$" /engine/print.php?do=static&page=$1 last; - } - - if (!-f $request_filename) { - rewrite "^/([^/]+).html$" /index.php?do=static&page=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/default.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index 38de83d2..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/default.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index c9387bfb..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index 0a9a75ed..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - index doku.php; - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location ~ ^/lib.*\.(gif|png|ico|jpg)$ { - expires 30d; - } - - location ^~ /conf/ { return 403; } - location ^~ /data/ { return 403; } - location @dokuwiki { - rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; - rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; - rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; - rewrite ^/(.*) /doku.php?id=$1 last; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal6.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal6.stpl deleted file mode 100644 index 6b20ba9d..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal6.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal6.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal6.tpl deleted file mode 100644 index 0ae7568b..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal6.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri @rewrite; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ ^/sites/.*/files/imagecache/ { - try_files $uri @rewrite; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal7.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal7.stpl deleted file mode 100644 index 041ebba0..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal7.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal7.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal7.tpl deleted file mode 100644 index 6b41f319..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal7.tpl +++ /dev/null @@ -1,85 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal8.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal8.stpl deleted file mode 100644 index 231d9441..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal8.stpl +++ /dev/null @@ -1,93 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal8.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal8.tpl deleted file mode 100644 index 452aa9e6..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/drupal8.tpl +++ /dev/null @@ -1,90 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - try_files $uri /index.php?$query_string; - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - - location ~ ^(/[a-z\-]+)?/system/files/ { - try_files $uri /index.php?$query_string; - } - - location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ { - try_files $uri @rewrite; - expires max; - log_not_found off; - } - - location ~ '\.php$|^/update.php' { - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/joomla.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index 886b586e..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/joomla.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 91b7a8f1..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - # deny running scripts inside writable directories - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - return 403; - error_page 403 /403_error.html; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/laravel.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index 8e6e8774..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,55 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/laravel.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index d14b0173..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,50 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ /index.php?$query_string; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/magento.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index 5d05ea72..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,197 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - - root %sdocroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %sdocroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %sdocroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/magento.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index 3f292fff..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,194 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - - root %docroot%/pub; - index index.php; - autoindex off; - charset UTF-8; - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - location ~ ^/setup/(?!pub/). { - deny all; - } - - location ~ ^/setup/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - # PHP entry point for update application - location ~* ^/update($|/) { - root %docroot%; - - location ~ ^/update/index.php { - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - # Deny everything but index.php - location ~ ^/update/(?!pub/). { - deny all; - } - - location ~ ^/update/pub/ { - add_header X-Frame-Options "SAMEORIGIN"; - } - } - - location / { - try_files $uri $uri/ /index.php?$args; - } - - location /pub/ { - location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) { - deny all; - } - - alias %docroot%/pub/; - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /static/ { - # Uncomment the following line in production mode - # expires max; - - # Remove signature of the static files that is used to overcome the browser cache - location ~ ^/static/version { - rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - } - - if (!-f $request_filename) { - rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/ { - try_files $uri $uri/ /get.php?$args; - - location ~ ^/media/theme_customization/.*\.xml { - deny all; - } - - location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - try_files $uri $uri/ /get.php?$args; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - try_files $uri $uri/ /get.php?$args; - } - - add_header X-Frame-Options "SAMEORIGIN"; - } - - location /media/customer/ { - deny all; - } - - location /media/downloadable/ { - deny all; - } - - location /media/import/ { - deny all; - } - - # PHP entry point for main application - location ~ (index|get|static|report|404|503)\.php$ { - try_files $uri =404; - - fastcgi_pass %backend_lsnr%; - fastcgi_buffers 1024 4k; - fastcgi_read_timeout 600s; - fastcgi_connect_timeout 600s; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - - gzip on; - gzip_disable "msie6"; - - gzip_comp_level 6; - gzip_min_length 1100; - gzip_buffers 16 8k; - gzip_proxied any; - gzip_types - text/plain - text/css - text/js - text/xml - text/javascript - application/javascript - application/x-javascript - application/json - application/xml - application/xml+rss - image/svg+xml; - gzip_vary on; - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~* (\.php$|\.htaccess$|\.git) { - deny all; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/modx.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index 23ce8eb8..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,68 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ https://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/modx.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index 342d3ecf..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; -# if you need to rewrite www to non-www uncomment bellow -# if ($host != '%domain%' ) { -# rewrite ^/(.*)$ http://%domain%/$1 permanent; -# } - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ @rewrite; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location ~ \.php$ { - try_files $uri =404; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/moodle.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index 10629c65..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,89 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/moodle.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index c20ba648..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - rewrite ^/(.*\.php)(/)(.*)$ /$1?file=/$3 last; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # Very rarely should these ever be accessed outside of your lan - location ~* \.(txt|log)$ { - allow 192.168.0.0/16; - deny all; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - # Block access to "hidden" files and directories whose names begin with a - # period. This includes directories used by version control systems such - # as Subversion or Git to store control files. - location ~ (^|/)\. { - return 403; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_intercept_errors on; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/no-php.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 7b3aff96..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/no-php.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index 7ff8aa1d..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - types { - text/html html htm shtml php php5; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/odoo.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index 223eb97a..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/odoo.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index b1240aae..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Real-IP $remote_addr; - - proxy_connect_timeout 720; - proxy_send_timeout 720; - proxy_read_timeout 720; - send_timeout 720; - - # Allow "Well-Known URIs" as per RFC 5785 - location ~* ^/.well-known/ { - allow all; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - proxy_cache_valid 200 60m; - proxy_buffering on; - expires 864000; - proxy_pass http://127.0.0.1:8069; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/opencart.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 5b6e55e8..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,58 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/opencart.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index d0a9060b..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location / { - try_files $uri $uri/ @opencart; - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/owncloud.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index b43fdc75..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,84 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/owncloud.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index e3ec31de..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,81 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - rewrite ^/caldav(.*)$ /remote.php/caldav$1 redirect; - rewrite ^/carddav(.*)$ /remote.php/carddav$1 redirect; - rewrite ^/webdav(.*)$ /remote.php/webdav$1 redirect; - - error_page 403 = /core/templates/403.php; - error_page 404 = /core/templates/404.php; - - location ~ ^/(?:\.htaccess|data|config|db_structure\.xml|README){ - deny all; - } - - location / { - # The following 2 rules are only needed with webfinger - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - rewrite ^/.well-known/carddav /remote.php/carddav/ redirect; - rewrite ^/.well-known/caldav /remote.php/caldav/ redirect; - rewrite ^(/core/doc/[^\/]+/)$ $1/index.html; - try_files $uri $uri/ /index.php; - - location ~ \.php(?:$|/) { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - #fastcgi_param HTTPS on; - fastcgi_pass %backend_lsnr%; - } - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - # Some basic cache-control for static files to be sent to the browser - add_header Pragma public; - add_header Cache-Control "public, must-revalidate, proxy-revalidate"; - } - - #error_page 403 /error/404.html; - #error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/piwik.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/piwik.stpl deleted file mode 100644 index 0a4a412f..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/piwik.stpl +++ /dev/null @@ -1,72 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/piwik.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/piwik.tpl deleted file mode 100644 index f94fb7de..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/piwik.tpl +++ /dev/null @@ -1,69 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - try_files /favicon.ico =204; - } - - location / { - try_files $uri /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - valid_referers none blocked %domain_idn% %alias_idn%; - if ($invalid_referer) { - return 444; - } - expires max; - } - - location ~* ^/(?:index|piwik)\.php$ { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - include /etc/nginx/fastcgi_params; - } - } - - # Any other attempt to access PHP files returns a 404. - location ~* ^.+\.php$ { - return 404; - } - - # Return a 404 for all text files. - location ~* ^/(?:README|LICENSE[^.]*|LEGALNOTICE)(?:\.txt)*$ { - return 404; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/pyrocms.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/pyrocms.stpl deleted file mode 100644 index b8bf770a..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/pyrocms.stpl +++ /dev/null @@ -1,65 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/pyrocms.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/pyrocms.tpl deleted file mode 100644 index b92861b0..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/pyrocms.tpl +++ /dev/null @@ -1,62 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/public; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location /installer { - try_files $uri $uri/ /installer/index.php?$query_string; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/fastcgi_params; - } - } - - location = /robots.txt { access_log off; log_not_found off; } - location = /favicon.ico { access_log off; log_not_found off; } - location ~ /\.ht { access_log off; log_not_found off; deny all; } - location ~ ~$ { access_log off; log_not_found off; deny all; } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/sendy.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/sendy.stpl deleted file mode 100644 index 0b351000..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/sendy.stpl +++ /dev/null @@ -1,88 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/sendy.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/sendy.tpl deleted file mode 100644 index b27b427d..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/sendy.tpl +++ /dev/null @@ -1,86 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~* "/\.(htaccess|htpasswd|git|svn|DS_Store)$" { - deny all; - } - - location ~ /(readme.html|license.txt) { - deny all; - } - - if (!-f $request_filename){ - rewrite ^/([a-zA-Z0-9-]+)$ /$1.php last; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|ico|bmp|mid|midi|wav|rtf|css|js|jar|pdf)$ { - expires 1d; - } - - location ~ [^/]\.php(/|$) { - 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; - } - - location /l/ { - rewrite ^/l/([a-zA-Z0-9/]+)$ /l.php?i=$1 last; - } - - location /t/ { - rewrite ^/t/([a-zA-Z0-9/]+)$ /t.php?i=$1 last; - } - - location /w/ { - rewrite ^/w/([a-zA-Z0-9/]+)$ /w.php?i=$1 last; - } - - location /unsubscribe/ { - rewrite ^/unsubscribe/(.*)$ /unsubscribe.php?i=$1 last; - } - - location /subscribe/ { - rewrite ^/subscribe/(.*)$ /subscribe.php?i=$1 last; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/vbulletin5.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/vbulletin5.stpl deleted file mode 100644 index eebb3e42..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/vbulletin5.stpl +++ /dev/null @@ -1,105 +0,0 @@ -server { - listen %ip%:%web_ssl_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # legacy css being handled separate for performance - location = /css\.php { - rewrite ^ /core/css.php break; - } - - # make install available from presentation - location ^~ /install { - rewrite ^/install/ /core/install/ break; - } - - # any request to not existing item gets redirected through routestring - location / { - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - } - - # make admincp available from presentation - location ^~ /admincp { - if (!-f $request_filename) { - rewrite ^/admincp/(.*)$ /index.php?routestring=admincp/$1 last; - } - } - - # process any php scripts, not found gets redirected through routestring - location ~ \.php$ { - # handles legacy scripts - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 break; - } - - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout 180; - fastcgi_buffers 256 16k; - fastcgi_buffer_size 32k; - fastcgi_temp_file_write_size 256k; - - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/vbulletin5.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/vbulletin5.tpl deleted file mode 100644 index 2c5c9988..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/vbulletin5.tpl +++ /dev/null @@ -1,100 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - # legacy css being handled separate for performance - location = /css\.php { - rewrite ^ /core/css.php break; - } - - # make install available from presentation - location ^~ /install { - rewrite ^/install/ /core/install/ break; - } - - # any request to not existing item gets redirected through routestring - location / { - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - } - - # make admincp available from presentation - location ^~ /admincp { - if (!-f $request_filename) { - rewrite ^/admincp/(.*)$ /index.php?routestring=admincp/$1 last; - } - } - - # process any php scripts, not found gets redirected through routestring - location ~ \.php$ { - # handles legacy scripts - if (!-f $request_filename) { - rewrite ^/(.*)$ /index.php?routestring=$1 break; - } - - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include fastcgi_params; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort off; - fastcgi_connect_timeout 60; - fastcgi_send_timeout 180; - fastcgi_read_timeout 180; - fastcgi_buffers 256 16k; - fastcgi_buffer_size 32k; - fastcgi_temp_file_write_size 256k; - - include /etc/nginx/fastcgi_params; - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress.stpl deleted file mode 100644 index 38de83d2..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress.tpl deleted file mode 100644 index a8909efb..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress.tpl +++ /dev/null @@ -1,51 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location / { - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2.stpl deleted file mode 100644 index 39cce361..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2.stpl +++ /dev/null @@ -1,66 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2.tpl deleted file mode 100644 index bccb8b3d..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2.tpl +++ /dev/null @@ -1,63 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/conf/web/%domain%.auth*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl deleted file mode 100644 index 264ca01a..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2_rewrite.stpl +++ /dev/null @@ -1,71 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl b/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl deleted file mode 100644 index 39e366b7..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/php-fpm/wordpress2_rewrite.tpl +++ /dev/null @@ -1,67 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - if (!-e $request_filename) - { - rewrite ^(.+)$ /index.php?q=$1 last; - } - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - } - - location ~ [^/]\.php(/|$) { - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - - fastcgi_pass %backend_lsnr%; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } - } - - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 500 502 503 504 /error/50x.html; - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - location /vstats/ { - alias %home%/%user%/web/%domain%/stats/; - include %home%/%user%/web/%domain%/stats/auth.conf*; - } - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include /etc/nginx/conf.d/webmail.inc*; - - include %home%/%user%/conf/web/nginx.%domain_idn%.conf*; -} diff --git a/install/ubuntu/18.10/templates/web/nginx/proxy_ip.tpl b/install/ubuntu/18.10/templates/web/nginx/proxy_ip.tpl deleted file mode 100755 index ae195617..00000000 --- a/install/ubuntu/18.10/templates/web/nginx/proxy_ip.tpl +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen %ip%:%proxy_port% default; - server_name _; - #access_log /var/log/nginx/%ip%.log main; - location / { - proxy_pass http://%ip%:%web_port%; - } -} - diff --git a/install/ubuntu/18.10/templates/web/php-fpm/default.tpl b/install/ubuntu/18.10/templates/web/php-fpm/default.tpl deleted file mode 100644 index 209e1e43..00000000 --- a/install/ubuntu/18.10/templates/web/php-fpm/default.tpl +++ /dev/null @@ -1,21 +0,0 @@ -[%backend%] -listen = 127.0.0.1:%backend_port% -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/18.10/templates/web/php-fpm/no-php.tpl b/install/ubuntu/18.10/templates/web/php-fpm/no-php.tpl deleted file mode 100644 index 047c33ed..00000000 --- a/install/ubuntu/18.10/templates/web/php-fpm/no-php.tpl +++ /dev/null @@ -1,20 +0,0 @@ -;[%backend%] -;listen = /dev/null - -;user = %user% -;group = %user% - -;listen.owner = %user% -;listen.group = www-data - -;pm = ondemand -;pm.max_children = 4 -;pm.max_requests = 4000 -;pm.process_idle_timeout = 10s -;pm.status_path = /status - -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /home/%user%/tmp -;env[TMPDIR] = /home/%user%/tmp -;env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/18.10/templates/web/php-fpm/socket.tpl b/install/ubuntu/18.10/templates/web/php-fpm/socket.tpl deleted file mode 100644 index a0151084..00000000 --- a/install/ubuntu/18.10/templates/web/php-fpm/socket.tpl +++ /dev/null @@ -1,24 +0,0 @@ -[%backend%] -listen = /var/run/php/%backend%.sock -listen.allowed_clients = 127.0.0.1 - -user = %user% -group = %user% - -listen.owner = %user% -listen.group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/%user%/tmp -php_admin_value[session.save_path] = /home/%user%/tmp - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/%user%/tmp -env[TMPDIR] = /home/%user%/tmp -env[TEMP] = /home/%user%/tmp diff --git a/install/ubuntu/18.10/templates/web/skel/document_errors/403.html b/install/ubuntu/18.10/templates/web/skel/document_errors/403.html deleted file mode 100755 index 9c3f6baa..00000000 --- a/install/ubuntu/18.10/templates/web/skel/document_errors/403.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 403 — Forbidden - - - - - - -

%domain%

- -

403

-

Forbidden

-
- Unfortunately, you do not have permission to view this -
- - - diff --git a/install/ubuntu/18.10/templates/web/skel/document_errors/404.html b/install/ubuntu/18.10/templates/web/skel/document_errors/404.html deleted file mode 100755 index 2cee7708..00000000 --- a/install/ubuntu/18.10/templates/web/skel/document_errors/404.html +++ /dev/null @@ -1,28 +0,0 @@ - - - 404 — Not Found - - - - - - -

%domain%

-

404

-

Page Not Found

-
- It seems that the page you were trying to reach does not exist anymore, or maybe it has just moved. - You can start again from the home or go back to previous page. -
- - diff --git a/install/ubuntu/18.10/templates/web/skel/document_errors/50x.html b/install/ubuntu/18.10/templates/web/skel/document_errors/50x.html deleted file mode 100755 index 85ba648b..00000000 --- a/install/ubuntu/18.10/templates/web/skel/document_errors/50x.html +++ /dev/null @@ -1,29 +0,0 @@ - - - 500 — Internal Sever Error - - - - - - -

%domain%

- -

500

-

Internal Server Error

-
- Sorry, something went wrong :( -
- - - diff --git a/install/ubuntu/18.10/templates/web/skel/public_html/index.html b/install/ubuntu/18.10/templates/web/skel/public_html/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/18.10/templates/web/skel/public_html/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/18.10/templates/web/skel/public_html/robots.txt b/install/ubuntu/18.10/templates/web/skel/public_html/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/18.10/templates/web/skel/public_html/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/18.10/templates/web/skel/public_shtml/index.html b/install/ubuntu/18.10/templates/web/skel/public_shtml/index.html deleted file mode 100755 index 4f5bb724..00000000 --- a/install/ubuntu/18.10/templates/web/skel/public_shtml/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - %domain% — Coming Soon - - - - - - -

%domain%

- - - - - diff --git a/install/ubuntu/18.10/templates/web/skel/public_shtml/robots.txt b/install/ubuntu/18.10/templates/web/skel/public_shtml/robots.txt deleted file mode 100755 index 00ee83dc..00000000 --- a/install/ubuntu/18.10/templates/web/skel/public_shtml/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# vestacp autogenerated robots.txt -User-agent: * -Crawl-delay: 10 diff --git a/install/ubuntu/18.10/templates/web/suspend/.htaccess b/install/ubuntu/18.10/templates/web/suspend/.htaccess deleted file mode 100755 index 5a6df83f..00000000 --- a/install/ubuntu/18.10/templates/web/suspend/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -ErrorDocument 403 /index.html -ErrorDocument 404 /index.html diff --git a/install/ubuntu/18.10/templates/web/suspend/index.html b/install/ubuntu/18.10/templates/web/suspend/index.html deleted file mode 100755 index f2d04e1f..00000000 --- a/install/ubuntu/18.10/templates/web/suspend/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - Website Suspended - - - - - -

SUSPENDED

-

This website has been suspended.

-
- Please contact the technical support department. -
- - diff --git a/install/ubuntu/18.10/templates/web/webalizer/webalizer.tpl b/install/ubuntu/18.10/templates/web/webalizer/webalizer.tpl deleted file mode 100755 index 068adcfb..00000000 --- a/install/ubuntu/18.10/templates/web/webalizer/webalizer.tpl +++ /dev/null @@ -1,110 +0,0 @@ -HostName %domain_idn% -LogFile /var/log/%web_system%/domains/%domain%.log -OutputDir %home%/%user%/web/%domain%/stats -HistoryName %home%/%user%/web/%domain%/stats/%domain%.hist -Incremental yes -IncrementalName %home%/%user%/web/%domain%/stats/%domain%.current -PageType htm* -PageType cgi -PageType php -PageType shtml -DNSCache /var/lib/webalizer/dns_cache.db -DNSChildren 10 -Quiet yes -FoldSeqErr yes -IndexAlias index.php -HideURL *.gif -HideURL *.GIF -HideURL *.jpg -HideURL *.JPG -HideURL *.png -HideURL *.PNG -HideURL *.ra -SearchEngine abcsearch. terms= -SearchEngine alexa. q= -SearchEngine alltheweb. q= -SearchEngine alltheweb. query= -SearchEngine alot. q= -SearchEngine altavista. q= -SearchEngine aolsearch. query= -SearchEngine aport.ru r= -SearchEngine ask. q= -SearchEngine atlas.cz q= -SearchEngine bbc. q= -SearchEngine bing. q= -SearchEngine blingo. q= -SearchEngine blogs.yandex.ru text= -SearchEngine btopenworld query= -SearchEngine buscador.ya.com q= -SearchEngine busca. q= -SearchEngine business. query= -SearchEngine centrum.cz q= -SearchEngine chiff. q= -SearchEngine clusty. query= -SearchEngine comcast. q= -SearchEngine crawler. q= -SearchEngine cuil. q= -SearchEngine dmoz. search= -SearchEngine dogpile.com q= -SearchEngine dpxml qkw= -SearchEngine eureka. searchword= -SearchEngine euroseek. string= -SearchEngine exalead. q= -SearchEngine excite search= -SearchEngine ezilon. q= -SearchEngine fastbrowsersearch. q= -SearchEngine feedster.com q= -SearchEngine fireball.de q= -SearchEngine fireball. keyword= -SearchEngine freeserve. q= -SearchEngine gigablast. q= -SearchEngine gogo.ru q= -SearchEngine go.mail.ru q= -SearchEngine google. q= -SearchEngine hakia. q= -SearchEngine hotbot. query= -SearchEngine infoseek. qt= -SearchEngine iwon searchfor= -SearchEngine ixquick.com query= -SearchEngine joeant. keywords= -SearchEngine jyxo.cz s= -SearchEngine looksmart. key= -SearchEngine lycos. query= -SearchEngine mamma. q= -SearchEngine metacrawler q= -SearchEngine msn. MT= -SearchEngine msxml qkw= -SearchEngine mysearch. searchfor= -SearchEngine mywebsearch. searchfor= -SearchEngine netscape. q= -SearchEngine nigma.ru q= -SearchEngine northernlight. qr= -SearchEngine ntlworld. q= -SearchEngine orange. q= -SearchEngine overture. Keywords= -SearchEngine punto.ru text= -SearchEngine rambler. keyword= -SearchEngine search.aol. q= -SearchEngine search.babylon. q= -SearchEngine search.centrum. phrase= -SearchEngine search.conduit. q= -SearchEngine search.earthlink q= -SearchEngine search.icq. q= -SearchEngine search.live.com q= -SearchEngine search.rambler.ru words= -SearchEngine search.winamp. q= -SearchEngine searchy. q= -SearchEngine seznam.cz w= -SearchEngine snap. query= -SearchEngine teoma. q= -SearchEngine teradex.com q= -SearchEngine ukplus key= -SearchEngine verizon. q= -SearchEngine virginmedia. q= -SearchEngine voila. rdata= -SearchEngine webcrawler searchText= -SearchEngine web.search.naver. query= -SearchEngine wisenut q= -SearchEngine yahoo. p= -SearchEngine yandex. text= -SearchEngine yodao. q= diff --git a/install/ubuntu/18.10/vsftpd/vsftpd.conf b/install/ubuntu/18.10/vsftpd/vsftpd.conf deleted file mode 100644 index 75e0104f..00000000 --- a/install/ubuntu/18.10/vsftpd/vsftpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -anonymous_enable=NO -local_enable=YES -write_enable=YES -local_umask=022 -anon_umask=022 -anon_upload_enable=NO -dirmessage_enable=YES -xferlog_enable=YES -connect_from_port_20=YES -xferlog_std_format=YES -dual_log_enable=YES -chroot_local_user=YES -listen=YES -pam_service_name=vsftpd -userlist_enable=NO -tcp_wrappers=YES -force_dot_files=YES -ascii_upload_enable=YES -ascii_download_enable=YES -allow_writeable_chroot=YES -seccomp_sandbox=NO -pasv_enable=YES -pasv_promiscuous=YES -pasv_min_port=12000 -pasv_max_port=12100 -max_per_ip=10 -max_clients=100 -use_localtime=YES -utf8_filesystem=YES -ssl_enable=YES -allow_anon_ssl=NO -require_ssl_reuse=NO -ssl_ciphers=HIGH -ssl_tlsv1=YES -ssl_sslv2=NO -ssl_sslv3=NO -force_local_data_ssl=NO -force_local_logins_ssl=NO -rsa_cert_file=/usr/local/vesta/ssl/certificate.crt -rsa_private_key_file=/usr/local/vesta/ssl/certificate.key diff --git a/install/vst-install-amazon.sh b/install/vst-install-amazon.sh deleted file mode 100644 index 00d9be8c..00000000 --- a/install/vst-install-amazon.sh +++ /dev/null @@ -1,1383 +0,0 @@ -#!/bin/bash - -echo "Sorry, Amazon linux distribution is not supported." -echo "myVesta supports only Debian." -exit; - -# Vesta Amazon installer v.05 - -#----------------------------------------------------------# -# Variables&Functions # -#----------------------------------------------------------# -export PATH=$PATH:/sbin -RHOST='r.vestacp.com' -CHOST='c.vestacp.com' -REPO='cmmnt' -VERSION='rhel' -VESTA='/usr/local/vesta' -memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) -arch=$(uname -i) -os='rhel' -release='6' -codename="${os}_$release" -vestacp="$VESTA/install/$VERSION/$release" - -# Defining software pack for all distros -software="nginx httpd mod_ssl mod_ruid2 mod_fcgid mod_extract_forwarded - php php-common php-cli php-bcmath php-gd php-imap php-mbstring php-mcrypt - php-mysql php-pdo php-soap php-tidy php-xml php-xmlrpc php-fpm php-pgsql - awstats webalizer vsftpd proftpd bind bind-utils bind-libs exim dovecot - clamd spamassassin mysql mysql-server phpMyAdmin postgresql - postgresql-server postgresql-contrib phpPgAdmin e2fsprogs openssh-clients - ImageMagick curl mc screen ftp zip unzip flex sqlite pcre sudo bc jwhois - mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype fail2ban - which vesta vesta-nginx vesta-php vim-common expect vesta-ioncube - vesta-softaculous" - -# Defining help function -help() { - echo "Usage: $0 [OPTIONS] - -a, --apache Install Apache [yes|no] default: yes - -n, --nginx Install Nginx [yes|no] default: yes - -w, --phpfpm Install PHP-FPM [yes|no] default: no - -v, --vsftpd Install Vsftpd [yes|no] default: yes - -j, --proftpd Install ProFTPD [yes|no] default: no - -k, --named Install Bind [yes|no] default: yes - -m, --mysql Install MySQL [yes|no] default: yes - -g, --postgresql Install PostgreSQL [yes|no] default: no - -d, --mongodb Install MongoDB [yes|no] unsupported - -x, --exim Install Exim [yes|no] default: yes - -z, --dovecot Install Dovecot [yes|no] default: yes - -c, --clamav Install ClamAV [yes|no] default: yes - -t, --spamassassin Install SpamAssassin [yes|no] default: yes - -i, --iptables Install Iptables [yes|no] default: yes - -b, --fail2ban Install Fail2ban [yes|no] default: yes - -r, --remi Install Remi repo [yes|no] default: yes - -o, --softaculous Install Softaculous [yes|no] default: yes - -q, --quota Filesystem Quota [yes|no] default: no - -l, --lang Default language default: en - -y, --interactive Interactive install [yes|no] default: yes - -s, --hostname Set hostname - -e, --email Set admin email - -p, --password Set admin password - -f, --force Force installation - -h, --help Print this help - - Example: bash $0 -e demo@vestacp.com -p p4ssw0rd --apache no --phpfpm yes" - exit 1 -} - -# Defining password-gen function -gen_pass() { - MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' - LENGTH=10 - while [ ${n:=1} -le $LENGTH ]; do - PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}" - let n+=1 - done - echo "$PASS" -} - -# Defining 32 char blowfish_secret -blowfish_secret=`openssl rand -base64 32`; - -# Defining return code check function -check_result() { - if [ $1 -ne 0 ]; then - echo "Error: $2" - exit $1 - fi -} - -# Defining function to set default value -set_default_value() { - eval variable=\$$1 - if [ -z "$variable" ]; then - eval $1=$2 - fi - if [ "$variable" != 'yes' ] && [ "$variable" != 'no' ]; then - eval $1=$2 - fi -} - -# Defining function to set default language value -set_default_lang() { - if [ -z "$lang" ]; then - eval lang=$1 - fi - lang_list=" - ar cz el fa hu ja no pt se ua - bs da en fi id ka pl ro tr vi - cn de es fr it nl pt-BR ru tw - bg ko sr th ur" - if !(echo $lang_list |grep -w $lang 1>&2>/dev/null); then - eval lang=$1 - fi -} - - -#----------------------------------------------------------# -# Verifications # -#----------------------------------------------------------# - -# Translating argument to --gnu-long-options -for arg; do - delim="" - case "$arg" in - --apache) args="${args}-a " ;; - --nginx) args="${args}-n " ;; - --phpfpm) args="${args}-w " ;; - --vsftpd) args="${args}-v " ;; - --proftpd) args="${args}-j " ;; - --named) args="${args}-k " ;; - --mysql) args="${args}-m " ;; - --postgresql) args="${args}-g " ;; - --mongodb) args="${args}-d " ;; - --exim) args="${args}-x " ;; - --dovecot) args="${args}-z " ;; - --clamav) args="${args}-c " ;; - --spamassassin) args="${args}-t " ;; - --iptables) args="${args}-i " ;; - --fail2ban) args="${args}-b " ;; - --remi) args="${args}-r " ;; - --softaculous) args="${args}-o " ;; - --quota) args="${args}-q " ;; - --lang) args="${args}-l " ;; - --interactive) args="${args}-y " ;; - --hostname) args="${args}-s " ;; - --email) args="${args}-e " ;; - --password) args="${args}-p " ;; - --force) args="${args}-f " ;; - --help) args="${args}-h " ;; - *) [[ "${arg:0:1}" == "-" ]] || delim="\"" - args="${args}${delim}${arg}${delim} ";; - esac -done -eval set -- "$args" - -# Parsing arguments -while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do - case $Option in - a) apache=$OPTARG ;; # Apache - n) nginx=$OPTARG ;; # Nginx - w) phpfpm=$OPTARG ;; # PHP-FPM - v) vsftpd=$OPTARG ;; # Vsftpd - j) proftpd=$OPTARG ;; # Proftpd - k) named=$OPTARG ;; # Named - m) mysql=$OPTARG ;; # MySQL - g) postgresql=$OPTARG ;; # PostgreSQL - d) mongodb=$OPTARG ;; # MongoDB (unsupported) - x) exim=$OPTARG ;; # Exim - z) dovecot=$OPTARG ;; # Dovecot - c) clamd=$OPTARG ;; # ClamAV - t) spamd=$OPTARG ;; # SpamAssassin - i) iptables=$OPTARG ;; # Iptables - b) fail2ban=$OPTARG ;; # Fail2ban - r) remi=$OPTARG ;; # Remi repo - o) softaculous=$OPTARG ;; # Softaculous plugin - q) quota=$OPTARG ;; # FS Quota - l) lang=$OPTARG ;; # Language - y) interactive=$OPTARG ;; # Interactive install - s) servername=$OPTARG ;; # Hostname - e) email=$OPTARG ;; # Admin email - p) vpass=$OPTARG ;; # Admin password - f) force='yes' ;; # Force install - h) help ;; # Help - *) help ;; # Print help (default) - esac -done - -# Defining default software stack -set_default_value 'nginx' 'yes' -set_default_value 'apache' 'yes' -set_default_value 'phpfpm' 'no' -set_default_value 'vsftpd' 'yes' -set_default_value 'proftpd' 'no' -set_default_value 'named' 'yes' -set_default_value 'mysql' 'yes' -set_default_value 'postgresql' 'no' -set_default_value 'mongodb' 'no' -set_default_value 'exim' 'yes' -set_default_value 'dovecot' 'yes' -if [ $memory -lt 1500000 ]; then - set_default_value 'clamd' 'no' - set_default_value 'spamd' 'no' -else - set_default_value 'clamd' 'yes' - set_default_value 'spamd' 'yes' -fi -set_default_value 'iptables' 'yes' -set_default_value 'fail2ban' 'yes' -set_default_value 'remi' 'yes' -set_default_value 'softaculous' 'yes' -set_default_value 'quota' 'no' -set_default_value 'interactive' 'yes' -set_default_lang 'en' - -# Checking software conflicts -if [ "$phpfpm" = 'yes' ]; then - apache='no' - nginx='yes' -fi -if [ "$proftpd" = 'yes' ]; then - vsftpd='no' -fi -if [ "$exim" = 'no' ]; then - clamd='no' - spamd='no' - dovecot='no' -fi -if [ "$iptables" = 'no' ]; then - fail2ban='no' -fi - -# Checking root permissions -if [ "x$(id -u)" != 'x0' ]; then - check_result 1 "Script can be run executed only by root" -fi - -# Checking admin user account -if [ ! -z "$(grep ^admin: /etc/passwd /etc/group)" ] && [ -z "$force" ]; then - echo 'Please remove admin user account before proceeding.' - echo 'If you want to do it automatically run installer with -f option:' - echo -e "Example: bash $0 --force\n" - check_result 1 "User admin exists" -fi - -# Checking wget -if [ ! -e '/usr/bin/wget' ]; then - yum -y install wget - check_result $? "Can't install wget" -fi - -# Checking repository availability -wget -q "c.vestacp.com/GPG.txt" -O /dev/null -check_result $? "No access to Vesta repository" - -# Checking installed packages -tmpfile=$(mktemp -p /tmp) -rpm -qa > $tmpfile -for pkg in exim mysql-server httpd nginx vesta; do - if [ ! -z "$(grep $pkg $tmpfile)" ]; then - conflicts="$pkg $conflicts" - fi -done -rm -f $tmpfile -if [ ! -z "$conflicts" ] && [ -z "$force" ]; then - echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' - echo - echo 'Following packages are already installed:' - echo "$conflicts" - echo - echo 'It is highly recommended to remove them before proceeding.' - echo 'If you want to force installation run this script with -f option:' - echo "Example: bash $0 --force" - echo - echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' - echo - check_result 1 "Control Panel should be installed on clean server." -fi - - -#----------------------------------------------------------# -# Brief Info # -#----------------------------------------------------------# - -# Printing nice ASCII logo -clear -echo -echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|' -echo ' _| _| _| _| _| _| _|' -echo ' _| _| _|_|_| _|_| _| _|_|_|_|' -echo ' _| _| _| _| _| _| _|' -echo ' _| _|_|_|_| _|_|_| _| _| _|' -echo -echo ' Vesta Control Panel' -echo -e "\n\n" - -echo 'The following software will be installed on your system:' - -# Web stack -if [ "$nginx" = 'yes' ]; then - echo ' - Nginx Web Server' -fi -if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then - echo ' - Apache Web Server' -fi -if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then - echo ' - Apache Web Server (as backend)' -fi -if [ "$phpfpm" = 'yes' ]; then - echo ' - PHP-FPM Application Server' -fi - -# DNS stack -if [ "$named" = 'yes' ]; then - echo ' - Bind DNS Server' -fi - -# Mail stack -if [ "$exim" = 'yes' ]; then - echo -n ' - Exim Mail Server' - if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then - echo -n ' + ' - if [ "$clamd" = 'yes' ]; then - echo -n 'ClamAV ' - fi - if [ "$spamd" = 'yes' ]; then - echo -n 'SpamAssassin' - fi - fi - echo - if [ "$dovecot" = 'yes' ]; then - echo ' - Dovecot POP3/IMAP Server' - fi -fi - -# Database stack -if [ "$mysql" = 'yes' ]; then - if [ $release -ge 7 ]; then - echo ' - MariaDB Database Server' - else - echo ' - MySQL Database Server' - fi -fi -if [ "$postgresql" = 'yes' ]; then - echo ' - PostgreSQL Database Server' -fi -if [ "$mongodb" = 'yes' ]; then - echo ' - MongoDB Database Server' -fi - -# FTP stack -if [ "$vsftpd" = 'yes' ]; then - echo ' - Vsftpd FTP Server' -fi -if [ "$proftpd" = 'yes' ]; then - echo ' - ProFTPD FTP Server' -fi - -# Softaculous -if [ "$softaculous" = 'yes' ]; then - echo ' - Softaculous Plugin' -fi - -# Firewall stack -if [ "$iptables" = 'yes' ]; then - echo -n ' - Iptables Firewall' -fi -if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then - echo -n ' + Fail2Ban' -fi -echo -e "\n\n" - -# Asking for confirmation to proceed -if [ "$interactive" = 'yes' ]; then - read -p 'Would you like to continue [y/n]: ' answer - if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then - echo 'Goodbye' - exit 1 - fi - - # Asking for contact email - if [ -z "$email" ]; then - read -p 'Please enter admin email address: ' email - fi - - # Asking to set FQDN hostname - if [ -z "$servername" ]; then - read -p "Please enter FQDN hostname [$(hostname)]: " servername - fi -fi - -# Generating admin password if it wasn't set -if [ -z "$vpass" ]; then - vpass=$(gen_pass) -fi - -# Set hostname if it wasn't set -if [ -z "$servername" ]; then - servername=$(hostname -f) -fi - -# Set FQDN if it wasn't set -mask1='(([[:alnum:]](-?[[:alnum:]])*)\.)' -mask2='*[[:alnum:]](-?[[:alnum:]])+\.[[:alnum:]]{2,}' -if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then - if [ ! -z "$servername" ]; then - servername="$servername.example.com" - else - servername="example.com" - fi - echo "127.0.0.1 $servername" >> /etc/hosts -fi - -# Set email if it wasn't set -if [ -z "$email" ]; then - email="admin@$servername" -fi - -# Defining backup directory -vst_backups="/root/vst_install_backups/$(date +%s)" -echo "Installation backup directory: $vst_backups" - -# Printing start message and sleeping for 5 seconds -echo -e "\n\n\n\nInstallation will take about 15 minutes ...\n" -sleep 5 - - -#----------------------------------------------------------# -# Checking swap # -#----------------------------------------------------------# - -# Checking swap on small instances -if [ -z "$(swapon -s)" ] && [ $memory -lt 1000000 ]; then - fallocate -l 1G /swapfile - chmod 600 /swapfile - mkswap /swapfile - swapon /swapfile - echo "/swapfile none swap sw 0 0" >> /etc/fstab -fi - - -#----------------------------------------------------------# -# Install repositories # -#----------------------------------------------------------# - -# Updating system -yum -y update -check_result $? 'yum update failed' - -# Enabling EPEL repository -sed "1,10s/enabled=0/enabled=1/" -i /etc/yum.repos.d/epel.repo -yum -y update -check_result $? "Can't install EPEL repository" - -# Installing Nginx repository -nrepo="/etc/yum.repos.d/nginx.repo" -echo "[nginx]" > $nrepo -echo "name=nginx repo" >> $nrepo -echo "baseurl=http://nginx.org/packages/centos/$release/\$basearch/" >> $nrepo -echo "gpgcheck=0" >> $nrepo -echo "enabled=1" >> $nrepo - -# Installing Vesta repository -vrepo='/etc/yum.repos.d/vesta.repo' -echo "[vesta]" > $vrepo -echo "name=Vesta - $REPO" >> $vrepo -echo "baseurl=http://$RHOST/$REPO/$release/\$basearch/" >> $vrepo -echo "enabled=1" >> $vrepo -echo "gpgcheck=1" >> $vrepo -echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA" >> $vrepo -wget c.vestacp.com/GPG.txt -O /etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA - - -#----------------------------------------------------------# -# Backup # -#----------------------------------------------------------# - -# Creating backup directory tree -mkdir -p $vst_backups -cd $vst_backups -mkdir nginx httpd php php-fpm vsftpd proftpd named exim dovecot clamd \ - spamassassin mysql postgresql mongodb vesta - -# Backup Nginx configuration -service nginx stop > /dev/null 2>&1 -cp -r /etc/nginx/* $vst_backups/nginx > /dev/null 2>&1 - -# Backup Apache configuration -service httpd stop > /dev/null 2>&1 -cp -r /etc/httpd/* $vst_backups/httpd > /dev/null 2>&1 - -# Backup PHP-FPM configuration -service php-fpm stop >/dev/null 2>&1 -cp /etc/php.ini $vst_backups/php > /dev/null 2>&1 -cp -r /etc/php.d $vst_backups/php > /dev/null 2>&1 -cp /etc/php-fpm.conf $vst_backups/php-fpm > /dev/null 2>&1 -mv -f /etc/php-fpm.d/* $vst_backups/php-fpm/ > /dev/null 2>&1 - -# Backup Bind configuration -yum remove bind-chroot > /dev/null 2>&1 -service named stop > /dev/null 2>&1 -cp /etc/named.conf $vst_backups/named >/dev/null 2>&1 - -# Backup Vsftpd configuration -service vsftpd stop > /dev/null 2>&1 -cp /etc/vsftpd/vsftpd.conf $vst_backups/vsftpd >/dev/null 2>&1 - -# Backup ProFTPD configuration -service proftpd stop > /dev/null 2>&1 -cp /etc/proftpd.conf $vst_backups/proftpd >/dev/null 2>&1 - -# Backup Exim configuration -service exim stop > /dev/null 2>&1 -cp -r /etc/exim/* $vst_backups/exim >/dev/null 2>&1 - -# Backup ClamAV configuration -service clamd stop > /dev/null 2>&1 -cp /etc/clamd.conf $vst_backups/clamd >/dev/null 2>&1 -cp -r /etc/clamd.d $vst_backups/clamd >/dev/null 2>&1 - -# Backup SpamAssassin configuration -service spamassassin stop > /dev/null 2>&1 -cp -r /etc/mail/spamassassin/* $vst_backups/spamassassin >/dev/null 2>&1 - -# Backup Dovecot configuration -service dovecot stop > /dev/null 2>&1 -cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 -cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 - -# Backup MySQL/MariaDB configuration and data -service mysql stop > /dev/null 2>&1 -service mysqld stop > /dev/null 2>&1 -service mariadb stop > /dev/null 2>&1 -mv /var/lib/mysql $vst_backups/mysql/mysql_datadir >/dev/null 2>&1 -cp /etc/my.cnf $vst_backups/mysql > /dev/null 2>&1 -cp /etc/my.cnf.d $vst_backups/mysql > /dev/null 2>&1 -mv /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1 - -# Backup MySQL/MariaDB configuration and data -service postgresql stop > /dev/null 2>&1 -mv /var/lib/pgsql/data $vst_backups/postgresql/ >/dev/null 2>&1 - -# Backup Vesta -service vesta stop > /dev/null 2>&1 -mv $VESTA/data/* $vst_backups/vesta > /dev/null 2>&1 -mv $VESTA/conf/* $vst_backups/vesta > /dev/null 2>&1 - - -#----------------------------------------------------------# -# Package Excludes # -#----------------------------------------------------------# - -# Excluding packages -if [ "$nginx" = 'no' ]; then - software=$(echo "$software" | sed -e "s/^nginx//") -fi -if [ "$apache" = 'no' ]; then - software=$(echo "$software" | sed -e "s/httpd//") - software=$(echo "$software" | sed -e "s/mod_ssl//") - software=$(echo "$software" | sed -e "s/mod_fcgid//") - software=$(echo "$software" | sed -e "s/mod_ruid2//") -fi -if [ "$phpfpm" = 'no' ]; then - software=$(echo "$software" | sed -e "s/php-fpm//") -fi -if [ "$vsftpd" = 'no' ]; then - software=$(echo "$software" | sed -e "s/vsftpd//") -fi -if [ "$proftpd" = 'no' ]; then - software=$(echo "$software" | sed -e "s/proftpd//") -fi -if [ "$named" = 'no' ]; then - software=$(echo "$software" | sed -e "s/bind //") -fi -if [ "$exim" = 'no' ]; then - software=$(echo "$software" | sed -e "s/exim//") - software=$(echo "$software" | sed -e "s/dovecot//") - software=$(echo "$software" | sed -e "s/clamd//") - software=$(echo "$software" | sed -e "s/clamav-server//") - software=$(echo "$software" | sed -e "s/clamav-update//") - software=$(echo "$software" | sed -e "s/spamassassin//") - software=$(echo "$software" | sed -e "s/dovecot//") - software=$(echo "$software" | sed -e "s/roundcubemail//") -fi -if [ "$clamd" = 'no' ]; then - software=$(echo "$software" | sed -e "s/clamd//") - software=$(echo "$software" | sed -e "s/clamav-server//") - software=$(echo "$software" | sed -e "s/clamav-update//") -fi -if [ "$spamd" = 'no' ]; then - software=$(echo "$software" | sed -e 's/spamassassin//') -fi -if [ "$dovecot" = 'no' ]; then - software=$(echo "$software" | sed -e "s/dovecot//") -fi -if [ "$mysql" = 'no' ]; then - software=$(echo "$software" | sed -e 's/mysql //') - software=$(echo "$software" | sed -e 's/mysql-server//') - software=$(echo "$software" | sed -e 's/mariadb //') - software=$(echo "$software" | sed -e 's/mariadb-server//') - software=$(echo "$software" | sed -e 's/php-mysql//') - software=$(echo "$software" | sed -e 's/phpMyAdmin//') - software=$(echo "$software" | sed -e 's/roundcubemail//') -fi -if [ "$postgresql" = 'no' ]; then - software=$(echo "$software" | sed -e 's/postgresql //') - software=$(echo "$software" | sed -e 's/postgresql-server//') - software=$(echo "$software" | sed -e 's/postgresql-contrib//') - software=$(echo "$software" | sed -e 's/php-pgsql//') - software=$(echo "$software" | sed -e 's/phpPgAdmin//') -fi -if [ "$softaculous" = 'no' ]; then - software=$(echo "$software" | sed -e 's/vesta-softaculous//') -fi -if [ "$iptables" = 'no' ] || [ "$fail2ban" = 'no' ]; then - software=$(echo "$software" | sed -e 's/fail2ban//') -fi - - -#----------------------------------------------------------# -# Install packages # -#----------------------------------------------------------# - -# Installing rpm packages -yum -y install $software -check_result $? "yum install failed" - -# Installing roundcube -if [ "$exim" != 'no' ]; then - yum -y install --exclude=php-pear-Auth-SASL-0:1.0.4-1.2.amzn1.noarch \ - --exclude=php5\* --exclude=httpd24\* roundcubemail - check_result $? "yum install failed" -fi - - -#----------------------------------------------------------# -# Configure system # -#----------------------------------------------------------# - -# Restarting rsyslog -service rsyslog restart > /dev/null 2>&1 - -# Checking ipv6 on loopback interface -check_lo_ipv6=$(/sbin/ip addr | grep 'inet6') -check_rc_ipv6=$(grep 'scope global dev lo' /etc/rc.local) -if [ ! -z "$check_lo_ipv6)" ] && [ -z "$check_rc_ipv6" ]; then - ip addr add ::2/128 scope global dev lo - echo "# Vesta: Workraround for openssl validation func" >> /etc/rc.local - echo "ip addr add ::2/128 scope global dev lo" >> /etc/rc.local - chmod a+x /etc/rc.local -fi - -# Disabling SELinux -if [ -e '/etc/sysconfig/selinux' ]; then - sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/sysconfig/selinux - sed -i 's/SELINUX=enforcing/SELINUX=disabled/g' /etc/selinux/config - setenforce 0 2>/dev/null -fi - -# Disabling iptables -service iptables stop - -# Configuring NTP synchronization -echo '#!/bin/sh' > /etc/cron.daily/ntpdate -echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate -chmod 775 /etc/cron.daily/ntpdate -ntpdate -s pool.ntp.org - -# Disabling webalizer routine -rm -f /etc/cron.daily/00webalizer - -# Adding backup user -adduser backup 2>/dev/null -ln -sf /home/backup /backup -chmod a+x /backup - -# Set directory color -echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile - -# Changing default systemd interval -if [ "$release" -eq '7' ]; then - # Hi Lennart - echo "DefaultStartLimitInterval=1s" >> /etc/systemd/system.conf - echo "DefaultStartLimitBurst=60" >> /etc/systemd/system.conf - systemctl daemon-reexec -fi - - -#----------------------------------------------------------# -# Configure VESTA # -#----------------------------------------------------------# - -# Installing sudo configuration -mkdir -p /etc/sudoers.d -cp -f $vestacp/sudo/admin /etc/sudoers.d/ -chmod 440 /etc/sudoers.d/admin - -# Configuring system env -echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh -chmod 755 /etc/profile.d/vesta.sh -source /etc/profile.d/vesta.sh -echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile -echo 'export PATH' >> /root/.bash_profile -source /root/.bash_profile - -# Configuring logrotate for vesta logs -cp -f $vestacp/logrotate/vesta /etc/logrotate.d/ - -# Building directory tree and creating some blank files for vesta -mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ - $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall \ - $VESTA/data/sessions -touch $VESTA/data/queue/backup.pipe $VESTA/data/queue/disk.pipe \ - $VESTA/data/queue/webstats.pipe $VESTA/data/queue/restart.pipe \ - $VESTA/data/queue/traffic.pipe $VESTA/log/system.log \ - $VESTA/log/nginx-error.log $VESTA/log/auth.log -chmod 750 $VESTA/conf $VESTA/data/users $VESTA/data/ips $VESTA/log -chmod -R 750 $VESTA/data/queue -chmod 660 $VESTA/log/* -rm -f /var/log/vesta -ln -s $VESTA/log /var/log/vesta -chmod 770 $VESTA/data/sessions - -# Generating vesta configuration -rm -f $VESTA/conf/vesta.conf 2>/dev/null -touch $VESTA/conf/vesta.conf -chmod 660 $VESTA/conf/vesta.conf - -# Web stack -if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then - echo "WEB_SYSTEM='httpd'" >> $VESTA/conf/vesta.conf - echo "WEB_RGROUPS='apache'" >> $VESTA/conf/vesta.conf - echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf - echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf - echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf - echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf -fi -if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then - echo "WEB_SYSTEM='httpd'" >> $VESTA/conf/vesta.conf - echo "WEB_RGROUPS='apache'" >> $VESTA/conf/vesta.conf - echo "WEB_PORT='8080'" >> $VESTA/conf/vesta.conf - echo "WEB_SSL_PORT='8443'" >> $VESTA/conf/vesta.conf - echo "WEB_SSL='mod_ssl'" >> $VESTA/conf/vesta.conf - echo "PROXY_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf - echo "PROXY_PORT='80'" >> $VESTA/conf/vesta.conf - echo "PROXY_SSL_PORT='443'" >> $VESTA/conf/vesta.conf - echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf -fi -if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then - echo "WEB_SYSTEM='nginx'" >> $VESTA/conf/vesta.conf - echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf - echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf - echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf - if [ "$phpfpm" = 'yes' ]; then - echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf - fi - echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf -fi - -# FTP stack -if [ "$vsftpd" = 'yes' ]; then - echo "FTP_SYSTEM='vsftpd'" >> $VESTA/conf/vesta.conf -fi -if [ "$proftpd" = 'yes' ]; then - echo "FTP_SYSTEM='proftpd'" >> $VESTA/conf/vesta.conf -fi - -# DNS stack -if [ "$named" = 'yes' ]; then - echo "DNS_SYSTEM='named'" >> $VESTA/conf/vesta.conf -fi - -# Mail stack -if [ "$exim" = 'yes' ]; then - echo "MAIL_SYSTEM='exim'" >> $VESTA/conf/vesta.conf - if [ "$clamd" = 'yes' ]; then - echo "ANTIVIRUS_SYSTEM='clamav'" >> $VESTA/conf/vesta.conf - fi - if [ "$spamd" = 'yes' ]; then - echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf - fi - if [ "$dovecot" = 'yes' ]; then - echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf - fi -fi - -# Cron daemon -echo "CRON_SYSTEM='crond'" >> $VESTA/conf/vesta.conf - -# Firewall stack -if [ "$iptables" = 'yes' ]; then - echo "FIREWALL_SYSTEM='iptables'" >> $VESTA/conf/vesta.conf -fi -if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then - echo "FIREWALL_EXTENSION='fail2ban'" >> $VESTA/conf/vesta.conf -fi - -# Disk quota -if [ "$quota" = 'yes' ]; then - echo "DISK_QUOTA='yes'" >> $VESTA/conf/vesta.conf -fi - -# Backups -echo "BACKUP_SYSTEM='local'" >> $VESTA/conf/vesta.conf - -# Language -echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf - -# Version -echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf - -# Installing hosting packages -cp -rf $vestacp/packages $VESTA/data/ - -# Installing templates -cp -rf $vestacp/templates $VESTA/data/ - -# Copying index.html to default documentroot -cp $VESTA/data/templates/web/skel/public_html/index.html /var/www/html/ -sed -i 's/%domain%/It worked!/g' /var/www/html/index.html - -# Installing firewall rules -chkconfig firewalld off >/dev/null 2>&1 -cp -rf $vestacp/firewall $VESTA/data/ - -# Configuring server hostname -$VESTA/bin/v-change-sys-hostname $servername 2>/dev/null - -# Generating SSL certificate -$VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ - 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem - -# Parsing certificate file -crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) -key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) -key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) - -# Adding SSL certificate -cd $VESTA/ssl -sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt -sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key -chown root:mail $VESTA/ssl/* -chmod 660 $VESTA/ssl/* -rm /tmp/vst.pem - - -#----------------------------------------------------------# -# Configure Nginx # -#----------------------------------------------------------# - -if [ "$nginx" = 'yes' ]; then - rm -f /etc/nginx/conf.d/*.conf - cp -f $vestacp/nginx/nginx.conf /etc/nginx/ - cp -f $vestacp/nginx/status.conf /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phpmyadmin.inc /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/ - cp -f $vestacp/nginx/webmail.inc /etc/nginx/conf.d/ - cp -f $vestacp/logrotate/nginx /etc/logrotate.d/ - echo > /etc/nginx/conf.d/vesta.conf - mkdir -p /var/log/nginx/domains - if [ "$release" -ge 7 ]; then - mkdir -p /etc/systemd/system/nginx.service.d - cd /etc/systemd/system/nginx.service.d - echo "[Service]" > limits.conf - echo "LimitNOFILE=500000" >> limits.conf - fi - chkconfig nginx on - service nginx start - check_result $? "nginx start failed" - - # Workaround for OpenVZ/Virtuozzo - if [ "$release" -ge '7' ] && [ -e "/proc/vz/veinfo" ]; then - echo "#Vesta: workraround for networkmanager" >> /etc/rc.local - echo "sleep 3 && service nginx restart" >> /etc/rc.local - fi -fi - - -#----------------------------------------------------------# -# Configure Apache # -#----------------------------------------------------------# - -if [ "$apache" = 'yes' ]; then - cp -f $vestacp/httpd/httpd.conf /etc/httpd/conf/ - cp -f $vestacp/httpd/status.conf /etc/httpd/conf.d/ - cp -f $vestacp/httpd/ssl.conf /etc/httpd/conf.d/ - cp -f $vestacp/httpd/ruid2.conf /etc/httpd/conf.d/ - cp -f $vestacp/logrotate/httpd /etc/logrotate.d/ - if [ $release -lt 7 ]; then - cd /etc/httpd/conf.d - echo "MEFaccept 127.0.0.1" >> mod_extract_forwarded.conf - echo > proxy_ajp.conf - fi - if [ -e "/etc/httpd/conf.modules.d/00-dav.conf" ]; then - cd /etc/httpd/conf.modules.d - sed -i "s/^/#/" 00-dav.conf 00-lua.conf 00-proxy.conf - fi - echo > /etc/httpd/conf.d/vesta.conf - cd /var/log/httpd - touch access_log error_log suexec.log - chmod 640 access_log error_log suexec.log - chmod -f 777 /var/lib/php/session - chmod a+x /var/log/httpd - mkdir -p /var/log/httpd/domains - chmod 751 /var/log/httpd/domains - if [ "$release" -ge 7 ]; then - mkdir -p /etc/systemd/system/httpd.service.d - cd /etc/systemd/system/httpd.service.d - echo "[Service]" > limits.conf - echo "LimitNOFILE=500000" >> limits.conf - fi - chkconfig httpd on - service httpd start - check_result $? "httpd start failed" - - # Workaround for OpenVZ/Virtuozzo - if [ "$release" -ge '7' ] && [ -e "/proc/vz/veinfo" ]; then - echo "#Vesta: workraround for networkmanager" >> /etc/rc.local - echo "sleep 2 && service httpd restart" >> /etc/rc.local - fi -fi - - -#----------------------------------------------------------# -# Configure PHP-FPM # -#----------------------------------------------------------# - -if [ "$phpfpm" = 'yes' ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php-fpm.d/ - chkconfig php-fpm on - service php-fpm start - check_result $? "php-fpm start failed" -fi - - -#----------------------------------------------------------# -# Configure PHP # -#----------------------------------------------------------# - -ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}') -if [ -e '/etc/sysconfig/clock' ]; then - source /etc/sysconfig/clock -fi -if [ -z "$ZONE" ]; then - ZONE='UTC' -fi -for pconf in $(find /etc/php* -name php.ini); do - sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf - sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf -done - - -#----------------------------------------------------------# -# Configure Vsftpd # -#----------------------------------------------------------# - -if [ "$vsftpd" = 'yes' ]; then - cp -f $vestacp/vsftpd/vsftpd.conf /etc/vsftpd/ - chkconfig vsftpd on - service vsftpd start - check_result $? "vsftpd start failed" - - # To be deleted after release 0.9.8-18 - echo "/sbin/nologin" >> /etc/shells -fi - - -#----------------------------------------------------------# -# Configure ProFTPD # -#----------------------------------------------------------# - -if [ "$proftpd" = 'yes' ]; then - cp -f $vestacp/proftpd/proftpd.conf /etc/ - chkconfig proftpd on - service proftpd start - check_result $? "proftpd start failed" -fi - - -#----------------------------------------------------------# -# Configure MySQL/MariaDB # -#----------------------------------------------------------# - -if [ "$mysql" = 'yes' ]; then - - mycnf="my-small.cnf" - if [ $memory -gt 1200000 ]; then - mycnf="my-medium.cnf" - fi - if [ $memory -gt 3900000 ]; then - mycnf="my-large.cnf" - fi - - mkdir -p /var/lib/mysql - chown mysql:mysql /var/lib/mysql - mkdir -p /etc/my.cnf.d - - if [ $release -lt 7 ]; then - service='mysqld' - else - service='mariadb' - fi - - cp -f $vestacp/$service/$mycnf /etc/my.cnf - chkconfig $service on - service $service start - if [ "$?" -ne 0 ]; then - if [ -e "/proc/user_beancounters" ]; then - # Fix for aio on OpenVZ - sed -i "s/#innodb_use_native/innodb_use_native/g" /etc/my.cnf - fi - service $service start - check_result $? "$service start failed" - fi - - # Securing MySQL installation - mpass=$(gen_pass) - mysqladmin -u root password $mpass - echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf - chmod 600 /root/.my.cnf - mysql -e "DELETE FROM mysql.user WHERE User=''" - mysql -e "DROP DATABASE test" >/dev/null 2>&1 - mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" - mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" - mysql -e "FLUSH PRIVILEGES" - - # Configuring phpMyAdmin - if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pma/phpMyAdmin.conf /etc/httpd/conf.d/ - fi - cp -f $vestacp/pma/config.inc.conf /etc/phpMyAdmin/config.inc.php - sed -i "s#%blowfish_secret#$blowfish_secret#g" /etc/phpMyAdmin/config.inc.php -fi - - -#----------------------------------------------------------# -# Configure PostgreSQL # -#----------------------------------------------------------# - -if [ "$postgresql" = 'yes' ]; then - ppass=$(gen_pass) - if [ $release -eq 5 ]; then - service postgresql start - sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'" - service postgresql stop - cp -f $vestacp/postgresql/pg_hba.conf /var/lib/pgsql/data/ - service postgresql start - else - service postgresql initdb - cp -f $vestacp/postgresql/pg_hba.conf /var/lib/pgsql/data/ - service postgresql start - sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'" - fi - # Configuring phpPgAdmin - if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pga/phpPgAdmin.conf /etc/httpd/conf.d/ - fi - cp -f $vestacp/pga/config.inc.php /etc/phpPgAdmin/ -fi - - -#----------------------------------------------------------# -# Configure Bind # -#----------------------------------------------------------# - -if [ "$named" = 'yes' ]; then - cp -f $vestacp/named/named.conf /etc/ - chown root:named /etc/named.conf - chmod 640 /etc/named.conf - chkconfig named on - service named start - check_result $? "named start failed" -fi - - -#----------------------------------------------------------# -# Configure Exim # -#----------------------------------------------------------# - -if [ "$exim" = 'yes' ]; then - gpasswd -a exim mail - cp -f $vestacp/exim/exim.conf /etc/exim/ - cp -f $vestacp/exim/dnsbl.conf /etc/exim/ - cp -f $vestacp/exim/spam-blocks.conf /etc/exim/ - touch /etc/exim/white-blocks.conf - - if [ "$spamd" = 'yes' ]; then - sed -i "s/#SPAM/SPAM/g" /etc/exim/exim.conf - fi - if [ "$clamd" = 'yes' ]; then - sed -i "s/#CLAMD/CLAMD/g" /etc/exim/exim.conf - fi - - chmod 640 /etc/exim/exim.conf - rm -rf /etc/exim/domains - mkdir -p /etc/exim/domains - - rm -f /etc/alternatives/mta - ln -s /usr/sbin/sendmail.exim /etc/alternatives/mta - chkconfig sendmail off 2>/dev/null - service sendmail stop 2>/dev/null - chkconfig postfix off 2>/dev/null - service postfix stop 2>/dev/null - - chkconfig exim on - service exim start - check_result $? "exim start failed" -fi - - -#----------------------------------------------------------# -# Configure Dovecot # -#----------------------------------------------------------# - -if [ "$dovecot" = 'yes' ]; then - gpasswd -a dovecot mail - cp -rf $vestacp/dovecot /etc/ - cp -f $vestacp/logrotate/dovecot /etc/logrotate.d/ - chown -R root:root /etc/dovecot* - chkconfig dovecot on - service dovecot start - check_result $? "dovecot start failed" -fi - - -#----------------------------------------------------------# -# Configure ClamAV # -#----------------------------------------------------------# - -if [ "$clamd" = 'yes' ]; then - useradd clam -s /sbin/nologin -d /var/lib/clamav 2>/dev/null - gpasswd -a clam exim - gpasswd -a clam mail - cp -f $vestacp/clamav/clamd.conf /etc/ - cp -f $vestacp/clamav/freshclam.conf /etc/ - mkdir -p /var/log/clamav /var/run/clamav - chown clam:clam /var/log/clamav /var/run/clamav - chown -R clam:clam /var/lib/clamav - if [ "$release" -ge '7' ]; then - cp -f $vestacp/clamav/clamd.service /usr/lib/systemd/system/ - systemctl --system daemon-reload - fi - /usr/bin/freshclam - if [ "$release" -ge '7' ]; then - sed -i "s/nofork/foreground/" /usr/lib/systemd/system/clamd.service - systemctl daemon-reload - fi - chkconfig clamd on - service clamd start - #check_result $? "clamd start failed" -fi - - -#----------------------------------------------------------# -# Configure SpamAssassin # -#----------------------------------------------------------# - -if [ "$spamd" = 'yes' ]; then - chkconfig spamassassin on - service spamassassin start - check_result $? "spamassassin start failed" - if [ "$release" -ge '7' ]; then - groupadd -g 1001 spamd - useradd -u 1001 -g spamd -s /sbin/nologin -d \ - /var/lib/spamassassin spamd - mkdir /var/lib/spamassassin - chown spamd:spamd /var/lib/spamassassin - fi -fi - - -#----------------------------------------------------------# -# Configure RoundCube # -#----------------------------------------------------------# - -if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then - if [ "$apache" = 'yes' ]; then - cp -f $vestacp/roundcube/roundcubemail.conf /etc/httpd/conf.d/ - fi - cp -f $vestacp/roundcube/main.inc.php /etc/roundcubemail/config.inc.php - cd /usr/share/roundcubemail/plugins/password - cp -f $vestacp/roundcube/vesta.php drivers/vesta.php - cp -f $vestacp/roundcube/config.inc.php config.inc.php - sed -i "s/localhost/$servername/g" config.inc.php - chmod a+r /etc/roundcubemail/* - chmod -f 777 /var/log/roundcubemail - r="$(gen_pass)" - mysql -e "CREATE DATABASE roundcube" - mysql -e "GRANT ALL ON roundcube.* TO - roundcube@localhost IDENTIFIED BY '$r'" - sed -i "s/%password%/$r/g" /etc/roundcubemail/config.inc.php - chmod 640 /etc/roundcubemail/config.inc.php - chown root:apache /etc/roundcubemail/config.inc.php - if [ -e "/usr/share/roundcubemail/SQL/mysql.initial.sql" ]; then - mysql roundcube < /usr/share/roundcubemail/SQL/mysql.initial.sql - else - mysql roundcube < /usr/share/doc/roundcubemail-*/SQL/mysql.initial.sql - fi -fi - - -#----------------------------------------------------------# -# Configure Fail2Ban # -#----------------------------------------------------------# - -if [ "$fail2ban" = 'yes' ]; then - cp -rf $vestacp/fail2ban /etc/ - if [ "$dovecot" = 'no' ]; then - fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) - fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) - sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local - fi - if [ "$exim" = 'no' ]; then - fline=$(cat /etc/fail2ban/jail.local |grep -n exim-iptables -A 2) - fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) - sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local - fi - if [ "$vsftpd" = 'yes' ]; then - #Create vsftpd Log File - if [ ! -f "/var/log/vsftpd.log" ]; then - touch /var/log/vsftpd.log - fi - fline=$(cat /etc/fail2ban/jail.local |grep -n vsftpd-iptables -A 2) - fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) - sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local - fi - chkconfig fail2ban on - mkdir -p /var/run/fail2ban - if [ -e "/usr/lib/systemd/system/fail2ban.service" ]; then - exec_pre='ExecStartPre=/bin/mkdir -p /var/run/fail2ban' - sed -i "s|\[Service\]|[Service]\n$exec_pre|g" \ - /usr/lib/systemd/system/fail2ban.service - systemctl daemon-reload - fi - service fail2ban start - check_result $? "fail2ban start failed" -fi - - -#----------------------------------------------------------# -# Configure Admin User # -#----------------------------------------------------------# - -# Deleting old admin user -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then - chattr -i /home/admin/conf > /dev/null 2>&1 - userdel -f admin >/dev/null 2>&1 - chattr -i /home/admin/conf >/dev/null 2>&1 - mv -f /home/admin $vst_backups/home/ >/dev/null 2>&1 - rm -f /tmp/sess_* >/dev/null 2>&1 -fi -if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then - groupdel admin > /dev/null 2>&1 -fi - -# Adding Vesta admin account -$VESTA/bin/v-add-user admin $vpass $email default System Administrator -check_result $? "can't create admin user" -$VESTA/bin/v-change-user-shell admin bash -$VESTA/bin/v-change-user-language admin $lang - -# Configuring system IPs -$VESTA/bin/v-update-sys-ip - -# Get main IP -ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) - -# Configuring firewall -if [ "$iptables" = 'yes' ]; then - $VESTA/bin/v-update-firewall -fi - -# Get public IP -pub_ip=$(curl -s vestacp.com/what-is-my-ip/) -if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then - echo "$VESTA/bin/v-update-sys-ip" >> /etc/rc.local - $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip - ip=$pub_ip -fi - -# Configuring MySQL host -if [ "$mysql" = 'yes' ]; then - $VESTA/bin/v-add-database-host mysql localhost root $mpass - $VESTA/bin/v-add-database admin default default $(gen_pass) mysql -fi - -# Configuring PostgreSQL host -if [ "$postgresql" = 'yes' ]; then - $VESTA/bin/v-add-database-host pgsql localhost postgres $ppass - $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql -fi - -# Adding default domain -$VESTA/bin/v-add-domain admin $servername - -# Adding cron jobs -command="sudo $VESTA/bin/v-update-sys-queue disk" -$VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-update-sys-queue traffic" -$VESTA/bin/v-add-cron-job 'admin' '10' '00' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-update-sys-queue webstats" -$VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-update-sys-queue backup" -$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-backup-users" -$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-update-user-stats" -$VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-update-sys-rrd" -$VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" -service crond restart - -# Building RRD images -$VESTA/bin/v-update-sys-rrd - -# Enabling file system quota -if [ "$quota" = 'yes' ]; then - $VESTA/bin/v-add-sys-quota -fi - -# Enabling Softaculous plugin -if [ "$softaculous" = 'yes' ]; then - $VESTA/bin/v-add-vesta-softaculous -fi - -# Starting Vesta service -chkconfig vesta on -service vesta start -check_result $? "vesta start failed" -chown admin:admin $VESTA/data/sessions - -# Adding notifications -$VESTA/upd/add_notifications.sh - -# Adding cronjob for autoupdates -$VESTA/bin/v-add-cron-vesta-autoupdate - - -#----------------------------------------------------------# -# Vesta Access Info # -#----------------------------------------------------------# - -# Comparing hostname and IP -host_ip=$(host $servername |head -n 1 |awk '{print $NF}') -if [ "$host_ip" = "$ip" ]; then - ip="$servername" -fi - -# Sending notification to admin email -echo -e "Congratulations, you have just successfully installed \ -Vesta Control Panel - - https://$ip:8083 - username: admin - password: $vpass - -We hope that you enjoy your installation of Vesta. Please \ -feel free to contact us anytime if you have any questions. -Thank you. - --- -Sincerely yours -vestacp.com team -" > $tmpfile - -send_mail="$VESTA/web/inc/mail-wrapper.php" -cat $tmpfile | $send_mail -s "Vesta Control Panel" $email - -# Congrats -echo '=======================================================' -echo -echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' -echo ' _| _| _| _| _| _| _| ' -echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' -echo ' _| _| _| _| _| _| _| ' -echo ' _| _|_|_|_| _|_|_| _| _| _| ' -echo -echo -cat $tmpfile -rm -f $tmpfile - -# EOF diff --git a/install/vst-install-debian.sh b/install/vst-install-debian.sh index 0d181ec0..259b8ab0 100755 --- a/install/vst-install-debian.sh +++ b/install/vst-install-debian.sh @@ -1,96 +1,24 @@ #!/bin/bash -# myVesta Debian installer v 0.9 +# Vesta Debian installer v.05 #----------------------------------------------------------# # Variables&Functions # #----------------------------------------------------------# export PATH=$PATH:/sbin export DEBIAN_FRONTEND=noninteractive - -RHOST='apt.myvestacp.com' -CHOST='c.myvestacp.com' +RHOST='apt.vestacp.com' +CHOST='c.vestacp.com' VERSION='debian' VESTA='/usr/local/vesta' memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) arch=$(uname -i) os='debian' -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) +release=$(cat /etc/debian_version|grep -o [0-9]|head -n1) codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))" -vestacp="$VESTA/install/$VERSION/$release" -ARCH="amd64" +vestacp="http://$CHOST/$VERSION/$release" -if [ "$release" -eq 13 ]; then - software="nginx apache2 apache2-utils - libapache2-mod-fcgid php-fpm php - php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats - vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy - clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core - roundcube-mysql roundcube-plugins mariadb-server mariadb-common - mariadb-client postgresql postgresql-contrib phpmyadmin mc - flex whois git idn zip sudo bc ftp lsof ntpsec-ntpdate rrdtool quota - e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl - unrar-free vim-common net-tools unzip iptables xxd spamd" -elif [ "$release" -eq 12 ]; then - software="nginx apache2 apache2-utils - libapache2-mod-fcgid php-fpm php - php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats - vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy - clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core - roundcube-mysql roundcube-plugins mariadb-server mariadb-common - mariadb-client postgresql postgresql-contrib phpmyadmin mc - flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota - e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl - unrar-free vim-common net-tools unzip iptables xxd spamd rsyslog" -elif [ "$release" -eq 11 ]; then - software="nginx apache2 apache2-utils - libapache2-mod-fcgid php-fpm php - php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats - vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy - clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core - roundcube-mysql roundcube-plugins mariadb-server mariadb-common - mariadb-client postgresql postgresql-contrib phppgadmin phpmyadmin mc - flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota - e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl - unrar-free vim-common net-tools unzip iptables" -elif [ "$release" -eq 10 ]; then - software="nginx apache2 apache2-utils - libapache2-mod-fcgid php-fpm php - php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats - webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy - clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core - roundcube-mysql roundcube-plugins mariadb-server mariadb-common - mariadb-client postgresql postgresql-contrib phppgadmin mc - flex whois git idn zip sudo bc ftp lsof ntpdate rrdtool quota - e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl - unrar-free vim-common net-tools unzip" -elif [ "$release" -eq 9 ]; then - echo "===================================================" - echo "Important message:" - echo "myVesta is much more faster with Debian 10 ." - echo "Are you sure you want to continue with Debian 9 ?" - read -p "===================================================" - software="nginx apache2 apache2-utils apache2-suexec-custom - libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php php - php-common php-cgi php-mysql php-curl php-fpm php-pgsql awstats - webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy - clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core - roundcube-mysql roundcube-plugins mysql-server mysql-common - mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc - flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota - e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils - bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl - unrar-free vim-common net-tools unzip" -elif [ "$release" -eq 8 ]; then - echo "===================================================" - echo "Important message:" - echo "myVesta is much more faster with Debian 10 ." - echo "Are you sure you want to continue with Debian 8 ?" - read -p "===================================================" +if [ "$release" -eq 8 ]; then software="nginx apache2 apache2-utils apache2.2-common apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi @@ -102,7 +30,20 @@ elif [ "$release" -eq 8 ]; then flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils bsdmainutils cron vesta vesta-nginx vesta-php expect libmail-dkim-perl - unrar-free vim-common net-tools unzip" + unrar-free vim-common vesta-ioncube vesta-softaculous" +else + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 + libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi + php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd + proftpd-basic proftpd-mod-vroot bind9 exim4 exim4-daemon-heavy + clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils cron vesta vesta-nginx vesta-php expect unrar-free + vim-common vesta-ioncube vesta-softaculous" fi # Defining help function @@ -111,31 +52,29 @@ help() { -a, --apache Install Apache [yes|no] default: yes -n, --nginx Install Nginx [yes|no] default: yes -w, --phpfpm Install PHP-FPM [yes|no] default: no - -v, --vsftpd Install Vsftpd [yes|no] default: no - -j, --proftpd Install ProFTPD [yes|no] default: yes + -v, --vsftpd Install Vsftpd [yes|no] default: yes + -j, --proftpd Install ProFTPD [yes|no] default: no -k, --named Install Bind [yes|no] default: yes - -m, --mysql Install MariaDB [yes|no] default: yes - -d, --mysql8 Install MySQL 8 [yes|no] default: no + -m, --mysql Install MySQL [yes|no] default: yes -g, --postgresql Install PostgreSQL [yes|no] default: no + -d, --mongodb Install MongoDB [yes|no] unsupported -x, --exim Install Exim [yes|no] default: yes -z, --dovecot Install Dovecot [yes|no] default: yes -c, --clamav Install ClamAV [yes|no] default: yes -t, --spamassassin Install SpamAssassin [yes|no] default: yes -i, --iptables Install Iptables [yes|no] default: yes -b, --fail2ban Install Fail2ban [yes|no] default: yes - -o, --softaculous Install Softaculous [yes|no] default: no + -o, --softaculous Install Softaculous [yes|no] default: yes -q, --quota Filesystem Quota [yes|no] default: no -l, --lang Default language default: en -y, --interactive Interactive install [yes|no] default: yes -s, --hostname Set hostname -e, --email Set admin email -p, --password Set admin password - -u, --secret_url Set secret url for hosting panel - -1, --port Set Vesta port -f, --force Force installation -h, --help Print this help - Example: bash $0 -e demo@myvestacp.com -p p4ssw0rd --apache no --phpfpm yes" + Example: bash $0 -e demo@vestacp.com -p p4ssw0rd --apache no --phpfpm yes" exit 1 } @@ -143,11 +82,7 @@ help() { # Defining password-gen function gen_pass() { MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' - if [ -z "$1" ]; then - LENGTH=32 - else - LENGTH=$1 - fi + LENGTH=10 while [ ${n:=1} -le $LENGTH ]; do PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}" let n+=1 @@ -189,25 +124,6 @@ set_default_lang() { fi } -ensure_startup() { - echo "- making sure startup is enabled for: $1" - currentservice=$1 - unit_files="$(systemctl list-unit-files |grep $currentservice)" - if [[ "$unit_files" =~ "disabled" ]]; then - systemctl enable $currentservice - fi -} - -ensure_start() { - echo "- making sure $1 is started" - currentservice=$1 - systemctl status $currentservice.service > /dev/null 2>&1 - r=$? - if [ $r -ne 0 ]; then - systemctl start $currentservice - check_result $? "$currentservice start failed" - fi -} #----------------------------------------------------------# # Verifications # @@ -227,7 +143,6 @@ for arg; do --proftpd) args="${args}-j " ;; --named) args="${args}-k " ;; --mysql) args="${args}-m " ;; - --mysql8) args="${args}-d " ;; --postgresql) args="${args}-g " ;; --mongodb) args="${args}-d " ;; --exim) args="${args}-x " ;; @@ -243,8 +158,6 @@ for arg; do --interactive) args="${args}-y " ;; --hostname) args="${args}-s " ;; --email) args="${args}-e " ;; - --secret_url) args="${args}-u " ;; - --port) args="${args}-1 " ;; --password) args="${args}-p " ;; --force) args="${args}-f " ;; --help) args="${args}-h " ;; @@ -255,7 +168,7 @@ done eval set -- "$args" # Parsing arguments -while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:u:1:fh" Option; do +while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:fh" Option; do case $Option in a) apache=$OPTARG ;; # Apache n) nginx=$OPTARG ;; # Nginx @@ -263,8 +176,7 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:u:1:fh" Option; do v) vsftpd=$OPTARG ;; # Vsftpd j) proftpd=$OPTARG ;; # Proftpd k) named=$OPTARG ;; # Named - m) mysql=$OPTARG ;; # MariaDB - d) mysql8=$OPTARG ;; # MySQL8 + m) mysql=$OPTARG ;; # MySQL g) postgresql=$OPTARG ;; # PostgreSQL d) mongodb=$OPTARG ;; # MongoDB (unsupported) x) exim=$OPTARG ;; # Exim @@ -280,8 +192,6 @@ while getopts "a:n:w:v:j:k:m:g:d:x:z:c:t:i:b:r:o:q:l:y:s:e:p:u:1:fh" Option; do y) interactive=$OPTARG ;; # Interactive install s) servername=$OPTARG ;; # Hostname e) email=$OPTARG ;; # Admin email - u) secret_url=$OPTARG ;; # Secret URL for hosting panel - 1) port=$OPTARG ;; # Vesta port p) vpass=$OPTARG ;; # Admin password f) force='yes' ;; # Force install h) help ;; # Help @@ -293,16 +203,15 @@ done set_default_value 'nginx' 'yes' set_default_value 'apache' 'yes' set_default_value 'phpfpm' 'no' -set_default_value 'vsftpd' 'no' -set_default_value 'proftpd' 'yes' +set_default_value 'vsftpd' 'yes' +set_default_value 'proftpd' 'no' set_default_value 'named' 'yes' set_default_value 'mysql' 'yes' -set_default_value 'mysql8' 'no' set_default_value 'postgresql' 'no' set_default_value 'mongodb' 'no' set_default_value 'exim' 'yes' set_default_value 'dovecot' 'yes' -if [ $memory -lt 2500000 ]; then +if [ $memory -lt 1500000 ]; then set_default_value 'clamd' 'no' set_default_value 'spamd' 'no' else @@ -311,16 +220,16 @@ else fi set_default_value 'iptables' 'yes' set_default_value 'fail2ban' 'yes' -set_default_value 'softaculous' 'no' +set_default_value 'softaculous' 'yes' set_default_value 'quota' 'no' set_default_value 'interactive' 'yes' set_default_lang 'en' # Checking software conflicts -# if [ "$phpfpm" = 'yes' ]; then -# apache='no' -# nginx='yes' -# fi +if [ "$phpfpm" = 'yes' ]; then + apache='no' + nginx='yes' +fi if [ "$proftpd" = 'yes' ]; then vsftpd='no' fi @@ -332,9 +241,6 @@ fi if [ "$iptables" = 'no' ]; then fail2ban='no' fi -if [ "$mysql8" = 'yes' ]; then - mysql='no' -fi # Checking root permissions if [ "x$(id -u)" != 'x0' ]; then @@ -342,37 +248,21 @@ if [ "x$(id -u)" != 'x0' ]; then fi # Checking admin user account -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$force" ]; then +if [ ! -z "$(grep ^admin: /etc/passwd /etc/group)" ] && [ -z "$force" ]; then echo 'Please remove admin user account before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo -e "Example: bash $0 --force\n" check_result 1 "User admin exists" fi -echo "Updating apt, please wait..." -apt-get update > /dev/null 2>&1 - # Checking wget if [ ! -e '/usr/bin/wget' ]; then - apt-get -y install wget > /dev/null 2>&1 + apt-get -y install wget check_result $? "Can't install wget" fi -# Check if gnupg2 is installed -if [ $(dpkg-query -W -f='${Status}' gnupg2 2>/dev/null | grep -c "ok installed") -eq 0 ]; then - apt-get -y install gnupg2 > /dev/null 2>&1 -fi - -# Check if apparmor is installed -# This check is borrowed from HestiaCP -if [ $(dpkg-query -W -f='${Status}' apparmor 2>/dev/null | grep -c "ok installed") -eq 0 ]; then - apparmor='no' -else - apparmor='yes' -fi - # Checking repository availability -wget -q "apt.myvestacp.com/deb_signing.key" -O /dev/null +wget -q "$vestacp/deb_signing.key" -O /dev/null check_result $? "No access to Vesta repository" # Check installed packages @@ -384,15 +274,6 @@ for pkg in exim4 mysql-server apache2 nginx vesta; do fi done rm -f $tmpfile - -if [ ! -z "$conflicts" ] && [[ "$conflicts" = *"exim4"* ]]; then - echo "=== Removing pre-installed exim4" - apt remove --purge -y exim4 exim4-base exim4-config - rm -rf /etc/exim4 - conflicts=$(echo "$conflicts" | sed -e "s/exim4//") - conflicts=$(echo "$conflicts" | sed -e "s/ //") -fi - if [ ! -z "$conflicts" ] && [ -z "$force" ]; then echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' echo @@ -416,75 +297,71 @@ fi # Printing nice ascii aslogo clear echo -echo " __ __ _ " -echo " _ __ ___ _ \ \ / /__ ___| |_ __ _ " -echo " | '_ \` _ \| | | \ \ / / _ \/ __| __/ _\` |" -echo " | | | | | | |_| |\ V / __/\__ \ || (_| |" -echo " |_| |_| |_|\__, | \_/ \___||___/\__\__,_|" -echo " |___/ " +echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _| _|_|_| _|_| _| _|_|_|_|' +echo ' _| _| _| _| _| _| _|' +echo ' _| _|_|_|_| _|_|_| _| _| _|' echo -echo ' myVesta Control Panel' +echo ' Vesta Control Panel' echo -e "\n\n" echo 'Following software will be installed on your system:' # Web stack if [ "$nginx" = 'yes' ]; then - echo ' - nginx Web server' + echo ' - Nginx Web Server' fi if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then - echo ' - Apache web server' + echo ' - Apache Web Server' fi if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then - echo ' - Apache web server (in very fast mpm_event mode)' - echo ' - PHP-FPM service for PHP processing' + echo ' - Apache Web Server (as backend)' fi if [ "$phpfpm" = 'yes' ]; then - echo ' - PHP-FPM service for PHP processing' + echo ' - PHP-FPM Application Server' fi # DNS stack if [ "$named" = 'yes' ]; then - echo ' - Bind9 DNS service' + echo ' - Bind DNS Server' fi # Mail Stack if [ "$exim" = 'yes' ]; then - echo -n ' - Exim4 mail server' + echo -n ' - Exim mail server' if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then + echo -n ' + ' if [ "$clamd" = 'yes' ]; then - echo -n ' + ClamAV antivirus' + echo -n 'Antivirus ' fi if [ "$spamd" = 'yes' ]; then - echo -n ' + SpamAssassin antispam service' + echo -n 'Antispam' fi fi echo if [ "$dovecot" = 'yes' ]; then - echo ' - Dovecot POP3/IMAP service' + echo ' - Dovecot POP3/IMAP Server' fi fi # DB stack if [ "$mysql" = 'yes' ]; then - echo ' - MariaDB Database server' -fi -if [ "$mysql8" = 'yes' ]; then - echo ' - MySQL 8 Database server' + echo ' - MySQL Database Server' fi if [ "$postgresql" = 'yes' ]; then - echo ' - PostgreSQL Database server' + echo ' - PostgreSQL Database Server' +fi +if [ "$mongodb" = 'yes' ]; then + echo ' - MongoDB Database Server' fi -# if [ "$mongodb" = 'yes' ]; then -# echo ' - MongoDB Database Server' -# fi # FTP stack if [ "$vsftpd" = 'yes' ]; then - echo ' - Vsftpd FTP service' + echo ' - Vsftpd FTP Server' fi if [ "$proftpd" = 'yes' ]; then - echo ' - ProFTPD FTP service' + echo ' - ProFTPD FTP Server' fi # Softaculous @@ -494,25 +371,19 @@ fi # Firewall stack if [ "$iptables" = 'yes' ]; then - echo -n ' - iptables firewall' + echo -n ' - Iptables Firewall' fi if [ "$iptables" = 'yes' ] && [ "$fail2ban" = 'yes' ]; then - echo -n ' + Fail2Ban service' + echo -n ' + Fail2Ban' fi echo -e "\n\n" # Asking for confirmation to proceed if [ "$interactive" = 'yes' ]; then - prompt_to_continue=1; - if [ ! -z "$email" ] && [ ! -z "$secret_url" ] && [ ! -z "$port" ] && [ ! -z "$servername" ]; then - prompt_to_continue=0; - fi - if [ $prompt_to_continue -eq 1 ]; then - read -p 'Would you like to continue [y/n]: ' answer - if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then - echo 'Goodbye' - exit 1 - fi + read -p 'Would you like to continue [y/n]: ' answer + if [ "$answer" != 'y' ] && [ "$answer" != 'Y' ]; then + echo 'Goodbye' + exit 1 fi # Asking for contact email @@ -520,18 +391,6 @@ if [ "$interactive" = 'yes' ]; then read -p 'Please enter admin email address: ' email fi - # Asking for secret URL - if [ -z "$secret_url" ]; then - echo 'Please enter secret URL address for hosting panel (or press enter for none).' - echo 'Secret URL must be without special characters, just letters and numbers. Example: mysecret8205' - read -p 'Enter secret URL address: ' secret_url - fi - - # Asking for Vesta port - if [ -z "$port" ]; then - read -p 'Please enter Vesta port number (press enter for 8083): ' port - fi - # Asking to set FQDN hostname if [ -z "$servername" ]; then read -p "Please enter FQDN hostname [$(hostname)]: " servername @@ -559,19 +418,12 @@ if ! [[ "$servername" =~ ^${mask1}${mask2}$ ]]; then fi echo "127.0.0.1 $servername" >> /etc/hosts fi -echo "$servername" > /etc/hostname -hostname $servername # Set email if it wasn't set if [ -z "$email" ]; then email="admin@$servername" fi -# Set port if it wasn't set -if [ -z "$port" ]; then - port="8083" -fi - # Defining backup directory vst_backups="/root/vst_install_backups/$(date +%s)" echo "Installation backup directory: $vst_backups" @@ -585,8 +437,8 @@ sleep 5 # Checking swap # #----------------------------------------------------------# +# Checking swap on small instances if [ -z "$(swapon -s)" ] && [ $memory -lt 1000000 ]; then - echo "== Checking swap on small instances" fallocate -l 1G /swapfile chmod 600 /swapfile mkswap /swapfile @@ -599,50 +451,32 @@ fi # Install repository # #----------------------------------------------------------# -echo "=== Updating system (apt-get -y upgrade)" +# Updating system apt-get -y upgrade check_result $? 'apt-get upgrade failed' -echo "=== Installing nginx repo" -apt="/etc/apt/sources.list.d" -# echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list -# wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key -# apt-key add /tmp/nginx_signing.key -echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://nginx.org/packages/mainline/$VERSION/ $codename nginx" > $apt/nginx.list -curl -s https://nginx.org/keys/nginx_signing.key | gpg --dearmor | tee /usr/share/keyrings/nginx-keyring.gpg > /dev/null 2>&1 +# Installing nginx repo +apt=/etc/apt/sources.list.d +echo "deb http://nginx.org/packages/debian/ $codename nginx" > $apt/nginx.list +wget http://nginx.org/keys/nginx_signing.key -O /tmp/nginx_signing.key +apt-key add /tmp/nginx_signing.key -echo "=== Installing myVesta repo" -# echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list -# wget $CHOST/deb_signing.key -O deb_signing.key -# apt-key add deb_signing.key -echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/myvesta-keyring.gpg] https://$RHOST/$codename/ $codename vesta" > $apt/vesta.list -curl -s $CHOST/deb_signing.key | gpg --dearmor | tee /usr/share/keyrings/myvesta-keyring.gpg > /dev/null 2>&1 - -# Installing jessie backports -if [ "$release" -eq 8 ]; then - if [ ! -e /etc/apt/apt.conf ]; then - echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf - fi - if [ ! -e /etc/apt/sources.list.d/backports.list ]; then - echo "deb http://archive.debian.org/debian jessie-backports main" >\ - /etc/apt/sources.list.d/backports.list - fi -fi +# Installing vesta repo +echo "deb http://$RHOST/$codename/ $codename vesta" > $apt/vesta.list +wget $CHOST/deb_signing.key -O deb_signing.key +apt-key add deb_signing.key #----------------------------------------------------------# # Backup # #----------------------------------------------------------# -mkdir /backup - -echo "=== Creating backup directory tree" +# Creating backup directory tree mkdir -p $vst_backups cd $vst_backups -mkdir nginx apache2 php php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd +mkdir nginx apache2 php5 php5-fpm vsftpd proftpd bind exim4 dovecot clamd mkdir spamassassin mysql postgresql mongodb vesta -echo "=== Backing up old configs" # Backing up Nginx configuration service nginx stop > /dev/null 2>&1 cp -r /etc/nginx/* $vst_backups/nginx >/dev/null 2>&1 @@ -721,12 +555,10 @@ if [ "$apache" = 'no' ]; then software=$(echo "$software" | sed -e "s/libapache2-mod-ruid2//") software=$(echo "$software" | sed -e "s/libapache2-mod-fcgid//") software=$(echo "$software" | sed -e "s/libapache2-mod-php5//") - software=$(echo "$software" | sed -e "s/libapache2-mod-php//") fi -# if [ "$phpfpm" = 'no' ]; then - # software=$(echo "$software" | sed -e "s/php5-fpm//") - # software=$(echo "$software" | sed -e "s/php-fpm//") -# fi +if [ "$phpfpm" = 'no' ]; then + software=$(echo "$software" | sed -e "s/php5-fpm//") +fi if [ "$vsftpd" = 'no' ]; then software=$(echo "$software" | sed -e "s/vsftpd//") fi @@ -760,59 +592,13 @@ if [ "$mysql" = 'no' ]; then software=$(echo "$software" | sed -e 's/mysql-server//') software=$(echo "$software" | sed -e 's/mysql-client//') software=$(echo "$software" | sed -e 's/mysql-common//') - software=$(echo "$software" | sed -e 's/mariadb-server//') - software=$(echo "$software" | sed -e 's/mariadb-client//') - software=$(echo "$software" | sed -e 's/mariadb-common//') software=$(echo "$software" | sed -e 's/php5-mysql//') - software=$(echo "$software" | sed -e 's/php-mysql//') software=$(echo "$software" | sed -e 's/phpMyAdmin//') - software=$(echo "$software" | sed -e 's/phpmyadmin//') - software=$(echo "$software" | sed -e 's/roundcube-mysql//') -fi -if [ "$mysql8" = 'yes' ]; then - echo "=== Preparing MySQL 8 apt repo" - if [ "$release" -lt 12 ]; then - software=$(echo "$software" | sed -e 's/exim4-daemon-heavy//') - software=$(echo "$software" | sed -e 's/exim4//') - #software="$software php-mysql roundcube-mysql" - echo "### THIS FILE IS AUTOMATICALLY CONFIGURED ###" > /etc/apt/sources.list.d/mysql.list - echo "# You may comment out entries below, but any other modifications may be lost." >> /etc/apt/sources.list.d/mysql.list - echo "# Use command 'dpkg-reconfigure mysql-apt-config' as root for modifications." >> /etc/apt/sources.list.d/mysql.list - echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-apt-config" >> /etc/apt/sources.list.d/mysql.list - echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list - echo "deb http://repo.mysql.com/apt/debian/ $codename mysql-tools" >> /etc/apt/sources.list.d/mysql.list - echo "#deb http://repo.mysql.com/apt/debian/ $codename mysql-tools-preview" >> /etc/apt/sources.list.d/mysql.list - echo "deb-src http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list - - # apt-key adv --keyserver pgp.mit.edu --recv-keys 3A79BD29 - key="467B942D3A79BD29" - readonly key - GNUPGHOME="$(mktemp -d)" - export GNUPGHOME - for keyserver in $(shuf -e ha.pool.sks-keyservers.net hkp://p80.pool.sks-keyservers.net:80 keyserver.ubuntu.com hkp://keyserver.ubuntu.com:80) - do - gpg --keyserver "${keyserver}" --recv-keys "${key}" 2>&1 && break - done - gpg --export "${key}" > /etc/apt/trusted.gpg.d/mysql.gpg - gpgconf --kill all - rm -rf "${GNUPGHOME}" - unset GNUPGHOME - else - # check latest on: https://dev.mysql.com/downloads/repo/apt/ - wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb - dpkg -i mysql-apt-config_0.8.34-1_all.deb - fi - - mpass=$(gen_pass) - debconf-set-selections <<< "mysql-community-server mysql-community-server/root-pass password $mpass" - debconf-set-selections <<< "mysql-community-server mysql-community-server/re-root-pass password $mpass" - debconf-set-selections <<< "mysql-community-server mysql-server/default-auth-override select Use Legacy Authentication Method (Retain MySQL 5.x Compatibility)" fi if [ "$postgresql" = 'no' ]; then software=$(echo "$software" | sed -e 's/postgresql-contrib//') software=$(echo "$software" | sed -e 's/postgresql//') software=$(echo "$software" | sed -e 's/php5-pgsql//') - software=$(echo "$software" | sed -e 's/php-pgsql//') software=$(echo "$software" | sed -e 's/phppgadmin//') fi if [ "$softaculous" = 'no' ]; then @@ -828,96 +614,64 @@ fi #----------------------------------------------------------# # Update system packages -echo "=== Running: apt-get update" apt-get update -echo "=== Disable daemon autostart /usr/share/doc/sysv-rc/README.policy-rc.d.gz" +# Disable daemon autostart /usr/share/doc/sysv-rc/README.policy-rc.d.gz echo -e '#!/bin/sh \nexit 101' > /usr/sbin/policy-rc.d chmod a+x /usr/sbin/policy-rc.d -if [ "$mysql8" = 'yes' ]; then - echo "=== Installing MySQL 8" - apt-get -y install mysql-server mysql-client mysql-common - #update-rc.d mysql defaults - currentservice='mysql' - ensure_startup $currentservice - ensure_start $currentservice - echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf - chmod 600 /root/.my.cnf - mysqladmin -u root password $mpass -fi - -echo "=== Installing all apt packages" -# echo "apt-get -y install $software" +# Install apt packages apt-get -y install $software - check_result $? "apt-get install failed" -if [ "$mysql8" = 'yes' ]; then - if [ "$exim" = 'yes' ]; then - echo "=== Installing exim4" - apt-get -y install exim4 exim4-daemon-heavy - fi - echo "=== Installing phpmyadmin" - #apt-get -y --no-install-recommends install phpmyadmin - apt-get -y install phpmyadmin -fi - -echo "=== Enabling daemon autostart" +# Restore policy rm -f /usr/sbin/policy-rc.d -if [ "$release" -eq 12 ]; then - echo "=== Setting up rsyslog" - currentservice='rsyslog' - ensure_startup $currentservice - ensure_start $currentservice -fi #----------------------------------------------------------# # Configure system # #----------------------------------------------------------# -echo "== Enable SSH password auth" +# Enable SSH password auth sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config -systemctl restart ssh +service ssh restart -echo "== Disable awstats cron" +# Disable awstats cron rm -f /etc/cron.d/awstats -echo "== Set directory color" +# Set directory color echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile -echo "== Register /sbin/nologin and /usr/sbin/nologin" +# Register /sbin/nologin and /usr/sbin/nologin echo "/sbin/nologin" >> /etc/shells echo "/usr/sbin/nologin" >> /etc/shells -echo "== NTP Synchronization" +# NTP Synchronization echo '#!/bin/sh' > /etc/cron.daily/ntpdate echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate chmod 775 /etc/cron.daily/ntpdate ntpdate -s pool.ntp.org -if [ "$release" -eq 9 ]; then - # Setup rssh - if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then - echo /usr/bin/rssh >> /etc/shells - fi - sed -i 's/#allowscp/allowscp/' /etc/rssh.conf - sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf - sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf - chmod 755 /usr/bin/rssh +# Setup rssh +if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then + echo /usr/bin/rssh >> /etc/shells fi +sed -i 's/#allowscp/allowscp/' /etc/rssh.conf +sed -i 's/#allowsftp/allowsftp/' /etc/rssh.conf +sed -i 's/#allowrsync/allowrsync/' /etc/rssh.conf +chmod 755 /usr/bin/rssh + #----------------------------------------------------------# # Configure VESTA # #----------------------------------------------------------# -echo "== Installing sudo configuration" +# Downloading sudo configuration mkdir -p /etc/sudoers.d -cp -f $vestacp/sudo/admin /etc/sudoers.d/ +wget $vestacp/sudo/admin -O /etc/sudoers.d/admin chmod 440 /etc/sudoers.d/admin -echo "== Configuring system env" +# Configuring system env echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh chmod 755 /etc/profile.d/vesta.sh source /etc/profile.d/vesta.sh @@ -925,10 +679,10 @@ echo 'PATH=$PATH:'$VESTA'/bin' >> /root/.bash_profile echo 'export PATH' >> /root/.bash_profile source /root/.bash_profile -echo "== Copying logrotate for myVesta logs" -cp -f $vestacp/logrotate/vesta /etc/logrotate.d/ +# Configuring logrotate for vesta logs +wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta -echo "== Building directory tree and creating some blank files for myVesta" +# Building directory tree and creating some blank files for vesta mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall \ $VESTA/data/sessions @@ -941,9 +695,10 @@ chmod -R 750 $VESTA/data/queue chmod 660 $VESTA/log/* rm -f /var/log/vesta ln -s $VESTA/log /var/log/vesta +chown admin:admin $VESTA/data/sessions chmod 770 $VESTA/data/sessions -echo "== Generating vesta.conf" +# Generating vesta configuration rm -f $VESTA/conf/vesta.conf 2>/dev/null touch $VESTA/conf/vesta.conf chmod 660 $VESTA/conf/vesta.conf @@ -973,14 +728,8 @@ if [ "$apache" = 'no' ] && [ "$nginx" = 'yes' ]; then echo "WEB_PORT='80'" >> $VESTA/conf/vesta.conf echo "WEB_SSL_PORT='443'" >> $VESTA/conf/vesta.conf echo "WEB_SSL='openssl'" >> $VESTA/conf/vesta.conf - if [ "$release" -gt 8 ]; then - if [ "$phpfpm" = 'yes' ]; then - echo "WEB_BACKEND='php-fpm'" >> $VESTA/conf/vesta.conf - fi - else - if [ "$phpfpm" = 'yes' ]; then - echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf - fi + if [ "$phpfpm" = 'yes' ]; then + echo "WEB_BACKEND='php5-fpm'" >> $VESTA/conf/vesta.conf fi echo "STATS_SYSTEM='webalizer,awstats'" >> $VESTA/conf/vesta.conf fi @@ -1005,11 +754,7 @@ if [ "$exim" = 'yes' ]; then echo "ANTIVIRUS_SYSTEM='clamav-daemon'" >> $VESTA/conf/vesta.conf fi if [ "$spamd" = 'yes' ]; then - if [ "$release" -lt 12 ]; then - echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf - else - echo "ANTISPAM_SYSTEM='spamd'" >> $VESTA/conf/vesta.conf - fi + echo "ANTISPAM_SYSTEM='spamassassin'" >> $VESTA/conf/vesta.conf fi if [ "$dovecot" = 'yes' ]; then echo "IMAP_SYSTEM='dovecot'" >> $VESTA/conf/vesta.conf @@ -1041,109 +786,39 @@ echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf # Version echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf -echo "== Copying packages" -cp -rf $vestacp/packages $VESTA/data/ +# Downloading hosting packages +cd $VESTA/data +wget $vestacp/packages.tar.gz -O packages.tar.gz +tar -xzf packages.tar.gz +rm -f packages.tar.gz -echo "== Copying templates" -cp -rf $vestacp/templates $VESTA/data/ +# Downloading templates +wget $vestacp/templates.tar.gz -O templates.tar.gz +tar -xzf templates.tar.gz +rm -f templates.tar.gz -if [ "$release" -eq 10 ]; then - echo "== Symlink missing templates" - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl - - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.sh /usr/local/vesta/data/templates/web/apache2/default.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl - - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-73.stpl - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-73.tpl -fi -if [ "$release" -eq 11 ]; then - echo "== Symlink missing templates" - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl - - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.sh /usr/local/vesta/data/templates/web/apache2/default.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl - - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-74.stpl - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-74.tpl -fi -if [ "$release" -eq 12 ]; then - echo "== Symlink missing templates" - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl - - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh /usr/local/vesta/data/templates/web/apache2/default.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl - - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-82.stpl - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-82.tpl -fi -if [ "$release" -eq 13 ]; then - echo "== Symlink missing templates" - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.sh /usr/local/vesta/data/templates/web/nginx/default.sh - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.tpl /usr/local/vesta/data/templates/web/nginx/default.tpl - ln -s /usr/local/vesta/data/templates/web/nginx/hosting.stpl /usr/local/vesta/data/templates/web/nginx/default.stpl - - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.sh /usr/local/vesta/data/templates/web/apache2/hosting.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.tpl /usr/local/vesta/data/templates/web/apache2/hosting.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.stpl /usr/local/vesta/data/templates/web/apache2/hosting.stpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.sh /usr/local/vesta/data/templates/web/apache2/default.sh - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.tpl /usr/local/vesta/data/templates/web/apache2/default.tpl - ln -s /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.stpl /usr/local/vesta/data/templates/web/apache2/default.stpl - - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.stpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-84.stpl - ln -s /usr/local/vesta/data/templates/web/nginx/php-fpm/default.tpl /usr/local/vesta/data/templates/web/nginx/php-fpm/PHP-FPM-84.tpl -fi - -echo "== Set nameservers address" -sed -i "s/YOURHOSTNAME1/ns1.$servername/" /usr/local/vesta/data/packages/default.pkg -sed -i "s/YOURHOSTNAME2/ns2.$servername/" /usr/local/vesta/data/packages/default.pkg -sed -i "s/ns1.domain.tld/ns1.$servername/" /usr/local/vesta/data/packages/default.pkg -sed -i "s/ns2.domain.tld/ns2.$servername/" /usr/local/vesta/data/packages/default.pkg -sed -i "s/ns1.example.com/ns1.$servername/" /usr/local/vesta/data/packages/default.pkg -sed -i "s/ns2.example.com/ns2.$servername/" /usr/local/vesta/data/packages/default.pkg - -echo "== Copying index.html to default documentroot" -cp $VESTA/data/templates/web/skel/public_html/index.html /var/www/ +# Copying index.html to default documentroot +cp templates/web/skel/public_html/index.html /var/www/ sed -i 's/%domain%/It worked!/g' /var/www/index.html -echo "== Copying firewall rules" -cp -rf $vestacp/firewall $VESTA/data/ +# Downloading firewall rules +wget $vestacp/firewall.tar.gz -O firewall.tar.gz +tar -xzf firewall.tar.gz +rm -f firewall.tar.gz -echo "== Configuring server hostname: $servername" +# Configuring server hostname $VESTA/bin/v-change-sys-hostname $servername 2>/dev/null -echo "== Generating myVesta unsigned SSL certificate" +# Generating SSL certificate $VESTA/bin/v-generate-ssl-cert $(hostname) $email 'US' 'California' \ - 'San Francisco' 'myVesta Control Panel' 'IT' > /tmp/vst.pem + 'San Francisco' 'Vesta Control Panel' 'IT' > /tmp/vst.pem # Parsing certificate file crt_end=$(grep -n "END CERTIFICATE-" /tmp/vst.pem |cut -f 1 -d:) -if [ "$release" -lt 12 ]; then - key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) - key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) -else - key_start=$(grep -n "BEGIN PRIVATE KEY" /tmp/vst.pem |cut -f 1 -d:) - key_end=$(grep -n "END PRIVATE KEY" /tmp/vst.pem |cut -f 1 -d:) -fi +key_start=$(grep -n "BEGIN RSA" /tmp/vst.pem |cut -f 1 -d:) +key_end=$(grep -n "END RSA" /tmp/vst.pem |cut -f 1 -d:) +# Adding SSL certificate cd $VESTA/ssl sed -n "1,${crt_end}p" /tmp/vst.pem > certificate.crt sed -n "$key_start,${key_end}p" /tmp/vst.pem > certificate.key @@ -1157,34 +832,18 @@ rm /tmp/vst.pem #----------------------------------------------------------# if [ "$nginx" = 'yes' ]; then - echo "=== Configure nginx" rm -f /etc/nginx/conf.d/*.conf - cp -f $vestacp/nginx/nginx.conf /etc/nginx/ - cp -f $vestacp/nginx/status.conf /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phpmyadmin.inc /etc/nginx/conf.d/ - if [ "$release" -lt 12 ]; then - cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/ - fi - cp -f $vestacp/nginx/webmail.inc /etc/nginx/conf.d/ - cp -f $vestacp/logrotate/nginx /etc/logrotate.d/ - - # default user/pass for private-hosting.tpl: private / folder - echo 'private:$apr1$0MYnchM5$yVi/OTfp7o3lGNst/a8.90' > /etc/nginx/.htpasswd - + wget $vestacp/nginx/nginx.conf -O /etc/nginx/nginx.conf + wget $vestacp/nginx/status.conf -O /etc/nginx/conf.d/status.conf + wget $vestacp/nginx/phpmyadmin.inc -O /etc/nginx/conf.d/phpmyadmin.inc + wget $vestacp/nginx/phppgadmin.inc -O /etc/nginx/conf.d/phppgadmin.inc + wget $vestacp/nginx/webmail.inc -O /etc/nginx/conf.d/webmail.inc + wget $vestacp/logrotate/nginx -O /etc/logrotate.d/nginx echo > /etc/nginx/conf.d/vesta.conf mkdir -p /var/log/nginx/domains - - if [ "$apache" = 'yes' ]; then - # SSL fix for Apache 2.4.65+ - echo -e "proxy_ssl_server_name on;\nproxy_ssl_name \$host;\nproxy_ssl_session_reuse off;" > /etc/nginx/conf.d/fixssl.conf - touch /usr/local/vesta/data/upgrades/fixssl.conf - fi - - #update-rc.d nginx defaults - #service nginx start - currentservice='nginx' - ensure_startup $currentservice - ensure_start $currentservice + update-rc.d nginx defaults + service nginx start + check_result $? "nginx start failed" fi @@ -1193,39 +852,32 @@ fi #----------------------------------------------------------# if [ "$apache" = 'yes' ]; then - echo "=== Configure Apache" - cp -f $vestacp/apache2/apache2.conf /etc/apache2/ - cp -f $vestacp/apache2/status.conf /etc/apache2/mods-enabled/ - cp -f $vestacp/logrotate/apache2 /etc/logrotate.d/ + wget $vestacp/apache2/apache2.conf -O /etc/apache2/apache2.conf + wget $vestacp/apache2/status.conf -O /etc/apache2/mods-enabled/status.conf + wget $vestacp/logrotate/apache2 -O /etc/logrotate.d/apache2 a2enmod rewrite - # a2enmod suexec + a2enmod suexec a2enmod ssl a2enmod actions - # a2enmod ruid2 + a2enmod ruid2 a2enmod headers - a2enmod expires - a2enmod proxy_fcgi setenvif mkdir -p /etc/apache2/conf.d echo > /etc/apache2/conf.d/vesta.conf echo "# Powered by vesta" > /etc/apache2/sites-available/default echo "# Powered by vesta" > /etc/apache2/sites-available/default-ssl echo "# Powered by vesta" > /etc/apache2/ports.conf - # echo -e "/home\npublic_html/cgi-bin" > /etc/apache2/suexec/www-data + echo -e "/home\npublic_html/cgi-bin" > /etc/apache2/suexec/www-data touch /var/log/apache2/access.log /var/log/apache2/error.log mkdir -p /var/log/apache2/domains chmod a+x /var/log/apache2 chmod 640 /var/log/apache2/access.log /var/log/apache2/error.log chmod 751 /var/log/apache2/domains - #update-rc.d apache2 defaults - #service apache2 start - currentservice='apache2' - ensure_startup $currentservice - ensure_start $currentservice + update-rc.d apache2 defaults + service apache2 start + check_result $? "apache2 start failed" else - #update-rc.d apache2 disable >/dev/null 2>&1 - #service apache2 stop >/dev/null 2>&1 - systemctl disable apache2 - systemctl stop apache2 + update-rc.d apache2 disable >/dev/null 2>&1 + service apache2 stop >/dev/null 2>&1 fi @@ -1234,44 +886,10 @@ fi #----------------------------------------------------------# if [ "$phpfpm" = 'yes' ]; then - echo "=== Configure PHP-FPM" - if [ "$release" -eq 13 ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php/8.4/fpm/pool.d/www.conf - #update-rc.d php8.4-fpm defaults - currentservice='php8.4-fpm' - ensure_startup $currentservice - ensure_start $currentservice - elif [ "$release" -eq 12 ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php/8.2/fpm/pool.d/www.conf - #update-rc.d php8.2-fpm defaults - currentservice='php8.2-fpm' - ensure_startup $currentservice - ensure_start $currentservice - elif [ "$release" -eq 11 ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php/7.4/fpm/pool.d/www.conf - #update-rc.d php7.4-fpm defaults - currentservice='php7.4-fpm' - ensure_startup $currentservice - ensure_start $currentservice - elif [ "$release" -eq 10 ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php/7.3/fpm/pool.d/www.conf - #update-rc.d php7.3-fpm defaults - currentservice='php7.3-fpm' - ensure_startup $currentservice - ensure_start $currentservice - elif [ "$release" -eq 9 ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php/7.0/fpm/pool.d/www.conf - #update-rc.d php7.0-fpm defaults - currentservice='php7.0-fpm' - ensure_startup $currentservice - ensure_start $currentservice - else - cp -f $vestacp/php5-fpm/www.conf /etc/php5/fpm/pool.d/www.conf - #update-rc.d php5-fpm defaults - currentservice='php5-fpm' - ensure_startup $currentservice - ensure_start $currentservice - fi + wget $vestacp/php5-fpm/www.conf -O /etc/php5/fpm/pool.d/www.conf + update-rc.d php5-fpm defaults + service php5-fpm start + check_result $? "php-fpm start failed" fi @@ -1279,14 +897,13 @@ fi # Configure PHP # #----------------------------------------------------------# -echo "=== Configure PHP timezone" ZONE=$(timedatectl 2>/dev/null|grep Timezone|awk '{print $2}') if [ -z "$ZONE" ]; then ZONE='UTC' fi for pconf in $(find /etc/php* -name php.ini); do sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf - # sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf + sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf done @@ -1295,12 +912,10 @@ done #----------------------------------------------------------# if [ "$vsftpd" = 'yes' ]; then - echo "=== Configure VSFTPD" - cp -f $vestacp/vsftpd/vsftpd.conf /etc/ - #update-rc.d vsftpd defaults - currentservice='vsftpd' - ensure_startup $currentservice - ensure_start $currentservice + wget $vestacp/vsftpd/vsftpd.conf -O /etc/vsftpd.conf + update-rc.d vsftpd defaults + service vsftpd start + check_result $? "vsftpd start failed" # To be deleted after release 0.9.8-18 echo "/sbin/nologin" >> /etc/shells @@ -1312,20 +927,11 @@ fi #----------------------------------------------------------# if [ "$proftpd" = 'yes' ]; then - echo "=== Configure ProFTPD" echo "127.0.0.1 $servername" >> /etc/hosts - cp -f $vestacp/proftpd/proftpd.conf /etc/proftpd/ - cp -f $vestacp/proftpd/tls.conf /etc/proftpd/ - #update-rc.d proftpd defaults - currentservice='proftpd' - ensure_startup $currentservice - ensure_start $currentservice - - # Temporary ProFTPD fix for Debian12 - if [ "$release" -eq 12 ]; then - systemctl disable --now proftpd.socket - systemctl enable --now proftpd.service - fi + wget $vestacp/proftpd/proftpd.conf -O /etc/proftpd/proftpd.conf + update-rc.d proftpd defaults + service proftpd start + check_result $? "proftpd start failed" fi @@ -1333,120 +939,39 @@ fi # Configure MySQL/MariaDB # #----------------------------------------------------------# -if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then - - if [ "$mysql" = 'yes' ]; then - touch $VESTA/conf/mariadb_installed +if [ "$mysql" = 'yes' ]; then + mycnf="my-small.cnf" + if [ $memory -gt 1200000 ]; then + mycnf="my-medium.cnf" fi - if [ "$mysql8" = 'yes' ]; then - touch $VESTA/conf/mysql8_installed + if [ $memory -gt 3900000 ]; then + mycnf="my-large.cnf" fi - if [ "$mysql" = 'yes' ]; then - echo "=== Configure MariaDB" - mycnf="my-small.cnf" - if [ $memory -gt 1200000 ]; then - mycnf="my-medium.cnf" - fi - if [ $memory -gt 3900000 ]; then - mycnf="my-large.cnf" - fi + # MySQL configuration + wget $vestacp/mysql/$mycnf -O /etc/mysql/my.cnf + mysql_install_db + update-rc.d mysql defaults + service mysql start + check_result $? "mysql start failed" - # MySQL configuration - cp -f $vestacp/mysql/$mycnf /etc/mysql/my.cnf - mysql_install_db - # update-rc.d mysql defaults - currentservice='mysql' - ensure_startup $currentservice - ensure_start $currentservice - - # Securing MySQL installation - mpass=$(gen_pass) - mysqladmin -u root password $mpass - echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf - chmod 600 /root/.my.cnf - mysql -e "DELETE FROM mysql.user WHERE User=''" - mysql -e "DROP DATABASE test" >/dev/null 2>&1 - mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" - mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" - mysql -e "FLUSH PRIVILEGES" - fi + # Securing MySQL installation + mysqladmin -u root password $vpass + echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf + chmod 600 /root/.my.cnf + mysql -e "DELETE FROM mysql.user WHERE User=''" + mysql -e "DROP DATABASE test" >/dev/null 2>&1 + mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" + mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" + mysql -e "FLUSH PRIVILEGES" # Configuring phpMyAdmin - echo "=== Configure phpMyAdmin" - if [ "$release" -eq 10 ]; then - mkdir /etc/phpmyadmin - mkdir -p /var/lib/phpmyadmin/tmp - fi if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pma/apache.conf /etc/phpmyadmin/ + wget $vestacp/pma/apache.conf -O /etc/phpmyadmin/apache.conf ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf fi - cp -f $vestacp/pma/config.inc.php /etc/phpmyadmin/ + wget $vestacp/pma/config.inc.php -O /etc/phpmyadmin/config.inc.php chmod 777 /var/lib/phpmyadmin/tmp - if [ "$release" -eq 10 ]; then - # Code borrowed from HestiaCP - mkdir /root/phpmyadmin - mkdir /usr/share/phpmyadmin - - pma_v='4.9.7' - echo "=== Installing phpMyAdmin version v$pma_v (Debian10 custom part)" - - cd /root/phpmyadmin - - # Download latest phpmyadmin release - wget -nv -O phpMyAdmin-$pma_v-all-languages.tar.gz https://files.phpmyadmin.net/phpMyAdmin/$pma_v/phpMyAdmin-$pma_v-all-languages.tar.gz - - # Unpack files - tar xzf phpMyAdmin-$pma_v-all-languages.tar.gz - - # Delete file to prevent error - rm -fr /usr/share/phpmyadmin/doc/html - - # Overwrite old files - cp -rf phpMyAdmin-$pma_v-all-languages/* /usr/share/phpmyadmin - - # Set config and log directory - sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php - sed -i "s|define('TEMP_DIR', './tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php - - # Create temporary folder and change permission - mkdir /usr/share/phpmyadmin/tmp - chmod 777 /usr/share/phpmyadmin/tmp - - # Clear Up - rm -fr phpMyAdmin-$pma_v-all-languages - rm -f phpMyAdmin-$pma_v-all-languages.tar.gz - - wget -nv -O /root/phpmyadmin/pma.sh http://c.myvestacp.com/debian/10/pma/pma.sh - wget -nv -O /root/phpmyadmin/create_tables.sql http://c.myvestacp.com/debian/10/pma/create_tables.sql - bash /root/phpmyadmin/pma.sh - blowfish=$(gen_pass) - echo "\$cfg['blowfish_secret'] = '$blowfish';" >> /etc/phpmyadmin/config.inc.php - - # disable root login - echo "\$cfg['Servers'][\$i]['AllowRoot'] = FALSE;" >> /etc/phpmyadmin/config.inc.php - fi - if [ "$release" -gt 10 ]; then - echo "=== Configure phpMyAdmin (Debian11 custom part)" - # Set config and log directory - sed -i "s|define('CONFIG_DIR', '');|define('CONFIG_DIR', '/etc/phpmyadmin/');|" /usr/share/phpmyadmin/libraries/vendor_config.php - sed -i "s|define('TEMP_DIR', './tmp/');|define('TEMP_DIR', '/var/lib/phpmyadmin/tmp/');|" /usr/share/phpmyadmin/libraries/vendor_config.php - - # Create temporary folder and change permission - mkdir /usr/share/phpmyadmin/tmp - chmod 777 /usr/share/phpmyadmin/tmp - - mkdir /root/phpmyadmin - wget -nv -O /root/phpmyadmin/pma.sh http://c.myvestacp.com/debian/11/pma/pma.sh - wget -nv -O /root/phpmyadmin/create_tables.sql http://c.myvestacp.com/debian/11/pma/create_tables.sql - bash /root/phpmyadmin/pma.sh - blowfish=$(gen_pass) - echo "\$cfg['blowfish_secret'] = '$blowfish';" >> /etc/phpmyadmin/config.inc.php - - # disable root login - echo "\$cfg['Servers'][\$i]['AllowRoot'] = FALSE;" >> /etc/phpmyadmin/config.inc.php - fi fi #----------------------------------------------------------# @@ -1454,21 +979,16 @@ fi #----------------------------------------------------------# if [ "$postgresql" = 'yes' ]; then - echo "=== Configure PostgreSQL" - ppass=$(gen_pass) - cp -f $vestacp/postgresql/pg_hba.conf /etc/postgresql/*/main/ - currentservice='postgresql' - ensure_startup $currentservice - ensure_start $currentservice - sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'" + wget $vestacp/postgresql/pg_hba.conf -O /etc/postgresql/*/main/pg_hba.conf + service postgresql restart + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" # Configuring phpPgAdmin - if [ "$release" -lt 12 ]; then - if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pga/phppgadmin.conf /etc/apache2/conf.d/ - fi - cp -f $vestacp/pga/config.inc.php /etc/phppgadmin/ + if [ "$apache" = 'yes' ]; then + wget $vestacp/pga/phppgadmin.conf \ + -O /etc/apache2/conf.d/phppgadmin.conf fi + wget $vestacp/pga/config.inc.php -O /etc/phppgadmin/config.inc.php fi @@ -1477,25 +997,19 @@ fi #----------------------------------------------------------# if [ "$named" = 'yes' ]; then - echo "=== Configure Bind9" - cp -f $vestacp/bind/named.conf /etc/bind/ + wget $vestacp/bind/named.conf -O /etc/bind/named.conf sed -i "s%listen-on%//listen%" /etc/bind/named.conf.options chown root:bind /etc/bind/named.conf chmod 640 /etc/bind/named.conf aa-complain /usr/sbin/named 2>/dev/null - if [ "$apparmor" = 'yes' ]; then - # echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named 2>/dev/null - sed -i "s#/etc/bind/\*\* rw,#/etc/bind/\*\* rw,\n /home/\*\* rwm,#g" /etc/apparmor.d/usr.sbin.named - sed -i "s#/etc/bind/\*\* r,#/etc/bind/\*\* rw,\n /home/\*\* rwm,#g" /etc/apparmor.d/usr.sbin.named - # service apparmor status >/dev/null 2>&1 - # if [ $? -ne 0 ]; then - systemctl restart apparmor - # fi + echo "/home/** rwm," >> /etc/apparmor.d/local/usr.sbin.named 2>/dev/null + service apparmor status >/dev/null 2>&1 + if [ $? -ne 0 ]; then + service apparmor restart fi - # update-rc.d bind9 defaults - currentservice='bind9' - ensure_startup $currentservice - ensure_start $currentservice + update-rc.d bind9 defaults + service bind9 start + check_result $? "bind9 start failed" fi #----------------------------------------------------------# @@ -1503,17 +1017,11 @@ fi #----------------------------------------------------------# if [ "$exim" = 'yes' ]; then - echo "=== Configure Exim" gpasswd -a Debian-exim mail - cp -f $vestacp/exim/exim4.conf.template /etc/exim4/ - cp -f $vestacp/exim/dnsbl.conf /etc/exim4/ - cp -f $vestacp/exim/spam-blocks.conf /etc/exim4/ - cp -f $vestacp/exim/deny_senders /etc/exim4/ + wget $vestacp/exim/exim4.conf.template -O /etc/exim4/exim4.conf.template + wget $vestacp/exim/dnsbl.conf -O /etc/exim4/dnsbl.conf + wget $vestacp/exim/spam-blocks.conf -O /etc/exim4/spam-blocks.conf touch /etc/exim4/white-blocks.conf - touch /etc/exim4/limit_per_email_account_max_sent_emails_per_hour - touch /etc/exim4/limit_per_email_account_max_recipients - touch /etc/exim4/limit_per_hosting_account_max_sent_emails_per_hour - touch /etc/exim4/limit_per_hosting_account_max_recipients if [ "$spamd" = 'yes' ]; then sed -i "s/#SPAM/SPAM/g" /etc/exim4/exim4.conf.template @@ -1522,12 +1030,6 @@ if [ "$exim" = 'yes' ]; then sed -i "s/#CLAMD/CLAMD/g" /etc/exim4/exim4.conf.template fi - # Generating SRS KEY - the code is taken from HestiaCP - srs=$(gen_pass 16) - echo $srs > /etc/exim4/srs.conf - chmod 640 /etc/exim4/srs.conf - chown root:Debian-exim /etc/exim4/srs.conf - chmod 640 /etc/exim4/exim4.conf.template rm -rf /etc/exim4/domains mkdir -p /etc/exim4/domains @@ -1539,11 +1041,9 @@ if [ "$exim" = 'yes' ]; then update-rc.d -f postfix remove > /dev/null 2>&1 service postfix stop > /dev/null 2>&1 - #update-rc.d exim4 defaults - currentservice='exim4' - ensure_startup $currentservice - systemctl restart $currentservice - # ensure_start $currentservice + update-rc.d exim4 defaults + service exim4 start + check_result $? "exim4 start failed" fi @@ -1552,15 +1052,17 @@ fi #----------------------------------------------------------# if [ "$dovecot" = 'yes' ]; then - echo "=== Configure Dovecot" gpasswd -a dovecot mail - cp -rf $vestacp/dovecot /etc/ - cp -f $vestacp/logrotate/dovecot /etc/logrotate.d/ + wget $vestacp/dovecot.tar.gz -O /etc/dovecot.tar.gz + wget $vestacp/logrotate/dovecot -O /etc/logrotate.d/dovecot + cd /etc + rm -rf dovecot dovecot.conf + tar -xzf dovecot.tar.gz + rm -f dovecot.tar.gz chown -R root:root /etc/dovecot* - # update-rc.d dovecot defaults - currentservice='dovecot' - ensure_startup $currentservice - ensure_start $currentservice + update-rc.d dovecot defaults + service dovecot start + check_result $? "dovecot start failed" fi @@ -1569,40 +1071,24 @@ fi #----------------------------------------------------------# if [ "$clamd" = 'yes' ]; then - echo "=== Configure ClamAV" gpasswd -a clamav mail gpasswd -a clamav Debian-exim - cp -f $vestacp/clamav/clamd.conf /etc/clamav/ - mkdir -p /var/lib/clamav + wget $vestacp/clamav/clamd.conf -O /etc/clamav/clamd.conf /usr/bin/freshclam - - # update-rc.d clamav-daemon defaults - currentservice='clamav-daemon' - ensure_startup $currentservice - currentservice='clamav-freshclam' - ensure_startup $currentservice - - if [ ! -d "/var/run/clamav" ]; then + update-rc.d clamav-daemon defaults + if [ ! -d "/var/run/clamav" ]; then mkdir /var/run/clamav fi chown -R clamav:clamav /var/run/clamav if [ -e "/lib/systemd/system/clamav-daemon.service" ]; then - exec_pre1='ExecStartPre=-/bin/mkdir -p /var/run/clamav' - exec_pre2='ExecStartPre=-/bin/chown -R clamav:clamav /var/run/clamav' - sed -i "s|\[Service\]|[Service]\n$exec_pre1\n$exec_pre2|g" /lib/systemd/system/clamav-daemon.service + exec_pre1='ExecStartPre=/bin/mkdir -p /var/run/clamav' + exec_pre2='ExecStartPre=/bin/chown -R clamav:clamav /var/run/clamav' + sed -i "s|\[Service\]/|[Service]\n$exec_pre1\n$exec_pre2|g" \ + /lib/systemd/system/clamav-daemon.service systemctl daemon-reload fi - clamavfolder="/var/lib/clamav" - if [ -d "$clamavfolder" ]; then - echo "=== Blocking executable files inside zip/rar/tar archives in ClamAV" - wget -nv -O $clamavfolder/foxhole_all.cdb http://c.myvestacp.com/tools/clamav/foxhole_all.cdb - chown clamav:clamav $clamavfolder/foxhole_all.cdb - fi - - currentservice='clamav-daemon' - ensure_start $currentservice - currentservice='clamav-freshclam' - ensure_start $currentservice + service clamav-daemon start + check_result $? "clamav-daeom start failed" fi @@ -1611,35 +1097,14 @@ fi #----------------------------------------------------------# if [ "$spamd" = 'yes' ]; then - echo "=== Configure SpamAssassin" - #update-rc.d spamassassin defaults - if [ "$release" -lt 12 ]; then - sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin - currentservice='spamassassin' - else - currentservice='spamd' + update-rc.d spamassassin defaults + sed -i "s/ENABLED=0/ENABLED=1/" /etc/default/spamassassin + service spamassassin start + check_result $? "spamassassin start failed" + unit_files="$(systemctl list-unit-files |grep spamassassin)" + if [[ "$unit_files" =~ "disabled" ]]; then + systemctl enable spamassassin fi - - echo "=== Creating spamassassin /nonexistent folder" - mkdir /nonexistent - mkdir /nonexistent/.spamassassin - chown -R nobody:debian-spamd /nonexistent - - echo "=== Patching spamassassin dns_server" - sed -i "s/report_safe 1/report_safe 1\n\ndns_server 127.0.0.1/g" /etc/spamassassin/local.cf - - echo "== Adding myVesta rules to SpamAssassin" - cat < /etc/spamassassin/myvesta.cf -score RCVD_IN_RP_SAFE 0 -score RCVD_IN_RP_CERTIFIED 0 -score SPF_FAIL 3.0 -score SPF_SOFTFAIL 4.0 -score SPF_NONE 4.0 -EOF - - wget -nv -O /etc/spamassassin/barracuda.cf http://c.myvestacp.com/tools/spamassassin/barracuda.cf - ensure_startup $currentservice - systemctl restart $currentservice fi @@ -1647,45 +1112,37 @@ fi # Configure RoundCube # #----------------------------------------------------------# -if [ "$exim" = 'yes' ] && { [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; } then - echo "=== Configure RoundCube" +if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then if [ "$apache" = 'yes' ]; then - cp -f $vestacp/roundcube/apache.conf /etc/roundcube/ + wget $vestacp/roundcube/apache.conf -O /etc/roundcube/apache.conf ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf fi - cp -f $vestacp/roundcube/main.inc.php /etc/roundcube/ - cp -f $vestacp/roundcube/db.inc.php /etc/roundcube/ + wget $vestacp/roundcube/main.inc.php -O /etc/roundcube/main.inc.php + wget $vestacp/roundcube/db.inc.php -O /etc/roundcube/db.inc.php chmod 640 /etc/roundcube/debian-db-roundcube.php chmod 640 /etc/roundcube/config.inc.php chown root:www-data /etc/roundcube/debian-db-roundcube.php chown root:www-data /etc/roundcube/config.inc.php - cp -f $vestacp/roundcube/vesta.php \ - /usr/share/roundcube/plugins/password/drivers/ - cp -f $vestacp/roundcube/config.inc.php /etc/roundcube/plugins/password/ + wget $vestacp/roundcube/vesta.php -O \ + /usr/share/roundcube/plugins/password/drivers/vesta.php + wget $vestacp/roundcube/config.inc.php -O \ + /etc/roundcube/plugins/password/config.inc.php r="$(gen_pass)" mysql -e "CREATE DATABASE roundcube" - if [ "$mysql8" = 'yes' ]; then - mysql -e "CREATE USER 'roundcube'@'localhost' IDENTIFIED BY '$r';" - mysql -e "GRANT ALL ON roundcube.* - TO roundcube@localhost" - else - mysql -e "GRANT ALL ON roundcube.* - TO roundcube@localhost IDENTIFIED BY '$r'" - fi + mysql -e "GRANT ALL ON roundcube.* + TO roundcube@localhost IDENTIFIED BY '$r'" sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php sed -i "s/localhost/$servername/g" \ /etc/roundcube/plugins/password/config.inc.php mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql chmod a+r /etc/roundcube/main.inc.php - mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php - mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php - chmod 640 /etc/roundcube/debian-db-roundcube.php - chmod 640 /etc/roundcube/config.inc.php - chown root:www-data /etc/roundcube/debian-db-roundcube.php - chown root:www-data /etc/roundcube/config.inc.php - sed -i "s#^\$config\['smtp_user'\].*#\$config\['smtp_user'\] = '%u';#g" /etc/roundcube/defaults.inc.php - sed -i "s#^\$config\['smtp_pass'\].*#\$config\['smtp_pass'\] = '%p';#g" /etc/roundcube/defaults.inc.php if [ "$release" -eq 8 ]; then + mv -f /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php + mv -f /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php + chmod 640 /etc/roundcube/debian-db-roundcube.php + chmod 640 /etc/roundcube/config.inc.php + chown root:www-data /etc/roundcube/debian-db-roundcube.php + chown root:www-data /etc/roundcube/config.inc.php # RoundCube tinyMCE fix tinymceFixArchiveURL=$vestacp/roundcube/roundcube-tinymce.tar.gz tinymceParentFolder=/usr/share/roundcube/program/js @@ -1718,8 +1175,10 @@ fi #----------------------------------------------------------# if [ "$fail2ban" = 'yes' ]; then - echo "=== Configure Fail2Ban" - cp -rf $vestacp/fail2ban /etc/ + cd /etc + wget $vestacp/fail2ban.tar.gz -O fail2ban.tar.gz + tar -xzf fail2ban.tar.gz + rm -f fail2ban.tar.gz if [ "$dovecot" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) @@ -1730,40 +1189,9 @@ if [ "$fail2ban" = 'yes' ]; then fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/true/false/" /etc/fail2ban/jail.local fi - if [ "$vsftpd" = 'yes' ]; then - #Create vsftpd Log File - if [ ! -f "/var/log/vsftpd.log" ]; then - touch /var/log/vsftpd.log - fi - fline=$(cat /etc/fail2ban/jail.local |grep -n vsftpd-iptables -A 2) - fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) - sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local - fi - if [ ! -e /var/log/auth.log ]; then - # Debian workaround: auth logging was moved to systemd - # We took this fix from HestiaCP - touch /var/log/auth.log - chmod 640 /var/log/auth.log - chown root:adm /var/log/auth.log - fi - if [ "$proftpd" = 'yes' ]; then - cat <> /etc/fail2ban/jail.local - -[proftpd] -enabled = true -filter = proftpd -action = vesta[name=FTP] -port = ftp,ftp-data,ftps,ftps-data -logpath = %(proftpd_log)s -backend = %(proftpd_backend)s -maxretry = 5 -EOF - fi - - #update-rc.d fail2ban defaults - currentservice='fail2ban' - ensure_startup $currentservice - ensure_start $currentservice + update-rc.d fail2ban defaults + service fail2ban start + check_result $? "fail2ban start failed" fi @@ -1771,13 +1199,7 @@ fi # Configure Admin User # #----------------------------------------------------------# -echo "=== Configure Admin User" -if [ "$release" -gt 10 ]; then - echo "=== Switching to sha512" - sed -i "s/yescrypt/sha512/g" /etc/pam.d/common-password -fi - -echo "== Deleting old admin user" +# Deleting old admin user if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then chattr -i /home/admin/conf > /dev/null 2>&1 userdel -f admin >/dev/null 2>&1 @@ -1785,61 +1207,46 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then mv -f /home/admin $vst_backups/home/ >/dev/null 2>&1 rm -f /tmp/sess_* >/dev/null 2>&1 fi -if [ ! -z "$(grep ^admin: /etc/group)" ]; then +if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then groupdel admin > /dev/null 2>&1 fi -echo "== Adding vesta account" +# Adding vesta account $VESTA/bin/v-add-user admin $vpass $email default System Administrator check_result $? "can't create admin user" $VESTA/bin/v-change-user-shell admin bash $VESTA/bin/v-change-user-language admin $lang -if [ "$exim" = 'yes' ] && { [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; } then - echo "== RoundCube permissions fix" +# RoundCube permissions fix +if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then if [ ! -d "/var/log/roundcube" ]; then mkdir /var/log/roundcube fi chown admin:admin /var/log/roundcube fi -# Vesta data sessions permissions -chown admin:admin $VESTA/data/sessions - -echo "== Configuring system ips (this can take a few minutes, relax)" +# Configuring system ips $VESTA/bin/v-update-sys-ip -echo "== Get main ip" +# Get main ip ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) local_ip=$ip -# Writing '$ip $servername' to /etc/hosts -echo "== Writing '$ip $servername' to /etc/hosts" -sed -i "/$servername/d" /etc/hosts -subdomain=$(echo "$servername" | cut -d . -f-1) -if [ "$servername" != "$subdomain" ]; then - echo "$ip $servername $subdomain" >> /etc/hosts -else - echo "$ip $servername" >> /etc/hosts -fi - # Firewall configuration if [ "$iptables" = 'yes' ]; then - echo "== Firewall configuration" $VESTA/bin/v-update-firewall fi -echo "== Get public ip" -pub_ip=$(curl -4 -s https://scripts.myvestacp.com/ip.php) +# Get public ip +pub_ip=$(curl -s vestacp.com/what-is-my-ip/) if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then - echo "== NAT detected" $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip ip=$pub_ip fi +# Configuring libapache2-mod-remoteip if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then - echo "== Configuring libapache2-mod-remoteip" cd /etc/apache2/mods-available echo "" > remoteip.conf echo " RemoteIPHeader X-Real-IP" >> remoteip.conf @@ -1858,83 +1265,23 @@ if [ "$apache" = 'yes' ] && [ "$nginx" = 'yes' ] ; then service apache2 restart fi -if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then - echo "== Configuring mysql host" - $VESTA/bin/v-add-database-host mysql localhost root $mpass - # $VESTA/bin/v-add-database admin default default $(gen_pass) mysql +# Configuring mysql host +if [ "$mysql" = 'yes' ]; then + $VESTA/bin/v-add-database-host mysql localhost root $vpass + $VESTA/bin/v-add-database admin default default $(gen_pass) mysql fi +# Configuring pgsql host if [ "$postgresql" = 'yes' ]; then - echo "== Configuring pgsql host" - $VESTA/bin/v-add-database-host pgsql localhost postgres $ppass + $VESTA/bin/v-add-database-host pgsql localhost postgres $vpass $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql fi -echo "== Adding default domain" +# Adding default domain $VESTA/bin/v-add-domain admin $servername check_result $? "can't create $servername domain" -if [ "$named" = 'yes' ]; then - echo "== Adding ns1 and ns2 A records" - /usr/local/vesta/bin/v-add-dns-record 'admin' "$servername" 'ns1' 'A' "$pub_ip" - /usr/local/vesta/bin/v-add-dns-record 'admin' "$servername" 'ns2' 'A' "$pub_ip" -fi - -if [ "$release" -eq 10 ]; then - if [ -f "/etc/php/7.3/fpm/pool.d/$servername.conf" ]; then - echo "== FPM pool.d $servername tweaks" - sed -i "/^group =/c\group = www-data" /etc/php/7.3/fpm/pool.d/$servername.conf - sed -i "/max_execution_time/c\php_admin_value[max_execution_time] = 900" /etc/php/7.3/fpm/pool.d/$servername.conf - sed -i "/request_terminate_timeout/c\request_terminate_timeout = 900s" /etc/php/7.3/fpm/pool.d/$servername.conf - sed -i "s|80M|800M|g" /etc/php/7.3/fpm/pool.d/$servername.conf - sed -i "s|256M|512M|g" /etc/php/7.3/fpm/pool.d/$servername.conf - service php7.3-fpm restart - ln -s /var/lib/roundcube /var/lib/roundcube/webmail - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl 'admin' "$servername" 'hosting-webmail-phpmyadmin' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'no' - fi -fi -if [ "$release" -eq 11 ]; then - if [ -f "/etc/php/7.4/fpm/pool.d/$servername.conf" ]; then - echo "== FPM pool.d $servername tweaks" - sed -i "/^group =/c\group = www-data" /etc/php/7.4/fpm/pool.d/$servername.conf - sed -i "/max_execution_time/c\php_admin_value[max_execution_time] = 900" /etc/php/7.4/fpm/pool.d/$servername.conf - sed -i "/request_terminate_timeout/c\request_terminate_timeout = 900s" /etc/php/7.4/fpm/pool.d/$servername.conf - sed -i "s|80M|800M|g" /etc/php/7.4/fpm/pool.d/$servername.conf - sed -i "s|256M|512M|g" /etc/php/7.4/fpm/pool.d/$servername.conf - service php7.4-fpm restart - ln -s /var/lib/roundcube /var/lib/roundcube/webmail - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl 'admin' "$servername" 'hosting-webmail-phpmyadmin' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'yes' - fi -fi -if [ "$release" -eq 12 ]; then - if [ -f "/etc/php/8.2/fpm/pool.d/$servername.conf" ]; then - echo "== FPM pool.d $servername tweaks" - sed -i "/^group =/c\group = www-data" /etc/php/8.2/fpm/pool.d/$servername.conf - sed -i "/max_execution_time/c\php_admin_value[max_execution_time] = 900" /etc/php/8.2/fpm/pool.d/$servername.conf - sed -i "/request_terminate_timeout/c\request_terminate_timeout = 900s" /etc/php/8.2/fpm/pool.d/$servername.conf - sed -i "s|80M|800M|g" /etc/php/8.2/fpm/pool.d/$servername.conf - sed -i "s|256M|512M|g" /etc/php/8.2/fpm/pool.d/$servername.conf - service php8.2-fpm restart - ln -s /var/lib/roundcube /var/lib/roundcube/webmail - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl 'admin' "$servername" 'hosting-webmail-phpmyadmin' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'yes' - fi -fi -if [ "$release" -eq 13 ]; then - if [ -f "/etc/php/8.4/fpm/pool.d/$servername.conf" ]; then - echo "== FPM pool.d $servername tweaks" - sed -i "/^group =/c\group = www-data" /etc/php/8.4/fpm/pool.d/$servername.conf - sed -i "/max_execution_time/c\php_admin_value[max_execution_time] = 900" /etc/php/8.4/fpm/pool.d/$servername.conf - sed -i "/request_terminate_timeout/c\request_terminate_timeout = 900s" /etc/php/8.4/fpm/pool.d/$servername.conf - sed -i "s|80M|800M|g" /etc/php/8.4/fpm/pool.d/$servername.conf - sed -i "s|256M|512M|g" /etc/php/8.4/fpm/pool.d/$servername.conf - service php8.4-fpm restart - ln -s /var/lib/roundcube /var/lib/roundcube/webmail - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl 'admin' "$servername" 'hosting-webmail-phpmyadmin' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'yes' - fi -fi - - -echo "== Adding cron jobs" +# Adding cron jobs command="sudo $VESTA/bin/v-update-sys-queue disk" $VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command" command="sudo $VESTA/bin/v-update-sys-queue traffic" @@ -1944,274 +1291,80 @@ $VESTA/bin/v-add-cron-job 'admin' '30' '03' '*' '*' '*' "$command" command="sudo $VESTA/bin/v-update-sys-queue backup" $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" command="sudo $VESTA/bin/v-backup-users" -$VESTA/bin/v-add-cron-job 'admin' '10' '01' '*' '*' '6' "$command" +$VESTA/bin/v-add-cron-job 'admin' '10' '05' '*' '*' '*' "$command" command="sudo $VESTA/bin/v-update-user-stats" $VESTA/bin/v-add-cron-job 'admin' '20' '00' '*' '*' '*' "$command" command="sudo $VESTA/bin/v-update-sys-rrd" $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-fix-website-permissions-for-all-websites-only-php" -$VESTA/bin/v-add-cron-job 'admin' '05' '03' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-df-snapshot-make" -$VESTA/bin/v-add-cron-job 'admin' '05' '04' '*' '*' '*' "$command" -command="sudo $VESTA/bin/v-df-snapshot-logs-cleaner" -$VESTA/bin/v-add-cron-job 'admin' '10' '04' '*' '*' '*' "$command" -systemctl restart cron.service +service cron restart -echo "== Building inititall rrd images" +# Building inititall rrd images $VESTA/bin/v-update-sys-rrd +# Enabling file system quota if [ "$quota" = 'yes' ]; then - echo "== Enabling file system quota" $VESTA/bin/v-add-sys-quota fi -echo "== Enabling softaculous plugin" +# Enabling softaculous plugin if [ "$softaculous" = 'yes' ]; then $VESTA/bin/v-add-vesta-softaculous fi # Starting vesta service -#update-rc.d vesta defaults -currentservice='vesta' -ensure_startup $currentservice -ensure_start $currentservice +update-rc.d vesta defaults +service vesta start +check_result $? "vesta start failed" chown admin:admin $VESTA/data/sessions -echo "== Adding notifications" +# Adding notifications $VESTA/upd/add_notifications.sh -echo "== Adding cronjob for autoupdates" +# Adding cronjob for autoupdates $VESTA/bin/v-add-cron-vesta-autoupdate #----------------------------------------------------------# -# Custom work # +# Vesta Access Info # #----------------------------------------------------------# -echo "=== Installing additional PHP libs" -if [ "$release" -eq 9 ]; then - apt-get -y install php7.0-apcu php7.0-mbstring php7.0-bcmath php7.0-curl php7.0-gd php7.0-intl php7.0-mcrypt php7.0-mysql php7.0-mysqlnd php7.0-pdo php7.0-soap php7.0-json php7.0-xml php7.0-zip php7.0-memcache php7.0-memcached php7.0-zip php7.0-imagick php7.0-imap -fi -if [ "$release" -eq 10 ]; then - apt-get -y install php7.3-apcu php7.3-mbstring php7.3-bcmath php7.3-curl php7.3-gd php7.3-intl php7.3-mysql php7.3-mysqlnd php7.3-pdo php7.3-soap php7.3-json php7.3-xml php7.3-zip php7.3-memcache php7.3-memcached php7.3-zip php7.3-imagick php7.3-imap -fi -if [ "$release" -eq 11 ]; then - apt-get -y install php7.4-apcu php7.4-mbstring php7.4-bcmath php7.4-curl php7.4-gd php7.4-intl php7.4-mysql php7.4-mysqlnd php7.4-pdo php7.4-soap php7.4-json php7.4-xml php7.4-zip php7.4-memcache php7.4-memcached php7.4-zip php7.4-imagick php7.4-imap -fi -if [ "$release" -eq 12 ]; then - apt-get -y install php8.2-apcu php8.2-mbstring php8.2-bcmath php8.2-curl php8.2-gd php8.2-intl php8.2-mysql php8.2-mysqlnd php8.2-pdo php8.2-soap php8.2-xml php8.2-zip php8.2-memcache php8.2-memcached php8.2-zip php8.2-imagick php8.2-imap -fi -if [ "$release" -eq 13 ]; then - apt-get -y install php8.4-apcu php8.4-mbstring php8.4-bcmath php8.4-curl php8.4-gd php8.4-intl php8.4-mysql php8.4-mysqlnd php8.4-pdo php8.4-soap php8.4-xml php8.4-zip php8.4-memcache php8.4-memcached php8.4-zip php8.4-imagick php8.4-imap -fi - -touch /var/log/php-mail.log -chmod a=rw /var/log/php-mail.log - -if [ "$release" -eq 9 ]; then - if [ "$apache" = 'yes' ]; then - if [ $memory -lt 10000000 ]; then - echo "=== Patching php7.0-vps" - mkdir -p /root/vesta-temp-dl/vesta/patch - cp $vestacp/php/php7.0-vps.patch /root/vesta-temp-dl/vesta/patch/php7.0-vps.patch - patch -p1 --directory=/ < /root/vesta-temp-dl/vesta/patch/php7.0-vps.patch - fi - if [ $memory -gt 9999999 ]; then - echo "=== Patching php7.0-dedi" - mkdir -p /root/vesta-temp-dl/vesta/patch - cp $vestacp/php/php7.0-dedi.patch /root/vesta-temp-dl/vesta/patch/php7.0-dedi.patch - patch -p1 --directory=/ < /root/vesta-temp-dl/vesta/patch/php7.0-dedi.patch - fi - fi - update-alternatives --set php /usr/bin/php7.0 -fi - -if [ "$release" -eq 10 ]; then - if [ $memory -lt 10000000 ]; then - echo "=== Patching php7.3-vps" - patch /etc/php/7.3/fpm/php.ini < $vestacp/php/php7.3-vps.patch - fi - if [ $memory -gt 9999999 ]; then - echo "=== Patching php7.3-dedi" - patch /etc/php/7.3/fpm/php.ini < $vestacp/php/php7.3-dedi.patch - fi - update-alternatives --set php /usr/bin/php7.3 - service php7.3-fpm restart -fi - -if [ "$release" -eq 11 ]; then - if [ $memory -lt 10000000 ]; then - echo "=== Patching php7.4-vps" - patch /etc/php/7.4/fpm/php.ini < $vestacp/php/php7.4-vps.patch - fi - if [ $memory -gt 9999999 ]; then - echo "=== Patching php7.4-dedi" - patch /etc/php/7.4/fpm/php.ini < $vestacp/php/php7.4-dedi.patch - fi - update-alternatives --set php /usr/bin/php7.4 - service php7.4-fpm restart -fi - -if [ "$release" -eq 12 ]; then - echo "=== Patching php8.2" - patch /etc/php/8.2/fpm/php.ini < /usr/local/vesta/src/deb/for-download/tools/patches/php8.2.patch - update-alternatives --set php /usr/bin/php8.2 - service php8.2-fpm restart -fi - -if [ "$release" -eq 13 ]; then - echo "=== Patching php8.4" - patch /etc/php/8.4/fpm/php.ini < /usr/local/vesta/src/deb/for-download/tools/patches/php8.2.patch - update-alternatives --set php /usr/bin/php8.4 - service php8.4-fpm restart -fi - -# echo "=== Patching rcube_vcard.php" -# wget -nv https://c.myvestacp.com/tools/patches/rcube_vcard.patch -O /root/rcube_vcard.patch -# patch /usr/share/roundcube/program/lib/Roundcube/rcube_vcard.php < /root/rcube_vcard.patch +# Sending install notification to vestacp.com +wget vestacp.com/notify/?$codename -O /dev/null -q # Comparing hostname and ip -make_ssl=0 -host_ip=$(host $servername | head -n 1 | awk '{print $NF}') -if [ "$host_ip" != "$pub_ip" ]; then - echo "***** PROBLEM: Hostname $servername is not pointing to your server (IP address $ip)" - echo "Without pointing your hostname to your IP, LetsEncrypt SSL will not be generated for your server hostname." - echo "Try to setup an A record in your DNS, pointing your hostname $servername to IP address $ip and then press ENTER." - echo "(or register ns1.$servername and ns2.$servername as DNS Nameservers and put those Nameservers on $servername domain)" - echo "If we detect that hostname is still not pointing to your IP, installer will not add LetsEncrypt SSL certificate to your hosting panel (unsigned SSL will be used instead)." - read -p "To force to try anyway to add LetsEncrypt, press f and then ENTER." answer - host_ip=$(host $servername | head -n 1 | awk '{print $NF}') -fi -if [ "$answer" = "f" ]; then - make_ssl=1 -fi +host_ip=$(host $servername| head -n 1 | awk '{print $NF}') if [ "$host_ip" = "$ip" ]; then ip="$servername" - make_ssl=1 fi -if [ $make_ssl -eq 1 ]; then - # Check if www is also pointing to our IP - www_host="www.$servername" - www_host_ip=$(host $www_host | head -n 1 | awk '{print $NF}') - if [ "$www_host_ip" != "$pub_ip" ]; then - if [ "$named" = 'yes' ]; then - echo "=== Deleting www to server hostname" - $VESTA/bin/v-delete-web-domain-alias 'admin' "$servername" "$www_host" 'no' - $VESTA/bin/v-delete-dns-on-web-alias 'admin' "$servername" "$www_host" 'no' - fi - www_host="" - fi -fi - -echo "===" -echo "Hostname $servername is pointing to $host_ip" - -if [ $make_ssl -eq 1 ]; then - echo "=== Generating HOSTNAME SSL" - $VESTA/bin/v-add-letsencrypt-domain 'admin' "$servername" "$www_host" 'yes' - $VESTA/bin/v-update-host-certificate 'admin' "$servername" -else - echo "We will not generate SSL because of this" -fi -echo "===" -echo "UPDATE_HOSTNAME_SSL='yes'" >> $VESTA/conf/vesta.conf - -# folder for upgrade notations -if [ ! -d "/usr/local/vesta/data/upgrades" ]; then - mkdir -p /usr/local/vesta/data/upgrades -fi -touch /usr/local/vesta/data/upgrades/tune-fpm-config-files-v1 -touch /usr/local/vesta/data/upgrades/tune-fpm-config-files-v2 -touch /usr/local/vesta/data/upgrades/allow-backup-anytime -touch /usr/local/vesta/data/upgrades/fix-sudoers -touch /usr/local/vesta/data/upgrades/change-clamav-socket-v2 -touch /usr/local/vesta/data/upgrades/change-clamav-socket-v3 -touch /usr/local/vesta/data/upgrades/change-clamav-socket-v4 -touch /usr/local/vesta/data/upgrades/keeping-mpm-event -touch /usr/local/vesta/data/upgrades/keeping-mpm-event-2 -touch /usr/local/vesta/data/upgrades/keeping-mpm-event-3 -touch /usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates -touch /usr/local/vesta/data/upgrades/clamav_block_exe_in_archives -touch /usr/local/vesta/data/upgrades/clearing-letsencrypt-pipe -touch /usr/local/vesta/data/upgrades/limit_max_recipients -touch /usr/local/vesta/data/upgrades/roundcube_smtp_auth -touch /usr/local/vesta/data/upgrades/apache_status_public_access -touch /usr/local/vesta/data/upgrades/update-cloudflare-ips -touch /usr/local/vesta/data/upgrades/enable-tls-in-proftpd -touch /usr/local/vesta/data/upgrades/enable_cookie_httponly -touch /usr/local/vesta/data/upgrades/fix_exim_494_autoreply -touch /usr/local/vesta/data/upgrades/freshclam_start -touch /usr/local/vesta/data/upgrades/barracuda_rbl -touch /usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed -touch /usr/local/vesta/data/upgrades/v-df-snapshot-make -touch /usr/local/vesta/data/upgrades/fix-website-permissions-for-all-websites-only-php - -# Secret URL -secretquery='' -if [ ! -z "$secret_url" ]; then - echo "=== Set secret URL: $secret_url" - echo " $VESTA/web/inc/login_url.php - secretquery="?$secret_url" -fi - -if [ "$port" != "8083" ]; then - echo "=== Set Vesta port: $port" - $VESTA/bin/v-change-vesta-port $port -fi - -echo "DB_PMA_URL='https://$servername/phpmyadmin/'" >> $VESTA/conf/vesta.conf -if [ "$release" -gt 9 ]; then - echo "=== Set max_length_of_MySQL_username=80" - echo "MAX_DBUSER_LEN=80" >> $VESTA/conf/vesta.conf -fi -echo "ALLOW_BACKUP_ANYTIME='yes'" >> $VESTA/conf/vesta.conf -echo "NOTIFY_ADMIN_FULL_BACKUP='$email'" >> $VESTA/conf/vesta.conf -echo "=== Adding FileManager license to vesta.conf" -echo "FILEMANAGER_KEY='FREEFM'" >> $VESTA/conf/vesta.conf - -# Removing old PHP sessions files -touch /var/spool/cron/crontabs/root -echo "10 2 * * 6 sudo find /home/*/tmp/ -type f -mtime +5 -exec rm {} \;" >> /var/spool/cron/crontabs/root - -if [ -f "/root/.bash_profile" ]; then - echo "=== Adding v-cd-www alias to root bash profile" - echo "alias v-cd-www='source /usr/local/vesta/bin/v-change-dir-www'" >> /root/.bash_profile -fi - -#----------------------------------------------------------# -# myVesta Access Info # -#----------------------------------------------------------# - # Sending notification to admin email echo -e "Congratulations, you have just successfully installed \ -myVesta Control Panel +Vesta Control Panel -https://$ip:$port/$secretquery -username: admin -password: $vpass + https://$ip:8083 + username: admin + password: $vpass -We hope that you enjoy your installation of myVesta. Please \ +We hope that you enjoy your installation of Vesta. Please \ feel free to contact us anytime if you have any questions. Thank you. -- Sincerely yours -myvestacp.com team +vestacp.com team " > $tmpfile send_mail="$VESTA/web/inc/mail-wrapper.php" -cat $tmpfile | $send_mail -s "myVesta Control Panel" $email +cat $tmpfile | $send_mail -s "Vesta Control Panel" $email # Congrats -echo '==========================================' +echo '=======================================================' echo -echo " __ __ _ " -echo " _ __ ___ _ \ \ / /__ ___| |_ __ _ " -echo " | '_ \` _ \| | | \ \ / / _ \/ __| __/ _\` |" -echo " | | | | | | |_| |\ V / __/\__ \ || (_| |" -echo " |_| |_| |_|\__, | \_/ \___||___/\__\__,_|" -echo " |___/ " +echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_| ' +echo ' _| _| _| _| _| _| _| ' +echo ' _| _| _|_|_| _|_| _| _|_|_|_| ' +echo ' _| _| _| _| _| _| _| ' +echo ' _| _|_|_|_| _|_|_| _| _| _| ' echo echo cat $tmpfile diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh old mode 100644 new mode 100755 index 6f691faa..1ba55cdf --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -1,9 +1,5 @@ #!/bin/bash -echo "Sorry, CentOS is not supported." -echo "myVesta supports only Debian." -exit; - # Vesta RHEL/CentOS installer v.05 #----------------------------------------------------------# @@ -20,27 +16,30 @@ arch=$(uname -i) os=$(cut -f 1 -d ' ' /etc/redhat-release) release=$(grep -o "[0-9]" /etc/redhat-release |head -n1) codename="${os}_$release" -vestacp="$VESTA/install/$VERSION/$release" +vestacp="http://$CHOST/$VERSION/$release" -# Defining software pack for all distros -software="nginx awstats bc bind bind-libs bind-utils clamav-server clamav-update - curl dovecot e2fsprogs exim expect fail2ban flex freetype ftp GeoIP httpd - ImageMagick iptables-services jwhois lsof mailx mariadb mariadb-server mc - mod_fcgid mod_ruid2 mod_ssl net-tools ntp openssh-clients pcre php - php-bcmath php-cli php-common php-fpm php-gd php-imap php-mbstring - php-mcrypt phpMyAdmin php-mysql php-pdo phpPgAdmin php-pgsql php-soap - php-tidy php-xml php-xmlrpc postgresql postgresql-contrib - postgresql-server proftpd roundcubemail rrdtool rsyslog screen - spamassassin sqlite sudo tar telnet unzip vesta vesta-ioncube vesta-nginx - vesta-php vesta-softaculous vim-common vsftpd webalizer which zip" - -# Fix for old releases -if [ "$release" -lt 7 ]; then - software=$(echo "$software" |sed -e "s/mariadb/mysql/g") - software=$(echo "$software" |sed -e "s/clamav-server/clamd/") - software=$(echo "$software" |sed -e "s/clamav-update//") - software=$(echo "$software" |sed -e "s/iptables-services//") - software="$software mod_extract_forwarded" +if [ "$release" -eq 7 ]; then + software="nginx httpd mod_ssl mod_ruid2 mod_fcgid php php-common php-cli + php-bcmath php-gd php-imap php-mbstring php-mcrypt php-mysql php-pdo + php-soap php-tidy php-xml php-xmlrpc php-fpm php-pgsql awstats webalizer + vsftpd proftpd bind bind-utils bind-libs exim dovecot clamav-server + clamav-update spamassassin roundcubemail mariadb mariadb-server phpMyAdmin + postgresql postgresql-server postgresql-contrib phpPgAdmin e2fsprogs + openssh-clients ImageMagick curl mc screen ftp zip unzip flex sqlite pcre + sudo bc jwhois mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype + fail2ban rsyslog iptables-services which vesta vesta-nginx vesta-php + vim-common expect vesta-ioncube vesta-softaculous" +else + software="nginx httpd mod_ssl mod_ruid2 mod_fcgid mod_extract_forwarded + php php-common php-cli php-bcmath php-gd php-imap php-mbstring php-mcrypt + php-mysql php-pdo php-soap php-tidy php-xml php-xmlrpc php-fpm php-pgsql + awstats webalizer vsftpd proftpd bind bind-utils bind-libs exim dovecot + clamd spamassassin roundcubemail mysql mysql-server phpMyAdmin postgresql + postgresql-server postgresql-contrib phpPgAdmin e2fsprogs openssh-clients + ImageMagick curl mc screen ftp zip unzip flex sqlite pcre sudo bc jwhois + mailx lsof tar telnet rrdtool net-tools ntp GeoIP freetype fail2ban + which vesta vesta-nginx vesta-php vim-common expect vesta-ioncube + vesta-softaculous" fi # Defining help function @@ -106,7 +105,7 @@ set_default_value() { fi } -# Defining function to set default language value +# Define function to set default language value set_default_lang() { if [ -z "$lang" ]; then eval lang=$1 @@ -126,6 +125,9 @@ set_default_lang() { # Verifications # #----------------------------------------------------------# +# Creating temporary file +tmpfile=$(mktemp -p /tmp) + # Translating argument to --gnu-long-options for arg; do delim="" @@ -237,6 +239,7 @@ if [ "$iptables" = 'no' ]; then fail2ban='no' fi + # Checking root permissions if [ "x$(id -u)" != 'x0' ]; then check_result 1 "Script can be run executed only by root" @@ -257,18 +260,16 @@ if [ ! -e '/usr/bin/wget' ]; then fi # Checking repository availability -wget -q "c.vestacp.com/GPG.txt" -O /dev/null +wget -q "$vestacp/GPG.txt" -O /dev/null check_result $? "No access to Vesta repository" # Checking installed packages -tmpfile=$(mktemp -p /tmp) rpm -qa > $tmpfile for pkg in exim mysql-server httpd nginx vesta; do if [ ! -z "$(grep $pkg $tmpfile)" ]; then conflicts="$pkg $conflicts" fi done -rm -f $tmpfile if [ ! -z "$conflicts" ] && [ -z "$force" ]; then echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!' echo @@ -289,7 +290,7 @@ fi # Brief Info # #----------------------------------------------------------# -# Printing nice ASCII logo +# Printing nice ascii as logo clear echo echo ' _| _| _|_|_|_| _|_|_| _|_|_|_|_| _|_|' @@ -301,7 +302,7 @@ echo echo ' Vesta Control Panel' echo -e "\n\n" -echo 'The following software will be installed on your system:' +echo 'Following software will be installed on your system:' # Web stack if [ "$nginx" = 'yes' ]; then @@ -322,16 +323,16 @@ if [ "$named" = 'yes' ]; then echo ' - Bind DNS Server' fi -# Mail stack +# Mail Stack if [ "$exim" = 'yes' ]; then - echo -n ' - Exim Mail Server' + echo -n ' - Exim mail server' if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then echo -n ' + ' if [ "$clamd" = 'yes' ]; then - echo -n 'ClamAV ' + echo -n 'Antivirus ' fi if [ "$spamd" = 'yes' ]; then - echo -n 'SpamAssassin' + echo -n 'Antispam' fi fi echo @@ -340,9 +341,9 @@ if [ "$exim" = 'yes' ]; then fi fi -# Database stack +# DB stack if [ "$mysql" = 'yes' ]; then - if [ $release -ge 7 ]; then + if [ $release = 7 ]; then echo ' - MariaDB Database Server' else echo ' - MySQL Database Server' @@ -392,7 +393,7 @@ if [ "$interactive" = 'yes' ]; then # Asking to set FQDN hostname if [ -z "$servername" ]; then - read -p "Please enter FQDN hostname [$(hostname -f)]: " servername + read -p "Please enter FQDN hostname [$(hostname)]: " servername fi fi @@ -447,10 +448,10 @@ fi #----------------------------------------------------------# -# Install repository # +# Install repositories # #----------------------------------------------------------# -# Updating system +# Updating system packages yum -y update check_result $? 'yum update failed' @@ -459,8 +460,8 @@ yum install epel-release -y check_result $? "Can't install EPEL repository" # Installing Remi repository -if [ "$remi" = 'yes' ] && [ ! -e "/etc/yum.repos.d/remi.repo" ]; then - rpm -Uvh http://rpms.remirepo.net/enterprise/remi-release-$release.rpm +if [ "$remi" = 'yes' ]; then + rpm -Uvh --force $vestacp/remi-release.rpm check_result $? "Can't install REMI repository" sed -i "s/enabled=0/enabled=1/g" /etc/yum.repos.d/remi.repo fi @@ -481,7 +482,7 @@ echo "baseurl=http://$RHOST/$REPO/$release/\$basearch/" >> $vrepo echo "enabled=1" >> $vrepo echo "gpgcheck=1" >> $vrepo echo "gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA" >> $vrepo -wget c.vestacp.com/GPG.txt -O /etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA +wget $vestacp/GPG.txt -O /etc/pki/rpm-gpg/RPM-GPG-KEY-VESTA #----------------------------------------------------------# @@ -494,53 +495,53 @@ cd $vst_backups mkdir nginx httpd php php-fpm vsftpd proftpd named exim dovecot clamd \ spamassassin mysql postgresql mongodb vesta -# Backup Nginx configuration +# Backing up Nginx configuration service nginx stop > /dev/null 2>&1 cp -r /etc/nginx/* $vst_backups/nginx > /dev/null 2>&1 -# Backup Apache configuration +# Backing up Apache configuration service httpd stop > /dev/null 2>&1 cp -r /etc/httpd/* $vst_backups/httpd > /dev/null 2>&1 -# Backup PHP-FPM configuration +# Backing up PHP configuration service php-fpm stop >/dev/null 2>&1 cp /etc/php.ini $vst_backups/php > /dev/null 2>&1 cp -r /etc/php.d $vst_backups/php > /dev/null 2>&1 cp /etc/php-fpm.conf $vst_backups/php-fpm > /dev/null 2>&1 mv -f /etc/php-fpm.d/* $vst_backups/php-fpm/ > /dev/null 2>&1 -# Backup Bind configuration +# Backing up Bind configuration yum remove bind-chroot > /dev/null 2>&1 service named stop > /dev/null 2>&1 cp /etc/named.conf $vst_backups/named >/dev/null 2>&1 -# Backup Vsftpd configuration +# Backing up Vsftpd configuration service vsftpd stop > /dev/null 2>&1 cp /etc/vsftpd/vsftpd.conf $vst_backups/vsftpd >/dev/null 2>&1 -# Backup ProFTPD configuration +# Backing up ProFTPD configuration service proftpd stop > /dev/null 2>&1 cp /etc/proftpd.conf $vst_backups/proftpd >/dev/null 2>&1 -# Backup Exim configuration +# Backing up Exim configuration service exim stop > /dev/null 2>&1 cp -r /etc/exim/* $vst_backups/exim >/dev/null 2>&1 -# Backup ClamAV configuration +# Backing up ClamAV configuration service clamd stop > /dev/null 2>&1 cp /etc/clamd.conf $vst_backups/clamd >/dev/null 2>&1 cp -r /etc/clamd.d $vst_backups/clamd >/dev/null 2>&1 -# Backup SpamAssassin configuration +# Backing up SpamAssassin configuration service spamassassin stop > /dev/null 2>&1 cp -r /etc/mail/spamassassin/* $vst_backups/spamassassin >/dev/null 2>&1 -# Backup Dovecot configuration +# Backing up Dovecot configuration service dovecot stop > /dev/null 2>&1 cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 -# Backup MySQL/MariaDB configuration and data +# Backing up MySQL/MariaDB configuration and data service mysql stop > /dev/null 2>&1 service mysqld stop > /dev/null 2>&1 service mariadb stop > /dev/null 2>&1 @@ -549,18 +550,18 @@ cp /etc/my.cnf $vst_backups/mysql > /dev/null 2>&1 cp /etc/my.cnf.d $vst_backups/mysql > /dev/null 2>&1 mv /root/.my.cnf $vst_backups/mysql > /dev/null 2>&1 -# Backup MySQL/MariaDB configuration and data +# Backing up MySQL/MariaDB configuration and data service postgresql stop > /dev/null 2>&1 mv /var/lib/pgsql/data $vst_backups/postgresql/ >/dev/null 2>&1 -# Backup Vesta +# Backing up Vesta configuration and data service vesta stop > /dev/null 2>&1 mv $VESTA/data/* $vst_backups/vesta > /dev/null 2>&1 mv $VESTA/conf/* $vst_backups/vesta > /dev/null 2>&1 #----------------------------------------------------------# -# Package Excludes # +# Package Exludes # #----------------------------------------------------------# # Excluding packages @@ -635,16 +636,13 @@ fi #----------------------------------------------------------# # Installing rpm packages -yum install -y $software -if [ $? -ne 0 ]; then - if [ "$remi" = 'yes' ]; then - yum -y --disablerepo=* \ - --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \ - install $software - else - yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \ - install $software - fi +if [ "$remi" = 'yes' ]; then + yum -y --disablerepo=* \ + --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \ + install $software +else + yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \ + install $software fi check_result $? "yum install failed" @@ -673,10 +671,8 @@ if [ -e '/etc/sysconfig/selinux' ]; then setenforce 0 2>/dev/null fi -# Disabling iptables +# Disable iptables service iptables stop -service firewalld stop >/dev/null 2>&1 - # Configuring NTP synchronization echo '#!/bin/sh' > /etc/cron.daily/ntpdate @@ -692,13 +688,9 @@ adduser backup 2>/dev/null ln -sf /home/backup /backup chmod a+x /backup -# Set directory color +# Chaning default directory color echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile -# Register /sbin/nologin and /usr/sbin/nologin -echo "/sbin/nologin" >> /etc/shells -echo "/usr/sbin/nologin" >> /etc/shells - # Changing default systemd interval if [ "$release" -eq '7' ]; then # Hi Lennart @@ -712,9 +704,9 @@ fi # Configure VESTA # #----------------------------------------------------------# -# Installing sudo configuration +# Downlading sudo configuration mkdir -p /etc/sudoers.d -cp -f $vestacp/sudo/admin /etc/sudoers.d/ +wget $vestacp/sudo/admin -O /etc/sudoers.d/admin chmod 440 /etc/sudoers.d/admin # Configuring system env @@ -726,9 +718,9 @@ echo 'export PATH' >> /root/.bash_profile source /root/.bash_profile # Configuring logrotate for vesta logs -cp -f $vestacp/logrotate/vesta /etc/logrotate.d/ +wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta -# Building directory tree and creating some blank files for Vesta +# Buidling directory tree and creating some blank files for vesta mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ $VESTA/data/queue $VESTA/data/users $VESTA/data/firewall \ $VESTA/data/sessions @@ -742,13 +734,14 @@ chmod 660 $VESTA/log/* rm -f /var/log/vesta ln -s $VESTA/log /var/log/vesta chmod 770 $VESTA/data/sessions +chown admin:admin $VESTA/data/sessions -# Generating Vesta configuration +# Generating vesta configuration rm -f $VESTA/conf/vesta.conf 2>/dev/null touch $VESTA/conf/vesta.conf chmod 660 $VESTA/conf/vesta.conf -# Web stack +# WEB stack if [ "$apache" = 'yes' ] && [ "$nginx" = 'no' ] ; then echo "WEB_SYSTEM='httpd'" >> $VESTA/conf/vesta.conf echo "WEB_RGROUPS='apache'" >> $VESTA/conf/vesta.conf @@ -806,7 +799,7 @@ if [ "$exim" = 'yes' ]; then fi fi -# Cron daemon +# CRON daemon echo "CRON_SYSTEM='crond'" >> $VESTA/conf/vesta.conf # Firewall stack @@ -831,18 +824,26 @@ echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf # Version echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf -# Installing hosting packages -cp -rf $vestacp/packages $VESTA/data/ +# Downloading hosting packages +cd $VESTA/data +wget $vestacp/packages.tar.gz -O packages.tar.gz +tar -xzf packages.tar.gz +rm -f packages.tar.gz -# Installing templates -cp -rf $vestacp/templates $VESTA/data/ +# Downloading templates +wget $vestacp/templates.tar.gz -O templates.tar.gz +tar -xzf templates.tar.gz +rm -f templates.tar.gz # Copying index.html to default documentroot -cp $VESTA/data/templates/web/skel/public_html/index.html /var/www/html/ +cp templates/web/skel/public_html/index.html /var/www/html/ sed -i 's/%domain%/It worked!/g' /var/www/html/index.html -# Installing firewall rules -cp -rf $vestacp/firewall $VESTA/data/ +# Downloading firewall rules +chkconfig firewalld off >/dev/null 2>&1 +wget $vestacp/firewall.tar.gz -O firewall.tar.gz +tar -xzf firewall.tar.gz +rm -f firewall.tar.gz # Configuring server hostname $VESTA/bin/v-change-sys-hostname $servername 2>/dev/null @@ -871,16 +872,16 @@ rm /tmp/vst.pem if [ "$nginx" = 'yes' ]; then rm -f /etc/nginx/conf.d/*.conf - cp -f $vestacp/nginx/nginx.conf /etc/nginx/ - cp -f $vestacp/nginx/status.conf /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phpmyadmin.inc /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/ - cp -f $vestacp/nginx/webmail.inc /etc/nginx/conf.d/ - cp -f $vestacp/logrotate/nginx /etc/logrotate.d/ + wget $vestacp/nginx/nginx.conf -O /etc/nginx/nginx.conf + wget $vestacp/nginx/status.conf -O /etc/nginx/conf.d/status.conf + wget $vestacp/nginx/phpmyadmin.inc -O /etc/nginx/conf.d/phpmyadmin.inc + wget $vestacp/nginx/phppgadmin.inc -O /etc/nginx/conf.d/phppgadmin.inc + wget $vestacp/nginx/webmail.inc -O /etc/nginx/conf.d/webmail.inc + wget $vestacp/logrotate/nginx -O /etc/logrotate.d/nginx echo > /etc/nginx/conf.d/vesta.conf mkdir -p /var/log/nginx/domains - if [ "$release" -ge 7 ]; then - mkdir -p /etc/systemd/system/nginx.service.d + if [ "$release" -eq 7 ]; then + mkdir /etc/systemd/system/nginx.service.d cd /etc/systemd/system/nginx.service.d echo "[Service]" > limits.conf echo "LimitNOFILE=500000" >> limits.conf @@ -890,7 +891,7 @@ if [ "$nginx" = 'yes' ]; then check_result $? "nginx start failed" # Workaround for OpenVZ/Virtuozzo - if [ "$release" -ge '7' ] && [ -e "/proc/vz/veinfo" ]; then + if [ "$release" -eq '7' ] && [ -e "/proc/vz/veinfo" ]; then echo "#Vesta: workraround for networkmanager" >> /etc/rc.local echo "sleep 3 && service nginx restart" >> /etc/rc.local fi @@ -902,30 +903,29 @@ fi #----------------------------------------------------------# if [ "$apache" = 'yes' ]; then - cp -f $vestacp/httpd/httpd.conf /etc/httpd/conf/ - cp -f $vestacp/httpd/status.conf /etc/httpd/conf.d/ - cp -f $vestacp/httpd/ssl.conf /etc/httpd/conf.d/ - cp -f $vestacp/httpd/ruid2.conf /etc/httpd/conf.d/ - cp -f $vestacp/logrotate/httpd /etc/logrotate.d/ - if [ $release -lt 7 ]; then - cd /etc/httpd/conf.d - echo "MEFaccept 127.0.0.1" >> mod_extract_forwarded.conf - echo > proxy_ajp.conf + cd /etc/httpd + wget $vestacp/httpd/httpd.conf -O conf/httpd.conf + wget $vestacp/httpd/status.conf -O conf.d/status.conf + wget $vestacp/httpd/ssl.conf -O conf.d/ssl.conf + wget $vestacp/httpd/ruid2.conf -O conf.d/ruid2.conf + wget $vestacp/logrotate/httpd -O /etc/logrotate.d/httpd + if [ $release -ne 7 ]; then + echo "MEFaccept 127.0.0.1" >> conf.d/mod_extract_forwarded.conf + echo > conf.d/proxy_ajp.conf fi - if [ -e "/etc/httpd/conf.modules.d/00-dav.conf" ]; then - cd /etc/httpd/conf.modules.d - sed -i "s/^/#/" 00-dav.conf 00-lua.conf 00-proxy.conf + if [ -e "conf.modules.d/00-dav.conf" ]; then + sed -i "s/^/#/" conf.modules.d/00-dav.conf conf.modules.d/00-lua.conf + sed -i "s/^/#/" conf.modules.d/00-proxy.conf fi - echo > /etc/httpd/conf.d/vesta.conf - cd /var/log/httpd - touch access_log error_log suexec.log - chmod 640 access_log error_log suexec.log + echo > conf.d/vesta.conf + touch logs/access_log logs/error_log logs/error_log logs/suexec.log + chmod 640 logs/access_log logs/error_log logs/error_log logs/suexec.log chmod -f 777 /var/lib/php/session chmod a+x /var/log/httpd mkdir -p /var/log/httpd/domains chmod 751 /var/log/httpd/domains - if [ "$release" -ge 7 ]; then - mkdir -p /etc/systemd/system/httpd.service.d + if [ "$release" -eq 7 ]; then + mkdir /etc/systemd/system/httpd.service.d cd /etc/systemd/system/httpd.service.d echo "[Service]" > limits.conf echo "LimitNOFILE=500000" >> limits.conf @@ -935,7 +935,7 @@ if [ "$apache" = 'yes' ]; then check_result $? "httpd start failed" # Workaround for OpenVZ/Virtuozzo - if [ "$release" -ge '7' ] && [ -e "/proc/vz/veinfo" ]; then + if [ "$release" -eq '7' ] && [ -e "/proc/vz/veinfo" ]; then echo "#Vesta: workraround for networkmanager" >> /etc/rc.local echo "sleep 2 && service httpd restart" >> /etc/rc.local fi @@ -947,7 +947,7 @@ fi #----------------------------------------------------------# if [ "$phpfpm" = 'yes' ]; then - cp -f $vestacp/php-fpm/www.conf /etc/php-fpm.d/ + wget $vestacp/php-fpm/www.conf -O /etc/php-fpm.d/www.conf chkconfig php-fpm on service php-fpm start check_result $? "php-fpm start failed" @@ -966,20 +966,23 @@ if [ -z "$ZONE" ]; then ZONE='UTC' fi for pconf in $(find /etc/php* -name php.ini); do - sed -i "s|;date.timezone =|date.timezone = $ZONE|g" $pconf + sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf done #----------------------------------------------------------# -# Configure Vsftpd # +# Configure VSFTPD # #----------------------------------------------------------# if [ "$vsftpd" = 'yes' ]; then - cp -f $vestacp/vsftpd/vsftpd.conf /etc/vsftpd/ + wget $vestacp/vsftpd/vsftpd.conf -O /etc/vsftpd/vsftpd.conf chkconfig vsftpd on service vsftpd start check_result $? "vsftpd start failed" + + # To be deleted after release 0.9.8-18 + echo "/sbin/nologin" >> /etc/shells fi @@ -988,7 +991,7 @@ fi #----------------------------------------------------------# if [ "$proftpd" = 'yes' ]; then - cp -f $vestacp/proftpd/proftpd.conf /etc/ + wget $vestacp/proftpd/proftpd.conf -O /etc/proftpd.conf chkconfig proftpd on service proftpd start check_result $? "proftpd start failed" @@ -1013,13 +1016,13 @@ if [ "$mysql" = 'yes' ]; then chown mysql:mysql /var/lib/mysql mkdir -p /etc/my.cnf.d - if [ $release -lt 7 ]; then + if [ $release -ne 7 ]; then service='mysqld' else service='mariadb' fi - cp -f $vestacp/$service/$mycnf /etc/my.cnf + wget $vestacp/$service/$mycnf -O /etc/my.cnf chkconfig $service on service $service start if [ "$?" -ne 0 ]; then @@ -1032,9 +1035,8 @@ if [ "$mysql" = 'yes' ]; then fi # Securing MySQL installation - mpass=$(gen_pass) - mysqladmin -u root password $mpass - echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf + mysqladmin -u root password $vpass + echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf chmod 600 /root/.my.cnf mysql -e "DELETE FROM mysql.user WHERE User=''" mysql -e "DROP DATABASE test" >/dev/null 2>&1 @@ -1044,17 +1046,10 @@ if [ "$mysql" = 'yes' ]; then # Configuring phpMyAdmin if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pma/phpMyAdmin.conf /etc/httpd/conf.d/ + wget $vestacp/pma/phpMyAdmin.conf -O /etc/httpd/conf.d/phpMyAdmin.conf fi - mysql < /usr/share/phpMyAdmin/sql/create_tables.sql - p=$(gen_pass) - mysql -e "GRANT ALL ON phpmyadmin.* - TO phpmyadmin@localhost IDENTIFIED BY '$p'" - cp -f $vestacp/pma/config.inc.conf /etc/phpMyAdmin/config.inc.php - sed -i "s/%blowfish_secret%/$(gen_pass 32)/g" /etc/phpMyAdmin/config.inc.php - sed -i "s/%phpmyadmin_pass%/$p/g" /etc/phpMyAdmin/config.inc.php - chmod 777 /var/lib/phpMyAdmin/temp - chmod 777 /var/lib/phpMyAdmin/save + wget $vestacp/pma/config.inc.conf -O /etc/phpMyAdmin/config.inc.php + sed -i "s/%blowfish_secret%/$(gen_pass)/g" /etc/phpMyAdmin/config.inc.php fi @@ -1063,24 +1058,23 @@ fi #----------------------------------------------------------# if [ "$postgresql" = 'yes' ]; then - ppass=$(gen_pass) - if [ $release -eq 5 ]; then + if [ $release = 5 ]; then service postgresql start - sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'" + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" service postgresql stop - cp -f $vestacp/postgresql/pg_hba.conf /var/lib/pgsql/data/ + wget $vestacp/postgresql/pg_hba.conf -O /var/lib/pgsql/data/pg_hba.conf service postgresql start else service postgresql initdb - cp -f $vestacp/postgresql/pg_hba.conf /var/lib/pgsql/data/ + wget $vestacp/postgresql/pg_hba.conf -O /var/lib/pgsql/data/pg_hba.conf service postgresql start - sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'" + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" fi # Configuring phpPgAdmin if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pga/phpPgAdmin.conf /etc/httpd/conf.d/ + wget $vestacp/pga/phpPgAdmin.conf -O /etc/httpd/conf.d/phpPgAdmin.conf fi - cp -f $vestacp/pga/config.inc.php /etc/phpPgAdmin/ + wget $vestacp/pga/config.inc.php -O /etc/phpPgAdmin/config.inc.php fi @@ -1089,7 +1083,7 @@ fi #----------------------------------------------------------# if [ "$named" = 'yes' ]; then - cp -f $vestacp/named/named.conf /etc/ + wget $vestacp/named/named.conf -O /etc/named.conf chown root:named /etc/named.conf chmod 640 /etc/named.conf chkconfig named on @@ -1104,9 +1098,9 @@ fi if [ "$exim" = 'yes' ]; then gpasswd -a exim mail - cp -f $vestacp/exim/exim.conf /etc/exim/ - cp -f $vestacp/exim/dnsbl.conf /etc/exim/ - cp -f $vestacp/exim/spam-blocks.conf /etc/exim/ + wget $vestacp/exim/exim.conf -O /etc/exim/exim.conf + wget $vestacp/exim/dnsbl.conf -O /etc/exim/dnsbl.conf + wget $vestacp/exim/spam-blocks.conf -O /etc/exim/spam-blocks.conf touch /etc/exim/white-blocks.conf if [ "$spamd" = 'yes' ]; then @@ -1139,12 +1133,13 @@ fi if [ "$dovecot" = 'yes' ]; then gpasswd -a dovecot mail - cp -rf $vestacp/dovecot /etc/ - cp -f $vestacp/logrotate/dovecot /etc/logrotate.d/ + wget $vestacp/dovecot.tar.gz -O /etc/dovecot.tar.gz + wget $vestacp/logrotate/dovecot -O /etc/logrotate.d/dovecot + cd /etc + rm -rf dovecot dovecot.conf + tar -xzf dovecot.tar.gz + rm -f dovecot.tar.gz chown -R root:root /etc/dovecot* - if [ "$release" -eq 7 ]; then - sed -i "s#namespace inbox {#namespace inbox {\n inbox = yes#" /etc/dovecot/conf.d/15-mailboxes.conf - fi chkconfig dovecot on service dovecot start check_result $? "dovecot start failed" @@ -1159,17 +1154,19 @@ if [ "$clamd" = 'yes' ]; then useradd clam -s /sbin/nologin -d /var/lib/clamav 2>/dev/null gpasswd -a clam exim gpasswd -a clam mail - cp -f $vestacp/clamav/clamd.conf /etc/ - cp -f $vestacp/clamav/freshclam.conf /etc/ - mkdir -p /var/log/clamav /var/run/clamav + wget $vestacp/clamav/clamd.conf -O /etc/clamd.conf + wget $vestacp/clamav/freshclam.conf -O /etc/freshclam.conf + mkdir -p /var/log/clamav + mkdir -p /var/run/clamav chown clam:clam /var/log/clamav /var/run/clamav chown -R clam:clam /var/lib/clamav - if [ "$release" -ge '7' ]; then - cp -f $vestacp/clamav/clamd.service /usr/lib/systemd/system/ + if [ "$release" -eq '7' ]; then + wget $vestacp/clamav/clamd.service -O \ + /usr/lib/systemd/system/clamd.service systemctl --system daemon-reload fi /usr/bin/freshclam - if [ "$release" -ge '7' ]; then + if [ "$release" -eq '7' ]; then sed -i "s/nofork/foreground/" /usr/lib/systemd/system/clamd.service systemctl daemon-reload fi @@ -1187,7 +1184,7 @@ if [ "$spamd" = 'yes' ]; then chkconfig spamassassin on service spamassassin start check_result $? "spamassassin start failed" - if [ "$release" -ge '7' ]; then + if [ "$release" -eq '7' ]; then groupadd -g 1001 spamd useradd -u 1001 -g spamd -s /sbin/nologin -d \ /var/lib/spamassassin spamd @@ -1203,13 +1200,15 @@ fi if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then if [ "$apache" = 'yes' ]; then - cp -f $vestacp/roundcube/roundcubemail.conf /etc/httpd/conf.d/ + wget $vestacp/roundcube/roundcubemail.conf \ + -O /etc/httpd/conf.d/roundcubemail.conf fi - cp -f $vestacp/roundcube/main.inc.php /etc/roundcubemail/config.inc.php + wget $vestacp/roundcube/main.inc.php -O /etc/roundcubemail/config.inc.php cd /usr/share/roundcubemail/plugins/password - cp -f $vestacp/roundcube/vesta.php drivers/vesta.php - cp -f $vestacp/roundcube/config.inc.php config.inc.php - sed -i "s/localhost/$servername/g" config.inc.php + wget $vestacp/roundcube/vesta.php -O drivers/vesta.php + wget $vestacp/roundcube/config.inc.php -O config.inc.php + sed -i "s/localhost/$servername/g" \ + /usr/share/roundcubemail/plugins/password/config.inc.php chmod a+r /etc/roundcubemail/* chmod -f 777 /var/log/roundcubemail r="$(gen_pass)" @@ -1232,7 +1231,10 @@ fi #----------------------------------------------------------# if [ "$fail2ban" = 'yes' ]; then - cp -rf $vestacp/fail2ban /etc/ + cd /etc + wget $vestacp/fail2ban.tar.gz -O fail2ban.tar.gz + tar -xzf fail2ban.tar.gz + rm -f fail2ban.tar.gz if [ "$dovecot" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) @@ -1251,9 +1253,9 @@ if [ "$fail2ban" = 'yes' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n vsftpd-iptables -A 2) fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local - fi + fi chkconfig fail2ban on - mkdir -p /var/run/fail2ban + /bin/mkdir -p /var/run/fail2ban if [ -e "/usr/lib/systemd/system/fail2ban.service" ]; then exec_pre='ExecStartPre=/bin/mkdir -p /var/run/fail2ban' sed -i "s|\[Service\]|[Service]\n$exec_pre|g" \ @@ -1281,48 +1283,46 @@ if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then groupdel admin > /dev/null 2>&1 fi -# Adding Vesta admin account +# Adding vesta account $VESTA/bin/v-add-user admin $vpass $email default System Administrator check_result $? "can't create admin user" $VESTA/bin/v-change-user-shell admin bash $VESTA/bin/v-change-user-language admin $lang -# Configuring system IPs +# Configuring system ips $VESTA/bin/v-update-sys-ip -# Get main IP +# Get main ip ip=$(ip addr|grep 'inet '|grep global|head -n1|awk '{print $2}'|cut -f1 -d/) -# Configuring firewall +# Firewall configuration if [ "$iptables" = 'yes' ]; then - chkconfig firewalld off >/dev/null 2>&1 $VESTA/bin/v-update-firewall fi -# Get public IP +# Get public ip pub_ip=$(curl -s vestacp.com/what-is-my-ip/) if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then - echo "$VESTA/bin/v-update-sys-ip" >> /etc/rc.local $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip ip=$pub_ip fi -# Configuring MySQL/MariaDB host +# Configuring mysql host if [ "$mysql" = 'yes' ]; then - $VESTA/bin/v-add-database-host mysql localhost root $mpass + $VESTA/bin/v-add-database-host mysql localhost root $vpass $VESTA/bin/v-add-database admin default default $(gen_pass) mysql fi -# Configuring PostgreSQL host +# Configuring pgsql host if [ "$postgresql" = 'yes' ]; then - $VESTA/bin/v-add-database-host pgsql localhost postgres $ppass + $VESTA/bin/v-add-database-host pgsql localhost postgres $vpass $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql fi # Adding default domain $VESTA/bin/v-add-domain admin $servername +check_result $? "can't create $servername domain" -# Adding cron jobs command="sudo $VESTA/bin/v-update-sys-queue disk" $VESTA/bin/v-add-cron-job 'admin' '15' '02' '*' '*' '*' "$command" command="sudo $VESTA/bin/v-update-sys-queue traffic" @@ -1339,7 +1339,7 @@ command="sudo $VESTA/bin/v-update-sys-rrd" $VESTA/bin/v-add-cron-job 'admin' '*/5' '*' '*' '*' '*' "$command" service crond restart -# Building RRD images +# Building initial rrd images $VESTA/bin/v-update-sys-rrd # Enabling file system quota @@ -1347,12 +1347,12 @@ if [ "$quota" = 'yes' ]; then $VESTA/bin/v-add-sys-quota fi -# Enabling Softaculous plugin +# Enabling softaculous plugin if [ "$softaculous" = 'yes' ]; then $VESTA/bin/v-add-vesta-softaculous fi -# Starting Vesta service +# Starting vesta service chkconfig vesta on service vesta start check_result $? "vesta start failed" @@ -1369,8 +1369,11 @@ $VESTA/bin/v-add-cron-vesta-autoupdate # Vesta Access Info # #----------------------------------------------------------# -# Comparing hostname and IP -host_ip=$(host $servername |head -n 1 |awk '{print $NF}') +# Sending install notification to vestacp.com +wget vestacp.com/notify/?$codename -O /dev/null -q + +# Comparing hostname and ip +host_ip=$(host $servername| head -n 1 | awk '{print $NF}') if [ "$host_ip" = "$ip" ]; then ip="$servername" fi diff --git a/install/vst-install-ubuntu.sh b/install/vst-install-ubuntu.sh old mode 100644 new mode 100755 index f3aa6549..440503dc --- a/install/vst-install-ubuntu.sh +++ b/install/vst-install-ubuntu.sh @@ -1,9 +1,5 @@ #!/bin/bash -echo "Sorry, Ubuntu is not supported." -echo "myVesta supports only Debian." -exit; - # Vesta Ubuntu installer v.05 #----------------------------------------------------------# @@ -20,26 +16,47 @@ arch=$(uname -i) os='ubuntu' release="$(lsb_release -s -r)" codename="$(lsb_release -s -c)" -vestacp="$VESTA/install/$VERSION/$release" +vestacp="http://$CHOST/$VERSION/$release" -# Defining software pack for all distros -software="nginx apache2 apache2.2-common apache2-suexec-custom apache2-utils - apparmor-utils awstats bc bind9 bsdmainutils bsdutils clamav-daemon - cron curl dnsutils dovecot-imapd dovecot-pop3d e2fslibs e2fsprogs exim4 - exim4-daemon-heavy expect fail2ban flex ftp git idn imagemagick - libapache2-mod-fcgid libapache2-mod-php libapache2-mod-rpaf - libapache2-mod-ruid2 lsof mc mysql-client mysql-common mysql-server - ntpdate php-cgi php-common php-curl php-fpm phpmyadmin php-mysql - phppgadmin php-pgsql postgresql postgresql-contrib proftpd-basic quota - roundcube-core roundcube-mysql roundcube-plugins rrdtool rssh spamassassin - sudo vesta vesta-ioncube vesta-nginx vesta-php vesta-softaculous - vim-common vsftpd webalizer whois zip net-tools" - -# Fix for old releases -if [[ ${release:0:2} -lt 16 ]]; then - software=$(echo "$software" |sed -e "s/php /php5 /g") - software=$(echo "$software" |sed -e "s/vesta-php5 /vesta-php /g") - software=$(echo "$software" |sed -e "s/php-/php5-/g") +if [ "$release" = '16.04' ]; then + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php php php-common php-cgi + php-mysql php-curl php-fpm php-pgsql awstats webalizer vsftpd + proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon + spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils cron vesta vesta-nginx vesta-php expect vim-common + vesta-ioncube vesta-softaculous" +elif [ "$release" = '16.10' ]; then + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php7.0 php7.0 php7.0-common + php7.0-cgi php7.0-mysql php7.0-curl php7.0-fpm php7.0-pgsql awstats + webalizer vsftpd proftpd-basic bind9 exim4 exim4-daemon-heavy + clamav-daemon spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpmyadmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils cron vesta vesta-nginx vesta-php expect vim-common + vesta-ioncube vesta-softaculous" +else + software="nginx apache2 apache2-utils apache2.2-common + apache2-suexec-custom libapache2-mod-ruid2 libapache2-mod-rpaf + libapache2-mod-fcgid libapache2-mod-php5 php5 php5-common php5-cgi + php5-mysql php5-curl php5-fpm php5-pgsql awstats webalizer vsftpd + proftpd-basic bind9 exim4 exim4-daemon-heavy clamav-daemon + spamassassin dovecot-imapd dovecot-pop3d roundcube-core + roundcube-mysql roundcube-plugins mysql-server mysql-common + mysql-client postgresql postgresql-contrib phppgadmin phpMyAdmin mc + flex whois rssh git idn zip sudo bc ftp lsof ntpdate rrdtool quota + e2fslibs bsdutils e2fsprogs curl imagemagick fail2ban dnsutils + bsdmainutils cron vesta vesta-nginx vesta-php expect vim-common + vesta-ioncube vesta-softaculous" fi # Defining help function @@ -86,7 +103,7 @@ gen_pass() { echo "$PASS" } -# Defining return code check function +# Defning return code check function check_result() { if [ $1 -ne 0 ]; then echo "Error: $2" @@ -105,7 +122,7 @@ set_default_value() { fi } -# Defining function to set default language value +# Define function to set default language value set_default_lang() { if [ -z "$lang" ]; then eval lang=$1 @@ -240,11 +257,11 @@ fi # Checking root permissions if [ "x$(id -u)" != 'x0' ]; then - check_result 1 "Script can be run executed only by root" + check_error 1 "Script can be run executed only by root" fi # Checking admin user account -if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ -z "$force" ]; then +if [ ! -z "$(grep ^admin: /etc/passwd /etc/group)" ] && [ -z "$force" ]; then echo 'Please remove admin user account before proceeding.' echo 'If you want to do it automatically run installer with -f option:' echo -e "Example: bash $0 --force\n" @@ -258,10 +275,10 @@ if [ ! -e '/usr/bin/wget' ]; then fi # Checking repository availability -wget -q "c.vestacp.com/deb_signing.key" -O /dev/null +wget -q "$vestacp/deb_signing.key" -O /dev/null check_result $? "No access to Vesta repository" -# Checking installed packages +# Check installed packages tmpfile=$(mktemp -p /tmp) dpkg --get-selections > $tmpfile for pkg in exim4 mysql-server apache2 nginx vesta; do @@ -302,7 +319,7 @@ echo echo ' Vesta Control Panel' echo -e "\n\n" -echo 'The following software will be installed on your system:' +echo 'Following software will be installed on your system:' # Web stack if [ "$nginx" = 'yes' ]; then @@ -323,16 +340,16 @@ if [ "$named" = 'yes' ]; then echo ' - Bind DNS Server' fi -# Mail stack +# Mail Stack if [ "$exim" = 'yes' ]; then - echo -n ' - Exim Mail Server' + echo -n ' - Exim mail server' if [ "$clamd" = 'yes' ] || [ "$spamd" = 'yes' ] ; then echo -n ' + ' if [ "$clamd" = 'yes' ]; then - echo -n 'ClamAV' + echo -n 'Antivirus ' fi if [ "$spamd" = 'yes' ]; then - echo -n 'SpamAssassin' + echo -n 'Antispam' fi fi echo @@ -341,7 +358,7 @@ if [ "$exim" = 'yes' ]; then fi fi -# Database stack +# DB stack if [ "$mysql" = 'yes' ]; then echo ' - MySQL Database Server' fi @@ -451,13 +468,6 @@ fi apt-get -y upgrade check_result $? 'apt-get upgrade failed' -# Checking universe repository -if [[ ${release:0:2} -gt 16 ]]; then - if [ -z "$(grep universe /etc/apt/sources.list)" ]; then - add-apt-repository -y universe - fi -fi - # Installing nginx repo apt=/etc/apt/sources.list.d echo "deb http://nginx.org/packages/mainline/ubuntu/ $codename nginx" \ @@ -481,53 +491,52 @@ cd $vst_backups mkdir nginx apache2 php vsftpd proftpd bind exim4 dovecot clamd mkdir spamassassin mysql postgresql mongodb vesta -# Backup nginx configuration +# Backing up nginx configuration service nginx stop > /dev/null 2>&1 cp -r /etc/nginx/* $vst_backups/nginx >/dev/null 2>&1 -# Backup Apache configuration +# Backing up Apache configuration service apache2 stop > /dev/null 2>&1 cp -r /etc/apache2/* $vst_backups/apache2 > /dev/null 2>&1 rm -f /etc/apache2/conf.d/* > /dev/null 2>&1 -# Backup PHP-FPM configuration +# Backing up PHP configuration service php7.0-fpm stop > /dev/null 2>&1 service php5-fpm stop > /dev/null 2>&1 -service php-fpm stop > /dev/null 2>&1 cp -r /etc/php7.0/* $vst_backups/php/ > /dev/null 2>&1 cp -r /etc/php5/* $vst_backups/php/ > /dev/null 2>&1 cp -r /etc/php/* $vst_backups/php/ > /dev/null 2>&1 -# Backup Bind configuration +# Backing up Bind configuration service bind9 stop > /dev/null 2>&1 cp -r /etc/bind/* $vst_backups/bind > /dev/null 2>&1 -# Backup Vsftpd configuration +# Backing up Vsftpd configuration service vsftpd stop > /dev/null 2>&1 cp /etc/vsftpd.conf $vst_backups/vsftpd > /dev/null 2>&1 -# Backup ProFTPD configuration +# Backing up ProFTPD configuration service proftpd stop > /dev/null 2>&1 cp /etc/proftpd.conf $vst_backups/proftpd > /dev/null 2>&1 -# Backup Exim configuration +# Backing up Exim configuration service exim4 stop > /dev/null 2>&1 cp -r /etc/exim4/* $vst_backups/exim4 > /dev/null 2>&1 -# Backup ClamAV configuration +# Backing up ClamAV configuration service clamav-daemon stop > /dev/null 2>&1 cp -r /etc/clamav/* $vst_backups/clamav > /dev/null 2>&1 -# Backup SpamAssassin configuration +# Backing up SpamAssassin configuration service spamassassin stop > /dev/null 2>&1 cp -r /etc/spamassassin/* $vst_backups/spamassassin > /dev/null 2>&1 -# Backup Dovecot configuration +# Backing up Dovecot configuration service dovecot stop > /dev/null 2>&1 cp /etc/dovecot.conf $vst_backups/dovecot > /dev/null 2>&1 cp -r /etc/dovecot/* $vst_backups/dovecot > /dev/null 2>&1 -# Backup MySQL/MariaDB configuration and data +# Backing up MySQL/MariaDB configuration and data service mysql stop > /dev/null 2>&1 killall -9 mysqld > /dev/null 2>&1 mv /var/lib/mysql $vst_backups/mysql/mysql_datadir > /dev/null 2>&1 @@ -539,6 +548,7 @@ if [ "$release" = '16.04' ] && [ -e '/etc/init.d/mysql' ]; then mysqld --initialize-insecure fi + # Backup Vesta service vesta stop > /dev/null 2>&1 cp -r $VESTA/* $vst_backups/vesta > /dev/null 2>&1 @@ -634,18 +644,18 @@ fi # Install packages # #----------------------------------------------------------# -# Updating system +# Update system packages apt-get update -# Disabling daemon autostart on apt-get install -echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d +# Disable daemon autostart /usr/share/doc/sysv-rc/README.policy-rc.d.gz +echo -e '#!/bin/sh \nexit 101' > /usr/sbin/policy-rc.d chmod a+x /usr/sbin/policy-rc.d -# Installing apt packages +# Install apt packages apt-get -y install $software check_result $? "apt-get install failed" -# Restoring autostart policy +# Restore policy rm -f /usr/sbin/policy-rc.d @@ -653,28 +663,26 @@ rm -f /usr/sbin/policy-rc.d # Configure system # #----------------------------------------------------------# -# Enabling SSH password auth +# Enable SSH password auth sed -i "s/rdAuthentication no/rdAuthentication yes/g" /etc/ssh/sshd_config service ssh restart -# Disabling AWStats cron +# Disable awstats cron rm -f /etc/cron.d/awstats # Set directory color echo 'LS_COLORS="$LS_COLORS:di=00;33"' >> /etc/profile -# Registering /usr/sbin/nologin -if [ -z "$(grep nologin /etc/shells)" ]; then - echo "/usr/sbin/nologin" >> /etc/shells -fi +# Register /usr/sbin/nologin +echo "/usr/sbin/nologin" >> /etc/shells -# Configuring NTP +# NTP Synchronization echo '#!/bin/sh' > /etc/cron.daily/ntpdate -echo "$(which ntpdate) -s ntp.ubuntu.com" >> /etc/cron.daily/ntpdate +echo "$(which ntpdate) -s pool.ntp.org" >> /etc/cron.daily/ntpdate chmod 775 /etc/cron.daily/ntpdate -ntpdate -s ntp.ubuntu.com +ntpdate -s pool.ntp.org -# Adding rssh +# Setup rssh if [ -z "$(grep /usr/bin/rssh /etc/shells)" ]; then echo /usr/bin/rssh >> /etc/shells fi @@ -688,11 +696,11 @@ chmod 755 /usr/bin/rssh # Configure Vesta # #----------------------------------------------------------# -# Installing sudo configuration + +# Downlading sudo configuration mkdir -p /etc/sudoers.d -cp -f $vestacp/sudo/admin /etc/sudoers.d/ +wget $vestacp/sudo/admin -O /etc/sudoers.d/admin chmod 440 /etc/sudoers.d/admin -sed -i "s/%admin.*ALL=(ALL).*/# sudo is limited to vesta scripts/" /etc/sudoers # Configuring system env echo "export VESTA='$VESTA'" > /etc/profile.d/vesta.sh @@ -703,7 +711,7 @@ echo 'export PATH' >> /root/.bash_profile source /root/.bash_profile # Configuring logrotate for Vesta logs -cp -f $vestacp/logrotate/vesta /etc/logrotate.d/ +wget $vestacp/logrotate/vesta -O /etc/logrotate.d/vesta # Building directory tree and creating some blank files for Vesta mkdir -p $VESTA/conf $VESTA/log $VESTA/ssl $VESTA/data/ips \ @@ -718,6 +726,7 @@ chmod -R 750 $VESTA/data/queue chmod 660 $VESTA/log/* rm -f /var/log/vesta ln -s $VESTA/log /var/log/vesta +chown admin:admin $VESTA/data/sessions chmod 770 $VESTA/data/sessions # Generating Vesta configuration @@ -808,18 +817,25 @@ echo "LANGUAGE='$lang'" >> $VESTA/conf/vesta.conf # Version echo "VERSION='0.9.8'" >> $VESTA/conf/vesta.conf -# Installing hosting packages -cp -rf $vestacp/packages $VESTA/data/ +# Downloading hosting packages +cd $VESTA/data +wget $vestacp/packages.tar.gz -O packages.tar.gz +tar -xzf packages.tar.gz +rm -f packages.tar.gz -# Installing templates -cp -rf $vestacp/templates $VESTA/data/ +# Downloading templates +wget $vestacp/templates.tar.gz -O templates.tar.gz +tar -xzf templates.tar.gz +rm -f templates.tar.gz # Copying index.html to default documentroot -cp $VESTA/data/templates/web/skel/public_html/index.html /var/www/ +cp templates/web/skel/public_html/index.html /var/www/ sed -i 's/%domain%/It worked!/g' /var/www/index.html -# Installing firewall rules -cp -rf $vestacp/firewall $VESTA/data/ +# Downloading firewall rules +wget $vestacp/firewall.tar.gz -O firewall.tar.gz +tar -xzf firewall.tar.gz +rm -f firewall.tar.gz # Configuring server hostname $VESTA/bin/v-change-sys-hostname $servername 2>/dev/null @@ -841,11 +857,6 @@ chown root:mail $VESTA/ssl/* chmod 660 $VESTA/ssl/* rm /tmp/vst.pem -# Adding nologin as a valid system shell -if [ -z "$(grep nologin /etc/shells)" ]; then - echo "/usr/sbin/nologin" >> /etc/shells -fi - #----------------------------------------------------------# # Configure Nginx # @@ -853,12 +864,12 @@ fi if [ "$nginx" = 'yes' ]; then rm -f /etc/nginx/conf.d/*.conf - cp -f $vestacp/nginx/nginx.conf /etc/nginx/ - cp -f $vestacp/nginx/status.conf /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phpmyadmin.inc /etc/nginx/conf.d/ - cp -f $vestacp/nginx/phppgadmin.inc /etc/nginx/conf.d/ - cp -f $vestacp/nginx/webmail.inc /etc/nginx/conf.d/ - cp -f $vestacp/logrotate/nginx /etc/logrotate.d/ + wget $vestacp/nginx/nginx.conf -O /etc/nginx/nginx.conf + wget $vestacp/nginx/status.conf -O /etc/nginx/conf.d/status.conf + wget $vestacp/nginx/phpmyadmin.inc -O /etc/nginx/conf.d/phpmyadmin.inc + wget $vestacp/nginx/phppgadmin.inc -O /etc/nginx/conf.d/phppgadmin.inc + wget $vestacp/nginx/webmail.inc -O /etc/nginx/conf.d/webmail.inc + wget $vestacp/logrotate/nginx -O /etc/logrotate.d/nginx echo > /etc/nginx/conf.d/vesta.conf mkdir -p /var/log/nginx/domains update-rc.d nginx defaults @@ -872,9 +883,9 @@ fi #----------------------------------------------------------# if [ "$apache" = 'yes' ]; then - cp -f $vestacp/apache2/apache2.conf /etc/apache2/ - cp -f $vestacp/apache2/status.conf /etc/apache2/mods-enabled/ - cp -f $vestacp/logrotate/apache2 /etc/logrotate.d/ + wget $vestacp/apache2/apache2.conf -O /etc/apache2/apache2.conf + wget $vestacp/apache2/status.conf -O /etc/apache2/mods-enabled/status.conf + wget $vestacp/logrotate/apache2 -O /etc/logrotate.d/apache2 a2enmod rewrite a2enmod suexec a2enmod ssl @@ -906,7 +917,7 @@ fi if [ "$phpfpm" = 'yes' ]; then pool=$(find /etc/php* -type d \( -name "pool.d" -o -name "*fpm.d" \)) - cp -f $vestacp/php-fpm/www.conf $pool/ + wget $vestacp/php-fpm/www.conf -O $pool/www.conf php_fpm=$(ls /etc/init.d/php*-fpm* |cut -f 4 -d /) ln -s /etc/init.d/$php_fpm /etc/init.d/php-fpm > /dev/null 2>&1 update-rc.d $php_fpm defaults @@ -924,7 +935,7 @@ if [ -z "$ZONE" ]; then ZONE='UTC' fi for pconf in $(find /etc/php* -name php.ini); do - sed -i "s%;date.timezone =%date.timezone = $ZONE%g" $pconf + sed -i "s/;date.timezone =/date.timezone = $ZONE/g" $pconf sed -i 's%_open_tag = Off%_open_tag = On%g' $pconf done @@ -934,17 +945,13 @@ done #----------------------------------------------------------# if [ "$vsftpd" = 'yes' ]; then - cp -f $vestacp/vsftpd/vsftpd.conf /etc/ - touch /var/log/vsftpd.log - chown root:adm /var/log/vsftpd.log - chmod 640 /var/log/vsftpd.log - touch /var/log/xferlog - chown root:adm /var/log/xferlog - chmod 640 /var/log/xferlog + wget $vestacp/vsftpd/vsftpd.conf -O /etc/vsftpd.conf update-rc.d vsftpd defaults service vsftpd start check_result $? "vsftpd start failed" + # To be deleted after release 0.9.8-18 + echo "/sbin/nologin" >> /etc/shells fi @@ -954,7 +961,7 @@ fi if [ "$proftpd" = 'yes' ]; then echo "127.0.0.1 $servername" >> /etc/hosts - cp -f $vestacp/proftpd/proftpd.conf /etc/proftpd/ + wget $vestacp/proftpd/proftpd.conf -O /etc/proftpd/proftpd.conf update-rc.d proftpd defaults service proftpd start check_result $? "proftpd start failed" @@ -975,62 +982,48 @@ if [ "$mysql" = 'yes' ]; then fi # Configuring MySQL/MariaDB - cp -f $vestacp/mysql/$mycnf /etc/mysql/my.cnf + wget $vestacp/mysql/$mycnf -O /etc/mysql/my.cnf if [ "$release" != '16.04' ]; then mysql_install_db fi - if [ "$release" == '18.04' ]; then - mkdir /var/lib/mysql - chown mysql:mysql /var/lib/mysql - mysqld --initialize-insecure - fi update-rc.d mysql defaults service mysql start check_result $? "mysql start failed" # Securing MySQL/MariaDB installation - mpass=$(gen_pass) - mysqladmin -u root password $mpass - echo -e "[client]\npassword='$mpass'\n" > /root/.my.cnf + mysqladmin -u root password $vpass + echo -e "[client]\npassword='$vpass'\n" > /root/.my.cnf chmod 600 /root/.my.cnf mysql -e "DELETE FROM mysql.user WHERE User=''" mysql -e "DROP DATABASE test" >/dev/null 2>&1 mysql -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\\_%'" - mysql -e "DELETE FROM mysql.user WHERE user='' OR password='';" + mysql -e "DELETE FROM mysql.user WHERE user='' or password='';" mysql -e "FLUSH PRIVILEGES" # Configuring phpMyAdmin if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pma/apache.conf /etc/phpmyadmin/ + wget $vestacp/pma/apache.conf -O /etc/phpmyadmin/apache.conf ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin.conf fi - if [[ ${release:0:2} -ge 18 ]]; then - mysql < /usr/share/phpmyadmin/sql/create_tables.sql - p=$(grep dbpass /etc/phpmyadmin/config-db.php |cut -f 2 -d "'") - mysql -e "GRANT ALL ON phpmyadmin.* - TO phpmyadmin@localhost IDENTIFIED BY '$p'" - else - cp -f $vestacp/pma/config.inc.php /etc/phpmyadmin/ - fi + wget $vestacp/pma/config.inc.php -O /etc/phpmyadmin/config.inc.php chmod 777 /var/lib/phpmyadmin/tmp fi - #----------------------------------------------------------# # Configure PostgreSQL # #----------------------------------------------------------# if [ "$postgresql" = 'yes' ]; then - ppass=$(gen_pass) - cp -f $vestacp/postgresql/pg_hba.conf /etc/postgresql/*/main/ + wget $vestacp/postgresql/pg_hba.conf -O /etc/postgresql/*/main/pg_hba.conf service postgresql restart - sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$ppass'" + sudo -u postgres psql -c "ALTER USER postgres WITH PASSWORD '$vpass'" # Configuring phpPgAdmin if [ "$apache" = 'yes' ]; then - cp -f $vestacp/pga/phppgadmin.conf /etc/apache2/conf.d/ + wget $vestacp/pga/phppgadmin.conf \ + -O /etc/apache2/conf.d/phppgadmin.conf fi - cp -f $vestacp/pga/config.inc.php /etc/phppgadmin/ + wget $vestacp/pga/config.inc.php -O /etc/phppgadmin/config.inc.php fi @@ -1039,7 +1032,7 @@ fi #----------------------------------------------------------# if [ "$named" = 'yes' ]; then - cp -f $vestacp/bind/named.conf /etc/bind/ + wget $vestacp/bind/named.conf -O /etc/bind/named.conf sed -i "s%listen-on%//listen%" /etc/bind/named.conf.options chown root:bind /etc/bind/named.conf chmod 640 /etc/bind/named.conf @@ -1065,9 +1058,9 @@ fi if [ "$exim" = 'yes' ]; then gpasswd -a Debian-exim mail - cp -f $vestacp/exim/exim4.conf.template /etc/exim4/ - cp -f $vestacp/exim/dnsbl.conf /etc/exim4/ - cp -f $vestacp/exim/spam-blocks.conf /etc/exim4/ + wget $vestacp/exim/exim4.conf.template -O /etc/exim4/exim4.conf.template + wget $vestacp/exim/dnsbl.conf -O /etc/exim4/dnsbl.conf + wget $vestacp/exim/spam-blocks.conf -O /etc/exim4/spam-blocks.conf touch /etc/exim4/white-blocks.conf if [ "$spamd" = 'yes' ]; then @@ -1100,19 +1093,12 @@ fi if [ "$dovecot" = 'yes' ]; then gpasswd -a dovecot mail - if [[ ${release:0:2} -ge 18 ]]; then - cp -r /usr/local/vesta/install/debian/9/dovecot /etc/ - if [ -z "$(grep yes /etc/dovecot/conf.d/10-mail.conf)" ]; then - echo "namespace inbox {" >> /etc/dovecot/conf.d/10-mail.conf - echo " inbox = yes" >> /etc/dovecot/conf.d/10-mail.conf - echo "}" >> /etc/dovecot/conf.d/10-mail.conf - echo "first_valid_uid = 1000" >> /etc/dovecot/conf.d/10-mail.conf - echo "mbox_write_locks = fcntl" >> /etc/dovecot/conf.d/10-mail.conf - fi - else - cp -rf $vestacp/dovecot /etc/ - fi - cp -f $vestacp/logrotate/dovecot /etc/logrotate.d/ + wget $vestacp/dovecot.tar.gz -O /etc/dovecot.tar.gz + wget $vestacp/logrotate/dovecot -O /etc/logrotate.d/dovecot + cd /etc + rm -rf dovecot dovecot.conf + tar -xzf dovecot.tar.gz + rm -f dovecot.tar.gz chown -R root:root /etc/dovecot* update-rc.d dovecot defaults service dovecot start @@ -1127,11 +1113,11 @@ fi if [ "$clamd" = 'yes' ]; then gpasswd -a clamav mail gpasswd -a clamav Debian-exim - cp -f $vestacp/clamav/clamd.conf /etc/clamav/ + wget $vestacp/clamav/clamd.conf -O /etc/clamav/clamd.conf /usr/bin/freshclam update-rc.d clamav-daemon defaults service clamav-daemon start - check_result $? "clamav-daemon start failed" + check_result $? "clamav-daeom start failed" fi @@ -1157,53 +1143,33 @@ fi if [ "$exim" = 'yes' ] && [ "$mysql" = 'yes' ]; then if [ "$apache" = 'yes' ]; then - cp -f $vestacp/roundcube/apache.conf /etc/roundcube/ + wget $vestacp/roundcube/apache.conf -O /etc/roundcube/apache.conf ln -s /etc/roundcube/apache.conf /etc/apache2/conf.d/roundcube.conf fi - - if [[ ${release:0:2} -ge 18 ]]; then - r=$(grep dbpass= /etc/roundcube/debian-db.php |cut -f 2 -d "'") - sed -i "s/default_host.*/default_host'] = 'localhost';/" \ - /etc/roundcube/config.inc.php - sed -i "s/^);/'password');/" /etc/roundcube/config.inc.php - else - r="$(gen_pass)" - cp -f $vestacp/roundcube/main.inc.php /etc/roundcube/ - cp -f $vestacp/roundcube/db.inc.php /etc/roundcube/ - sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php - fi - + wget $vestacp/roundcube/main.inc.php -O /etc/roundcube/main.inc.php + wget $vestacp/roundcube/db.inc.php -O /etc/roundcube/db.inc.php + chmod 640 /etc/roundcube/debian-db-roundcube.php + chown root:www-data /etc/roundcube/debian-db-roundcube.php + wget $vestacp/roundcube/vesta.php -O \ + /usr/share/roundcube/plugins/password/drivers/vesta.php + wget $vestacp/roundcube/config.inc.php -O \ + /etc/roundcube/plugins/password/config.inc.php + r="$(gen_pass)" + mysql -e "CREATE DATABASE roundcube" + mysql -e "GRANT ALL ON roundcube.* + TO roundcube@localhost IDENTIFIED BY '$r'" + sed -i "s/%password%/$r/g" /etc/roundcube/db.inc.php if [ "$release" = '16.04' ]; then - # TBD: should be fixed in config repo mv /etc/roundcube/db.inc.php /etc/roundcube/debian-db-roundcube.php mv /etc/roundcube/main.inc.php /etc/roundcube/config.inc.php chmod 640 /etc/roundcube/debian-db-roundcube.php chown root:www-data /etc/roundcube/debian-db-roundcube.php fi - cp -f $vestacp/roundcube/vesta.php \ - /usr/share/roundcube/plugins/password/drivers/ - cp -f $vestacp/roundcube/config.inc.php /etc/roundcube/plugins/password/ - - mysql -e "CREATE DATABASE roundcube" - mysql -e "GRANT ALL ON roundcube.* - TO roundcube@localhost IDENTIFIED BY '$r'" mysql roundcube < /usr/share/dbconfig-common/data/roundcube/install/mysql - - chmod 640 /etc/roundcube/debian-db* - chown root:www-data /etc/roundcube/debian-db* - touch /var/log/roundcube/errors - chmod 640 /var/log/roundcube/errors - chown www-data:adm /var/log/roundcube/errors - php5enmod mcrypt 2>/dev/null phpenmod mcrypt 2>/dev/null - if [ "$apache" = 'yes' ]; then - service apache2 restart - fi - if [ "$nginx" = 'yes' ]; then - service nginx restart - fi + service apache2 restart fi @@ -1212,7 +1178,10 @@ fi #----------------------------------------------------------# if [ "$fail2ban" = 'yes' ]; then - cp -rf $vestacp/fail2ban /etc/ + cd /etc + wget $vestacp/fail2ban.tar.gz -O fail2ban.tar.gz + tar -xzf fail2ban.tar.gz + rm -f fail2ban.tar.gz if [ "$dovecot" = 'no' ]; then fline=$(cat /etc/fail2ban/jail.local |grep -n dovecot-iptables -A 2) fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -) @@ -1250,7 +1219,7 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then mv -f /home/admin $vst_backups/home/ >/dev/null 2>&1 rm -f /tmp/sess_* >/dev/null 2>&1 fi -if [ ! -z "$(grep ^admin: /etc/group)" ]; then +if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then groupdel admin > /dev/null 2>&1 fi @@ -1274,25 +1243,25 @@ fi # Get public IP pub_ip=$(curl -s vestacp.com/what-is-my-ip/) if [ ! -z "$pub_ip" ] && [ "$pub_ip" != "$ip" ]; then - echo "$VESTA/bin/v-update-sys-ip" >> /etc/rc.local $VESTA/bin/v-change-sys-ip-nat $ip $pub_ip ip=$pub_ip fi # Configuring MySQL/MariaDB host if [ "$mysql" = 'yes' ]; then - $VESTA/bin/v-add-database-host mysql localhost root $mpass + $VESTA/bin/v-add-database-host mysql localhost root $vpass $VESTA/bin/v-add-database admin default default $(gen_pass) mysql fi # Configuring PostgreSQL host if [ "$postgresql" = 'yes' ]; then - $VESTA/bin/v-add-database-host pgsql localhost postgres $ppass + $VESTA/bin/v-add-database-host pgsql localhost postgres $vpass $VESTA/bin/v-add-database admin db db $(gen_pass) pgsql fi # Adding default domain $VESTA/bin/v-add-domain admin $servername +check_result $? "can't create $servername domain" # Adding cron jobs command="sudo $VESTA/bin/v-update-sys-queue disk" @@ -1341,8 +1310,11 @@ $VESTA/bin/v-add-cron-vesta-autoupdate # Vesta Access Info # #----------------------------------------------------------# +# Sending install notification to vestacp.com +wget vestacp.com/notify/?$codename -O /dev/null -q + # Comparing hostname and IP -host_ip=$(host $servername| head -n 1 |awk '{print $NF}') +host_ip=$(host $servername| head -n 1 | awk '{print $NF}') if [ "$host_ip" = "$ip" ]; then ip="$servername" fi diff --git a/install/vst-install.sh b/install/vst-install.sh index 9b3de74f..5589db79 100755 --- a/install/vst-install.sh +++ b/install/vst-install.sh @@ -1,10 +1,14 @@ #!/bin/bash -# myVesta installation wrapper -# http://myvestacp.com +# Vesta installation wrapper +# http://vestacp.com # # Currently Supported Operating Systems: -# Debian 8, 9, 10 +# +# RHEL 5, 6, 7 +# CentOS 5, 6, 7 +# Debian 7, 8 +# Ubuntu 12.04 - 16.10 # # Am I root? @@ -37,29 +41,17 @@ fi case $(head -n1 /etc/issue | cut -f 1 -d ' ') in Debian) type="debian" ;; Ubuntu) type="ubuntu" ;; - Amazon) type="amazon" ;; *) type="rhel" ;; esac -if [ "$type" = "ubuntu" ]; then - echo "Sorry, Ubuntu is not supported." - echo "myVesta supports only Debian." - exit; -fi -if [ "$type" = "amazon" ]; then - echo "Sorry, Amazon linux cdistribution is not supported." - echo "myVesta supports only Debian." - exit; -fi -if [ "$type" = "rhel" ]; then - echo "Sorry, CentOS is not supported." - echo "myVesta supports only Debian." - exit; +# Fallback to Ubuntu +if [ ! -e "/etc/redhat-release" ]; then + type='ubuntu' fi # Check wget if [ -e '/usr/bin/wget' ]; then - wget http://c.myvestacp.com/vst-install-$type.sh -O vst-install-$type.sh + wget http://vestacp.com/pub/vst-install-$type.sh -O vst-install-$type.sh if [ "$?" -eq '0' ]; then bash vst-install-$type.sh $* exit @@ -71,7 +63,7 @@ fi # Check curl if [ -e '/usr/bin/curl' ]; then - curl -O http://c.myvestacp.com/vst-install-$type.sh + curl -O http://vestacp.com/pub/vst-install-$type.sh if [ "$?" -eq '0' ]; then bash vst-install-$type.sh $* exit diff --git a/src/deb/for-download/nginx/nginx-deb12.conf b/src/deb/for-download/nginx/nginx-deb12.conf deleted file mode 100644 index cf236824..00000000 --- a/src/deb/for-download/nginx/nginx-deb12.conf +++ /dev/null @@ -1,128 +0,0 @@ -user admin; -worker_processes 1; -error_log /usr/local/vesta/log/nginx-error.log; -pid /var/run/vesta-nginx.pid; - -events { - worker_connections 128; - use epoll; -} - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 3m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - access_log /usr/local/vesta/log/nginx-access.log main; - - - # SSL PCI Compliance - ssl_protocols TLSv1.1 TLSv1.2; - ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; - ssl_session_cache shared:SSL:10m; - ssl_prefer_server_ciphers on; - - - # Mime settings - include /usr/local/vesta/nginx/conf/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript - application/x-javascript application/javascript; - gzip_proxied any; - - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffers 32 4k; - fastcgi_read_timeout 300; - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Vhost - server { - listen 8083 ssl; - server_name _; - root /usr/local/vesta/web; - charset utf-8; - - # Fix error "The plain HTTP request was sent to HTTPS port" - error_page 497 https://$host:$server_port$request_uri; - - # ssl on; - ssl_certificate /usr/local/vesta/ssl/certificate.crt; - ssl_certificate_key /usr/local/vesta/ssl/certificate.key; - ssl_session_cache shared:SSL:10m; - ssl_session_timeout 10m; - - error_page 404 /error/404/index.html; - error_page 403 /error/index.html; - error_page 500 /error/index.html; - - location / { - expires max; - index index.php; - } - - location /error/ { - expires max; - index index.html; - } - - location /rrd/ { - expires off; - internal; - } - - location /backup/ { - root /; - internal; - } - - location ~ \.php$ { - include /usr/local/vesta/nginx/conf/fastcgi_params; - fastcgi_param SCRIPT_FILENAME /usr/local/vesta/web/$fastcgi_script_name; - fastcgi_param QUERY_STRING $query_string; - fastcgi_pass unix:/var/run/vesta-php.sock; - fastcgi_intercept_errors on; - break; - } - } -} diff --git a/src/deb/for-download/nginx/nginx.conf b/src/deb/for-download/nginx/nginx.conf deleted file mode 100644 index 3bd1034b..00000000 --- a/src/deb/for-download/nginx/nginx.conf +++ /dev/null @@ -1,128 +0,0 @@ -user admin; -worker_processes 1; -error_log /usr/local/vesta/log/nginx-error.log; -pid /var/run/vesta-nginx.pid; - -events { - worker_connections 128; - use epoll; -} - -http { - # Main settings - sendfile on; - tcp_nopush on; - tcp_nodelay on; - client_header_timeout 1m; - client_body_timeout 3m; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 256m; - large_client_header_buffers 4 8k; - send_timeout 30; - keepalive_timeout 60 60; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - - - # Log format - log_format main '$remote_addr - $remote_user [$time_local] $request ' - '"$status" $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - log_format bytes '$body_bytes_sent'; - access_log /usr/local/vesta/log/nginx-access.log main; - - - # SSL PCI Compliance - ssl_protocols TLSv1.1 TLSv1.2; - ssl_ciphers EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5; - ssl_session_cache shared:SSL:10m; - ssl_prefer_server_ciphers on; - - - # Mime settings - include /usr/local/vesta/nginx/conf/mime.types; - default_type application/octet-stream; - - - # Compression - gzip on; - gzip_comp_level 9; - gzip_min_length 512; - gzip_buffers 8 64k; - gzip_types text/plain text/css text/javascript - application/x-javascript application/javascript; - gzip_proxied any; - - - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass_header Set-Cookie; - proxy_connect_timeout 90; - proxy_send_timeout 90; - proxy_read_timeout 90; - proxy_buffers 32 4k; - fastcgi_read_timeout 300; - - # Error pages - error_page 403 /error/403.html; - error_page 404 /error/404.html; - error_page 502 503 504 /error/50x.html; - - - # Vhost - server { - listen 8083; - server_name _; - root /usr/local/vesta/web; - charset utf-8; - - # Fix error "The plain HTTP request was sent to HTTPS port" - error_page 497 https://$host:$server_port$request_uri; - - ssl on; - ssl_certificate /usr/local/vesta/ssl/certificate.crt; - ssl_certificate_key /usr/local/vesta/ssl/certificate.key; - ssl_session_cache shared:SSL:10m; - ssl_session_timeout 10m; - - error_page 404 /error/404/index.html; - error_page 403 /error/index.html; - error_page 500 /error/index.html; - - location / { - expires max; - index index.php; - } - - location /error/ { - expires max; - index index.html; - } - - location /rrd/ { - expires off; - internal; - } - - location /backup/ { - root /; - internal; - } - - location ~ \.php$ { - include /usr/local/vesta/nginx/conf/fastcgi_params; - fastcgi_param SCRIPT_FILENAME /usr/local/vesta/web/$fastcgi_script_name; - fastcgi_param QUERY_STRING $query_string; - fastcgi_pass unix:/var/run/vesta-php.sock; - fastcgi_intercept_errors on; - break; - } - } -} diff --git a/src/deb/for-download/php/php-fpm.conf b/src/deb/for-download/php/php-fpm.conf deleted file mode 100644 index cd0005f8..00000000 --- a/src/deb/for-download/php/php-fpm.conf +++ /dev/null @@ -1,36 +0,0 @@ -[global] -pid = /var/run/vesta-php.pid -daemonize = yes - -[www] -user = admin -group = admin -listen = /var/run/vesta-php.sock -listen.owner = admin -listen.group = admin -listen.mode = 0660 - -pm = dynamic -pm.max_children = 5 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 3 - -env[HOSTNAME] = $HOSTNAME -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /tmp -env[TMPDIR] = /tmp -env[TEMP] = /tmp -env[VESTA] = $VESTA -env[LANG] = en_US.UTF-8 -php_flag[display_errors] = off -php_admin_value[error_log] = /usr/local/vesta/log/fpm-php.log -php_admin_flag[log_errors] = on -php_admin_value[memory_limit] = 256M -php_admin_value[post_max_size] = 512M -php_admin_value[upload_max_filesize] = 512M -php_admin_value[max_execution_time] = 600 -php_admin_value[max_input_time] = 600 -php_admin_value[session.save_path] = /usr/local/vesta/data/sessions -php_admin_flag[session.cookie_httponly] = on -php_admin_flag[session.cookie_secure] = on diff --git a/src/deb/for-download/php/php.ini b/src/deb/for-download/php/php.ini deleted file mode 100644 index 83fd88f4..00000000 --- a/src/deb/for-download/php/php.ini +++ /dev/null @@ -1,1249 +0,0 @@ -[PHP] - -;;;;;;;;;;;;;;;;;;; -; About php.ini ; -;;;;;;;;;;;;;;;;;;; -; This file controls many aspects of PHP's behavior. In order for PHP to -; read it, it must be named 'php.ini'. PHP looks for it in the current -; working directory, in the path designated by the environment variable -; PHPRC, and in the path that was defined in compile time (in that order). -; Under Windows, the compile-time path is the Windows directory. The -; path in which the php.ini file is looked for can be overridden using -; the -c argument in command line mode. -; -; The syntax of the file is extremely simple. Whitespace and Lines -; beginning with a semicolon are silently ignored (as you probably guessed). -; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. -; -; Directives are specified using the following syntax: -; directive = value -; Directive names are *case sensitive* - foo=bar is different from FOO=bar. -; -; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one -; of the INI constants (On, Off, True, False, Yes, No and None) or an expression -; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo"). -; -; Expressions in the INI file are limited to bitwise operators and parentheses: -; | bitwise OR -; & bitwise AND -; ~ bitwise NOT -; ! boolean NOT -; -; Boolean flags can be turned on using the values 1, On, True or Yes. -; They can be turned off using the values 0, Off, False or No. -; -; An empty string can be denoted by simply not writing anything after the equal -; sign, or by using the None keyword: -; -; foo = ; sets foo to an empty string -; foo = none ; sets foo to an empty string -; foo = "none" ; sets foo to the string 'none' -; -; If you use constants in your value, and these constants belong to a -; dynamically loaded extension (either a PHP extension or a Zend extension), -; you may only use these constants *after* the line that loads the extension. -; -; -;;;;;;;;;;;;;;;;;;; -; About this file ; -;;;;;;;;;;;;;;;;;;; -; This is the recommended, PHP 5-style version of the php.ini-dist file. It -; sets some non standard settings, that make PHP more efficient, more secure, -; and encourage cleaner coding. -; -; The price is that with these settings, PHP may be incompatible with some -; applications, and sometimes, more difficult to develop with. Using this -; file is warmly recommended for production sites. As all of the changes from -; the standard settings are thoroughly documented, you can go over each one, -; and decide whether you want to use it or not. -; -; For general information about the php.ini file, please consult the php.ini-dist -; file, included in your PHP distribution. -; -; This file is different from the php.ini-dist file in the fact that it features -; different values for several directives, in order to improve performance, while -; possibly breaking compatibility with the standard out-of-the-box behavior of -; PHP. Please make sure you read what's different, and modify your scripts -; accordingly, if you decide to use this file instead. -; -; - register_long_arrays = Off [Performance] -; Disables registration of the older (and deprecated) long predefined array -; variables ($HTTP_*_VARS). Instead, use the superglobals that were -; introduced in PHP 4.1.0 -; - display_errors = Off [Security] -; With this directive set to off, errors that occur during the execution of -; scripts will no longer be displayed as a part of the script output, and thus, -; will no longer be exposed to remote users. With some errors, the error message -; content may expose information about your script, web server, or database -; server that may be exploitable for hacking. Production sites should have this -; directive set to off. -; - log_errors = On [Security] -; This directive complements the above one. Any errors that occur during the -; execution of your script will be logged (typically, to your server's error log, -; but can be configured in several ways). Along with setting display_errors to off, -; this setup gives you the ability to fully understand what may have gone wrong, -; without exposing any sensitive information to remote users. -; - output_buffering = 4096 [Performance] -; Set a 4KB output buffer. Enabling output buffering typically results in less -; writes, and sometimes less packets sent on the wire, which can often lead to -; better performance. The gain this directive actually yields greatly depends -; on which Web server you're working with, and what kind of scripts you're using. -; - register_argc_argv = Off [Performance] -; Disables registration of the somewhat redundant $argv and $argc global -; variables. -; - magic_quotes_gpc = Off [Performance] -; Input data is no longer escaped with slashes so that it can be sent into -; SQL databases without further manipulation. Instead, you should use the -; function addslashes() on each input element you wish to send to a database. -; - variables_order = "GPCS" [Performance] -; The environment variables are not hashed into the $_ENV. To access -; environment variables, you can use getenv() instead. -; - error_reporting = E_ALL [Code Cleanliness, Security(?)] -; By default, PHP suppresses errors of type E_NOTICE. These error messages -; are emitted for non-critical errors, but that could be a symptom of a bigger -; problem. Most notably, this will cause error messages about the use -; of uninitialized variables to be displayed. -; - allow_call_time_pass_reference = Off [Code cleanliness] -; It's not possible to decide to force a variable to be passed by reference -; when calling a function. The PHP 4 style to do this is by making the -; function require the relevant argument by reference. - -;;;;;;;;;;;;;;;;;;;; -; Language Options ; -;;;;;;;;;;;;;;;;;;;; - -; Enable the PHP scripting language engine under Apache. -engine = On - -; Enable compatibility mode with Zend Engine 1 (PHP 4.x) -zend.ze1_compatibility_mode = Off - -; Allow the tags are recognized. -; NOTE: Using short tags should be avoided when developing applications or -; libraries that are meant for redistribution, or deployment on PHP -; servers which are not under your control, because short tags may not -; be supported on the target server. For portable, redistributable code, -; be sure not to use short tags. -short_open_tag = On - -; Allow ASP-style <% %> tags. -asp_tags = Off - -; The number of significant digits displayed in floating point numbers. -precision = 14 - -; Enforce year 2000 compliance (will cause problems with non-compliant browsers) -y2k_compliance = On - -; Output buffering allows you to send header lines (including cookies) even -; after you send body content, at the price of slowing PHP's output layer a -; bit. You can enable output buffering during runtime by calling the output -; buffering functions. You can also enable output buffering for all files by -; setting this directive to On. If you wish to limit the size of the buffer -; to a certain size - you can use a maximum number of bytes instead of 'On', as -; a value for this directive (e.g., output_buffering=4096). -output_buffering = 4096 - -; You can redirect all of the output of your scripts to a function. For -; example, if you set output_handler to "mb_output_handler", character -; encoding will be transparently converted to the specified encoding. -; Setting any output handler automatically turns on output buffering. -; Note: People who wrote portable scripts should not depend on this ini -; directive. Instead, explicitly set the output handler using ob_start(). -; Using this ini directive may cause problems unless you know what script -; is doing. -; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler" -; and you cannot use both "ob_gzhandler" and "zlib.output_compression". -; Note: output_handler must be empty if this is set 'On' !!!! -; Instead you must use zlib.output_handler. -;output_handler = - -; Transparent output compression using the zlib library -; Valid values for this option are 'off', 'on', or a specific buffer size -; to be used for compression (default is 4KB) -; Note: Resulting chunk size may vary due to nature of compression. PHP -; outputs chunks that are few hundreds bytes each as a result of -; compression. If you prefer a larger chunk size for better -; performance, enable output_buffering in addition. -; Note: You need to use zlib.output_handler instead of the standard -; output_handler, or otherwise the output will be corrupted. -zlib.output_compression = Off -;zlib.output_compression_level = -1 - -; You cannot specify additional output handlers if zlib.output_compression -; is activated here. This setting does the same as output_handler but in -; a different order. -;zlib.output_handler = - -; Implicit flush tells PHP to tell the output layer to flush itself -; automatically after every output block. This is equivalent to calling the -; PHP function flush() after each and every call to print() or echo() and each -; and every HTML block. Turning this option on has serious performance -; implications and is generally recommended for debugging purposes only. -implicit_flush = Off - -; The unserialize callback function will be called (with the undefined class' -; name as parameter), if the unserializer finds an undefined class -; which should be instantiated. -; A warning appears if the specified function is not defined, or if the -; function doesn't include/implement the missing class. -; So only set this entry, if you really want to implement such a -; callback-function. -unserialize_callback_func= - -; When floats & doubles are serialized store serialize_precision significant -; digits after the floating point. The default value ensures that when floats -; are decoded with unserialize, the data will remain the same. -serialize_precision = 100 - -; Whether to enable the ability to force arguments to be passed by reference -; at function call time. This method is deprecated and is likely to be -; unsupported in future versions of PHP/Zend. The encouraged method of -; specifying which arguments should be passed by reference is in the function -; declaration. You're encouraged to try and turn this option Off and make -; sure your scripts work properly with it in order to ensure they will work -; with future versions of the language (you will receive a warning each time -; you use this feature, and the argument will be passed by value instead of by -; reference). -allow_call_time_pass_reference = Off - -; -; Safe Mode -; -safe_mode = Off - -; By default, Safe Mode does a UID compare check when -; opening files. If you want to relax this to a GID compare, -; then turn on safe_mode_gid. -safe_mode_gid = Off - -; When safe_mode is on, UID/GID checks are bypassed when -; including files from this directory and its subdirectories. -; (directory must also be in include_path or full path must -; be used when including) -safe_mode_include_dir = - -; When safe_mode is on, only executables located in the safe_mode_exec_dir -; will be allowed to be executed via the exec family of functions. -safe_mode_exec_dir = - -; Setting certain environment variables may be a potential security breach. -; This directive contains a comma-delimited list of prefixes. In Safe Mode, -; the user may only alter environment variables whose names begin with the -; prefixes supplied here. By default, users will only be able to set -; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR). -; -; Note: If this directive is empty, PHP will let the user modify ANY -; environment variable! -safe_mode_allowed_env_vars = PHP_ - -; This directive contains a comma-delimited list of environment variables that -; the end user won't be able to change using putenv(). These variables will be -; protected even if safe_mode_allowed_env_vars is set to allow to change them. -safe_mode_protected_env_vars = LD_LIBRARY_PATH - -; open_basedir, if set, limits all file operations to the defined directory -; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -;open_basedir = - -; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_functions = - -; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. -disable_classes = - -; Colors for Syntax Highlighting mode. Anything that's acceptable in -; would work. -;highlight.string = #DD0000 -;highlight.comment = #FF9900 -;highlight.keyword = #007700 -;highlight.bg = #FFFFFF -;highlight.default = #0000BB -;highlight.html = #000000 - -; If enabled, the request will be allowed to complete even if the user aborts -; the request. Consider enabling it if executing long request, which may end up -; being interrupted by the user or a browser timing out. -; ignore_user_abort = On - -; Determines the size of the realpath cache to be used by PHP. This value should -; be increased on systems where PHP opens many files to reflect the quantity of -; the file operations performed. -; realpath_cache_size=16k - -; Duration of time, in seconds for which to cache realpath information for a given -; file or directory. For systems with rarely changing files, consider increasing this -; value. -; realpath_cache_ttl=120 - -; -; Misc -; -; Decides whether PHP may expose the fact that it is installed on the server -; (e.g. by adding its signature to the Web server header). It is no security -; threat in any way, but it makes it possible to determine whether you use PHP -; on your server or not. -expose_php = Off - - -;;;;;;;;;;;;;;;;;;; -; Resource Limits ; -;;;;;;;;;;;;;;;;;;; - -max_execution_time = 300 ; Maximum execution time of each script, in seconds -max_input_time = 120 ; Maximum amount of time each script may spend parsing request data -;max_input_nesting_level = 64 ; Maximum input variable nesting level -memory_limit = 64M ; Maximum amount of memory a script may consume (16MB) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -; Error handling and logging ; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -; error_reporting is a bit-field. Or each number up to get desired error -; reporting level -; E_ALL - All errors and warnings (doesn't include E_STRICT) -; E_ERROR - fatal run-time errors -; E_RECOVERABLE_ERROR - almost fatal run-time errors -; E_WARNING - run-time warnings (non-fatal errors) -; E_PARSE - compile-time parse errors -; E_NOTICE - run-time notices (these are warnings which often result -; from a bug in your code, but it's possible that it was -; intentional (e.g., using an uninitialized variable and -; relying on the fact it's automatically initialized to an -; empty string) -; E_STRICT - run-time notices, enable to have PHP suggest changes -; to your code which will ensure the best interoperability -; and forward compatibility of your code -; E_CORE_ERROR - fatal errors that occur during PHP's initial startup -; E_CORE_WARNING - warnings (non-fatal errors) that occur during PHP's -; initial startup -; E_COMPILE_ERROR - fatal compile-time errors -; E_COMPILE_WARNING - compile-time warnings (non-fatal errors) -; E_USER_ERROR - user-generated error message -; E_USER_WARNING - user-generated warning message -; E_USER_NOTICE - user-generated notice message -; -; Examples: -; -; - Show all errors, except for notices and coding standards warnings -; -;error_reporting = E_ALL & ~E_NOTICE -; -; - Show all errors, except for notices -; -;error_reporting = E_ALL & ~E_NOTICE | E_STRICT -; -; - Show only errors -; -;error_reporting = E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR -; -; - Show all errors, except coding standards warnings -; -error_reporting = E_ALL - -; Print out errors (as a part of the output). For production web sites, -; you're strongly encouraged to turn this feature off, and use error logging -; instead (see below). Keeping display_errors enabled on a production web site -; may reveal security information to end users, such as file paths on your Web -; server, your database schema or other information. -; -; possible values for display_errors: -; -; Off - Do not display any errors -; stderr - Display errors to STDERR (affects only CGI/CLI binaries!) -; On or stdout - Display errors to STDOUT (default) -; -; To output errors to STDERR with CGI/CLI: -;display_errors = "stderr" -; -; Default -; -display_errors = Off - -; Even when display_errors is on, errors that occur during PHP's startup -; sequence are not displayed. It's strongly recommended to keep -; display_startup_errors off, except for when debugging. -display_startup_errors = Off - -; Log errors into a log file (server-specific log, stderr, or error_log (below)) -; As stated above, you're strongly advised to use error logging in place of -; error displaying on production web sites. -log_errors = On - -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -log_errors_max_len = 1024 - -; Do not log repeated messages. Repeated errors must occur in same file on same -; line until ignore_repeated_source is set true. -ignore_repeated_errors = Off - -; Ignore source of message when ignoring repeated messages. When this setting -; is On you will not log errors with repeated messages from different files or -; source lines. -ignore_repeated_source = Off - -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This has only effect in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -report_memleaks = On - -;report_zend_debug = 0 - -; Store the last error/warning message in $php_errormsg (boolean). -track_errors = Off - -; Disable the inclusion of HTML tags in error messages. -; Note: Never use this feature for production boxes. -;html_errors = Off - -; If html_errors is set On PHP produces clickable error messages that direct -; to a page describing the error or function causing the error in detail. -; You can download a copy of the PHP manual from http://www.php.net/docs.php -; and change docref_root to the base URL of your local copy including the -; leading '/'. You must also specify the file extension being used including -; the dot. -; Note: Never use this feature for production boxes. -;docref_root = "/phpmanual/" -;docref_ext = .html - -; String to output before an error message. -;error_prepend_string = "" - -; String to output after an error message. -;error_append_string = "" - -; Log errors to specified file. -;error_log = filename - -; Log errors to syslog (Event Log on NT, not valid in Windows 95). -;error_log = syslog - - -;;;;;;;;;;;;;;;;; -; Data Handling ; -;;;;;;;;;;;;;;;;; -; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 - -; The separator used in PHP generated URLs to separate arguments. -; Default is "&". -;arg_separator.output = "&" - -; List of separator(s) used by PHP to parse input URLs into variables. -; Default is "&". -; NOTE: Every character in this directive is considered as separator! -;arg_separator.input = ";&" - -; This directive describes the order in which PHP registers GET, POST, Cookie, -; Environment and Built-in variables (G, P, C, E & S respectively, often -; referred to as EGPCS or GPC). Registration is done from left to right, newer -; values override older values. -variables_order = "EGPCS" - -; Whether or not to register the EGPCS variables as global variables. You may -; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. -; -; You should do your best to write your scripts so that they do not require -; register_globals to be on; Using form variables as globals can easily lead -; to possible security problems, if the code is not very well thought of. -register_globals = Off - -; Whether or not to register the old-style input arrays, HTTP_GET_VARS -; and friends. If you're not using them, it's recommended to turn them off, -; for performance reasons. -register_long_arrays = Off - -; This directive tells PHP whether to declare the argv&argc variables (that -; would contain the GET information). If you don't use these variables, you -; should turn it off for increased performance. -register_argc_argv = Off - -; When enabled, the SERVER and ENV variables are created when they're first -; used (Just In Time) instead of when the script starts. If these variables -; are not used within a script, having this directive on will result in a -; performance gain. The PHP directives register_globals, register_long_arrays, -; and register_argc_argv must be disabled for this directive to have any affect. -auto_globals_jit = On - -; Maximum size of POST data that PHP will accept. -post_max_size = 8M - -; Magic quotes -; - -; Magic quotes for incoming GET/POST/Cookie data. -magic_quotes_gpc = Off - -; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc. -magic_quotes_runtime = Off - -; Use Sybase-style magic quotes (escape ' with '' instead of \'). -magic_quotes_sybase = Off - -; Automatically add files before or after any PHP document. -auto_prepend_file = /usr/local/vesta/web/inc/secure_login.php -auto_append_file = - -; As of 4.0b4, PHP always outputs a character encoding by default in -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. -; -; PHP's built-in default is text/html -default_mimetype = "text/html" -;default_charset = "iso-8859-1" - -; Always populate the $HTTP_RAW_POST_DATA variable. -;always_populate_raw_post_data = On - - -;;;;;;;;;;;;;;;;;;;;;;;;; -; Paths and Directories ; -;;;;;;;;;;;;;;;;;;;;;;;;; - -; UNIX: "/path1:/path2" -;include_path = ".:/php/includes" -; -; Windows: "\path1;\path2" -;include_path = ".;c:\php\includes" - -; The root of the PHP pages, used only if nonempty. -; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -; if you are running php as a CGI under any web server (other than IIS) -; see documentation for security issues. The alternate is to use the -; cgi.force_redirect configuration below -doc_root = - -; The directory under which PHP opens the script using /~username used only -; if nonempty. -user_dir = - -; Whether or not to enable the dl() function. The dl() function does NOT work -; properly in multithreaded servers, such as IIS or Zeus, and is automatically -; disabled on them. -enable_dl = On - -; cgi.force_redirect is necessary to provide security running PHP as a CGI under -; most web servers. Left undefined, PHP turns this on by default. You can -; turn it off here AT YOUR OWN RISK -; **You CAN safely turn this off for IIS, in fact, you MUST.** -; cgi.force_redirect = 1 - -; if cgi.nph is enabled it will force cgi to always sent Status: 200 with -; every request. -; cgi.nph = 1 - -; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape -; (iPlanet) web servers, you MAY need to set an environment variable name that PHP -; will look for to know it is OK to continue execution. Setting this variable MAY -; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; cgi.redirect_status_env = ; - -; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's -; previous behaviour was to set PATH_TRANSLATED to SCRIPT_FILENAME, and to not grok -; what PATH_INFO is. For more information on PATH_INFO, see the cgi specs. Setting -; this to 1 will cause PHP CGI to fix it's paths to conform to the spec. A setting -; of zero causes PHP to behave as before. Default is 1. You should fix your scripts -; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. -; cgi.fix_pathinfo=1 - -; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate -; security tokens of the calling client. This allows IIS to define the -; security context that the request runs under. mod_fastcgi under Apache -; does not currently support this feature (03/17/2002) -; Set to 1 if running under IIS. Default is zero. -; fastcgi.impersonate = 1; - -; Disable logging through FastCGI connection -; fastcgi.logging = 0 - -; cgi.rfc2616_headers configuration option tells PHP what type of headers to -; use when sending HTTP response code. If it's set 0 PHP sends Status: header that -; is supported by Apache. When this option is set to 1 PHP will send -; RFC2616 compliant header. -; Default is zero. -;cgi.rfc2616_headers = 0 - - -;;;;;;;;;;;;;;;; -; File Uploads ; -;;;;;;;;;;;;;;;; - -; Whether to allow HTTP file uploads. -file_uploads = On - -; Temporary directory for HTTP uploaded files (will use system default if not -; specified). -;upload_tmp_dir = - -; Maximum allowed size for uploaded files. -upload_max_filesize = 2M - - -;;;;;;;;;;;;;;;;;; -; Fopen wrappers ; -;;;;;;;;;;;;;;;;;; - -; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -allow_url_fopen = On - -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -allow_url_include = Off - -; Define the anonymous ftp password (your email address) -;from="john@doe.com" - -; Define the User-Agent string -; user_agent="PHP" - -; Default timeout for socket based streams (seconds) -default_socket_timeout = 60 - -; If your scripts have to deal with files from Macintosh systems, -; or you are running on a Mac and need to deal with files from -; unix or win32 systems, setting this flag will cause PHP to -; automatically detect the EOL character in those files so that -; fgets() and file() will work regardless of the source of the file. -; auto_detect_line_endings = Off - - -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; -; -; If you wish to have an extension loaded automatically, use the following -; syntax: -; -; extension=modulename.extension -; -; For example: -; -; extension=msql.so -; -; Note that it should be the name of the module only; no directory information -; needs to go here. Specify the location of the extension with the -; extension_dir directive above. - - -;;;; -; Note: packaged extension modules are now loaded via the .ini files -; found in the directory /etc/php.d; these are loaded by default. -;;;; - - -;;;;;;;;;;;;;;;;;;; -; Module Settings ; -;;;;;;;;;;;;;;;;;;; - -[Date] -; Defines the default timezone used by the date functions -date.timezone = UTC - -;date.default_latitude = 31.7667 -;date.default_longitude = 35.2333 - -;date.sunrise_zenith = 90.583333 -;date.sunset_zenith = 90.583333 - -[filter] -;filter.default = unsafe_raw -;filter.default_flags = - -[iconv] -;iconv.input_encoding = ISO-8859-1 -;iconv.internal_encoding = ISO-8859-1 -;iconv.output_encoding = ISO-8859-1 - -[sqlite] -;sqlite.assoc_case = 0 - -[xmlrpc] -;xmlrpc_error_number = 0 -;xmlrpc_errors = 0 - -[Pcre] -;PCRE library backtracking limit. -;pcre.backtrack_limit=100000 - -;PCRE library recursion limit. -;Please note that if you set this value to a high number you may consume all -;the available process stack and eventually crash PHP (due to reaching the -;stack size limit imposed by the Operating System). -;pcre.recursion_limit=100000 - -[Syslog] -; Whether or not to define the various syslog variables (e.g. $LOG_PID, -; $LOG_CRON, etc.). Turning it off is a good idea performance-wise. In -; runtime, you can define these variables by calling define_syslog_variables(). -define_syslog_variables = Off - -[mail function] -; For Win32 only. -SMTP = localhost -smtp_port = 25 - -; For Win32 only. -;sendmail_from = me@example.com - -; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -sendmail_path = /usr/sbin/sendmail -t -i - -; Force the addition of the specified parameters to be passed as extra parameters -; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. -;mail.force_extra_parameters = - -[SQL] -sql.safe_mode = Off - -[ODBC] -;odbc.default_db = Not yet implemented -;odbc.default_user = Not yet implemented -;odbc.default_pw = Not yet implemented - -; Allow or prevent persistent links. -odbc.allow_persistent = On - -; Check that a connection is still valid before reuse. -odbc.check_persistent = On - -; Maximum number of persistent links. -1 means no limit. -odbc.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -odbc.max_links = -1 - -; Handling of LONG fields. Returns number of bytes to variables. 0 means -; passthru. -odbc.defaultlrl = 4096 - -; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. -; See the documentation on odbc_binmode and odbc_longreadlen for an explanation -; of uodbc.defaultlrl and uodbc.defaultbinmode -odbc.defaultbinmode = 1 - -[MySQL] -; Allow or prevent persistent links. -mysql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mysql.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -mysql.max_links = -1 - -; Default port number for mysql_connect(). If unset, mysql_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -mysql.default_port = - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysql.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysql.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysql.default_user = - -; Default password for mysql_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysql.default_password = - -; Maximum time (in seconds) for connect timeout. -1 means no limit -mysql.connect_timeout = 60 - -; Trace mode. When trace_mode is active (=On), warnings for table/index scans and -; SQL-Errors will be displayed. -mysql.trace_mode = Off - -[MySQLi] - -; Maximum number of links. -1 means no limit. -mysqli.max_links = -1 - -; Default port number for mysqli_connect(). If unset, mysqli_connect() will use -; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the -; compile-time value defined MYSQL_PORT (in that order). Win32 will only look -; at MYSQL_PORT. -mysqli.default_port = 3306 - -; Default socket name for local MySQL connects. If empty, uses the built-in -; MySQL defaults. -mysqli.default_socket = - -; Default host for mysql_connect() (doesn't apply in safe mode). -mysqli.default_host = - -; Default user for mysql_connect() (doesn't apply in safe mode). -mysqli.default_user = - -; Default password for mysqli_connect() (doesn't apply in safe mode). -; Note that this is generally a *bad* idea to store passwords in this file. -; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") -; and reveal this password! And of course, any users with read access to this -; file will be able to reveal the password as well. -mysqli.default_pw = - -; Allow or prevent reconnect -mysqli.reconnect = Off - -[mSQL] -; Allow or prevent persistent links. -msql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -msql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -msql.max_links = -1 - -[PostgresSQL] -; Allow or prevent persistent links. -pgsql.allow_persistent = On - -; Detect broken persistent links always with pg_pconnect(). -; Auto reset feature requires a little overheads. -pgsql.auto_reset_persistent = Off - -; Maximum number of persistent links. -1 means no limit. -pgsql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -pgsql.max_links = -1 - -; Ignore PostgreSQL backends Notice message or not. -; Notice message logging require a little overheads. -pgsql.ignore_notice = 0 - -; Log PostgreSQL backends Noitce message or not. -; Unless pgsql.ignore_notice=0, module cannot log notice message. -pgsql.log_notice = 0 - -[Sybase] -; Allow or prevent persistent links. -sybase.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybase.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybase.max_links = -1 - -;sybase.interface_file = "/usr/sybase/interfaces" - -; Minimum error severity to display. -sybase.min_error_severity = 10 - -; Minimum message severity to display. -sybase.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -; If on, this will cause PHP to automatically assign types to results according -; to their Sybase type, instead of treating them all as strings. This -; compatibility mode will probably not stay around forever, so try applying -; whatever necessary changes to your code, and turn it off. -sybase.compatability_mode = Off - -[Sybase-CT] -; Allow or prevent persistent links. -sybct.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -sybct.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -sybct.max_links = -1 - -; Minimum server message severity to display. -sybct.min_server_severity = 10 - -; Minimum client message severity to display. -sybct.min_client_severity = 10 - -[bcmath] -; Number of decimal digits for all bcmath functions. -bcmath.scale = 0 - -[browscap] -;browscap = extra/browscap.ini - -[Informix] -; Default host for ifx_connect() (doesn't apply in safe mode). -ifx.default_host = - -; Default user for ifx_connect() (doesn't apply in safe mode). -ifx.default_user = - -; Default password for ifx_connect() (doesn't apply in safe mode). -ifx.default_password = - -; Allow or prevent persistent links. -ifx.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -ifx.max_persistent = -1 - -; Maximum number of links (persistent + non-persistent). -1 means no limit. -ifx.max_links = -1 - -; If on, select statements return the contents of a text blob instead of its id. -ifx.textasvarchar = 0 - -; If on, select statements return the contents of a byte blob instead of its id. -ifx.byteasvarchar = 0 - -; Trailing blanks are stripped from fixed-length char columns. May help the -; life of Informix SE users. -ifx.charasvarchar = 0 - -; If on, the contents of text and byte blobs are dumped to a file instead of -; keeping them in memory. -ifx.blobinfile = 0 - -; NULL's are returned as empty strings, unless this is set to 1. In that case, -; NULL's are returned as string 'NULL'. -ifx.nullformat = 0 - -[Session] -; Handler used to store/retrieve data. -session.save_handler = files - -; Argument passed to save_handler. In the case of files, this is the path -; where data files are stored. Note: Windows users have to change this -; variable in order to use PHP's session functions. -; -; As of PHP 4.0.1, you can define the path as: -; -; session.save_path = "N;/path" -; -; where N is an integer. Instead of storing all the session files in -; /path, what this will do is use subdirectories N-levels deep, and -; store the session data in those directories. This is useful if you -; or your OS have problems with lots of files in one directory, and is -; a more efficient layout for servers that handle lots of sessions. -; -; NOTE 1: PHP will not create this directory structure automatically. -; You can use the script in the ext/session dir for that purpose. -; NOTE 2: See the section on garbage collection below if you choose to -; use subdirectories for session storage -; -; The file storage module creates files using mode 600 by default. -; You can change that by using -; -; session.save_path = "N;MODE;/path" -; -; where MODE is the octal representation of the mode. Note that this -; does not overwrite the process's umask. -;session.save_path = "/var/lib/php/session" -session.save_path = "/tmp" - -; Whether to use cookies. -session.use_cookies = 1 - -;session.cookie_secure = - -; This option enables administrators to make their users invulnerable to -; attacks which involve passing session ids in URLs; defaults to 0. -; session.use_only_cookies = 1 - -; Name of the session (used as cookie name). -session.name = PHPSESSID - -; Initialize session on request startup. -session.auto_start = 0 - -; Lifetime in seconds of cookie or, if 0, until browser is restarted. -session.cookie_lifetime = 0 - -; The path for which the cookie is valid. -session.cookie_path = / - -; The domain for which the cookie is valid. -session.cookie_domain = - -; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. -session.cookie_httponly = - -; Handler used to serialize data. php is the standard serializer of PHP. -session.serialize_handler = php - -; Define the probability that the 'garbage collection' process is started -; on every session initialization. -; The probability is calculated by using gc_probability/gc_divisor, -; e.g. 1/100 means there is a 1% chance that the GC process starts -; on each request. - -session.gc_probability = 1 -session.gc_divisor = 1000 - -; After this number of seconds, stored data will be seen as 'garbage' and -; cleaned up by the garbage collection process. -session.gc_maxlifetime = 1440 - -; NOTE: If you are using the subdirectory option for storing session files -; (see session.save_path above), then garbage collection does *not* -; happen automatically. You will need to do your own garbage -; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): -; cd /path/to/sessions; find -cmin +24 | xargs rm - -; PHP 4.2 and less have an undocumented feature/bug that allows you to -; to initialize a session variable in the global scope, albeit register_globals -; is disabled. PHP 4.3 and later will warn you, if this feature is used. -; You can disable the feature and the warning separately. At this time, -; the warning is only displayed, if bug_compat_42 is enabled. - -session.bug_compat_42 = 0 -session.bug_compat_warn = 1 - -; Check HTTP Referer to invalidate externally stored URLs containing ids. -; HTTP_REFERER has to contain this substring for the session to be -; considered as valid. -session.referer_check = - -; How many bytes to read from the file. -session.entropy_length = 0 - -; Specified here to create the session id. -session.entropy_file = - -;session.entropy_length = 16 - -;session.entropy_file = /dev/urandom - -; Set to {nocache,private,public,} to determine HTTP caching aspects -; or leave this empty to avoid sending anti-caching headers. -session.cache_limiter = nocache - -; Document expires after n minutes. -session.cache_expire = 180 - -; trans sid support is disabled by default. -; Use of trans sid may risk your users security. -; Use this option with caution. -; - User may send URL contains active session ID -; to other person via. email/irc/etc. -; - URL that contains active session ID may be stored -; in publically accessible computer. -; - User may access your site with the same session ID -; always using URL stored in browser's history or bookmarks. -session.use_trans_sid = 0 - -; Select a hash function -; 0: MD5 (128 bits) -; 1: SHA-1 (160 bits) -session.hash_function = 0 - -; Define how many bits are stored in each character when converting -; the binary hash data to something readable. -; -; 4 bits: 0-9, a-f -; 5 bits: 0-9, a-v -; 6 bits: 0-9, a-z, A-Z, "-", "," -session.hash_bits_per_character = 5 - -; The URL rewriter will look for URLs in a defined set of HTML tags. -; form/fieldset are special; if you include them here, the rewriter will -; add a hidden field with the info which is otherwise appended -; to URLs. If you want XHTML conformity, remove the form entry. -; Note that all valid entries require a "=", even if no value follows. -url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -[MSSQL] -; Allow or prevent persistent links. -mssql.allow_persistent = On - -; Maximum number of persistent links. -1 means no limit. -mssql.max_persistent = -1 - -; Maximum number of links (persistent+non persistent). -1 means no limit. -mssql.max_links = -1 - -; Minimum error severity to display. -mssql.min_error_severity = 10 - -; Minimum message severity to display. -mssql.min_message_severity = 10 - -; Compatibility mode with old versions of PHP 3.0. -mssql.compatability_mode = Off - -; Connect timeout -;mssql.connect_timeout = 5 - -; Query timeout -;mssql.timeout = 60 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textlimit = 4096 - -; Valid range 0 - 2147483647. Default = 4096. -;mssql.textsize = 4096 - -; Limits the number of records in each batch. 0 = all records in one batch. -;mssql.batchsize = 0 - -; Specify how datetime and datetim4 columns are returned -; On => Returns data converted to SQL server settings -; Off => Returns values as YYYY-MM-DD hh:mm:ss -;mssql.datetimeconvert = On - -; Use NT authentication when connecting to the server -mssql.secure_connection = Off - -; Specify max number of processes. -1 = library default -; msdlib defaults to 25 -; FreeTDS defaults to 4096 -;mssql.max_procs = -1 - -; Specify client character set. -; If empty or not set the client charset from freetds.comf is used -; This is only used when compiled with FreeTDS -;mssql.charset = "ISO-8859-1" - -[Assertion] -; Assert(expr); active by default. -;assert.active = On - -; Issue a PHP warning for each failed assertion. -;assert.warning = On - -; Don't bail out by default. -;assert.bail = Off - -; User-function to be called if an assertion fails. -;assert.callback = 0 - -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -;assert.quiet_eval = 0 - -[COM] -; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs -;com.typelib_file = -; allow Distributed-COM calls -;com.allow_dcom = true -; autoregister constants of a components typlib on com_load() -;com.autoregister_typelib = true -; register constants casesensitive -;com.autoregister_casesensitive = false -; show warnings on duplicate constant registrations -;com.autoregister_verbose = true - -[mbstring] -; language for internal character representation. -;mbstring.language = Japanese - -; internal/script encoding. -; Some encoding cannot work as internal encoding. -; (e.g. SJIS, BIG5, ISO-2022-*) -;mbstring.internal_encoding = EUC-JP - -; http input encoding. -;mbstring.http_input = auto - -; http output encoding. mb_output_handler must be -; registered as output buffer to function -;mbstring.http_output = SJIS - -; enable automatic encoding translation according to -; mbstring.internal_encoding setting. Input chars are -; converted to internal encoding by setting this to On. -; Note: Do _not_ use automatic encoding translation for -; portable libs/applications. -;mbstring.encoding_translation = Off - -; automatic encoding detection order. -; auto means -;mbstring.detect_order = auto - -; substitute_character used when character cannot be converted -; one from another -;mbstring.substitute_character = none; - -; overload(replace) single byte functions by mbstring functions. -; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), -; etc. Possible values are 0,1,2,4 or combination of them. -; For example, 7 for overload everything. -; 0: No overload -; 1: Overload mail() function -; 2: Overload str*() functions -; 4: Overload ereg*() functions -;mbstring.func_overload = 0 - -; enable strict encoding detection. -;mbstring.strict_encoding = Off - -[FrontBase] -;fbsql.allow_persistent = On -;fbsql.autocommit = On -;fbsql.show_timestamp_decimals = Off -;fbsql.default_database = -;fbsql.default_database_password = -;fbsql.default_host = -;fbsql.default_password = -;fbsql.default_user = "_SYSTEM" -;fbsql.generate_warnings = Off -;fbsql.max_connections = 128 -;fbsql.max_links = 128 -;fbsql.max_persistent = -1 -;fbsql.max_results = 128 - -[gd] -; Tell the jpeg decode to libjpeg warnings and try to create -; a gd image. The warning will then be displayed as notices -; disabled by default -;gd.jpeg_ignore_warning = 0 - -[exif] -; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS. -; With mbstring support this will automatically be converted into the encoding -; given by corresponding encode setting. When empty mbstring.internal_encoding -; is used. For the decode settings you can distinguish between motorola and -; intel byte order. A decode setting cannot be empty. -;exif.encode_unicode = ISO-8859-15 -;exif.decode_unicode_motorola = UCS-2BE -;exif.decode_unicode_intel = UCS-2LE -;exif.encode_jis = -;exif.decode_jis_motorola = JIS -;exif.decode_jis_intel = JIS - -[Tidy] -; The path to a default tidy configuration file to use when using tidy -;tidy.default_config = /usr/local/lib/php/default.tcfg - -; Should tidy clean and repair output automatically? -; WARNING: Do not use this option if you are generating non-html content -; such as dynamic images -tidy.clean_output = Off - -[soap] -; Enables or disables WSDL caching feature. -soap.wsdl_cache_enabled=1 -; Sets the directory name where SOAP extension will put cache files. -soap.wsdl_cache_dir="/tmp" -; (time to live) Sets the number of second while cached file will be used -; instead of original one. -soap.wsdl_cache_ttl=86400 - -; Local Variables: -; tab-width: 4 -; End: diff --git a/src/deb/for-download/tools/W3TC.json b/src/deb/for-download/tools/W3TC.json deleted file mode 100644 index 0ca4cf8d..00000000 --- a/src/deb/for-download/tools/W3TC.json +++ /dev/null @@ -1,953 +0,0 @@ -{ - "version": "2.2.7", - "cluster.messagebus.debug": false, - "cluster.messagebus.enabled": false, - "cluster.messagebus.sns.region": "", - "cluster.messagebus.sns.api_key": "", - "cluster.messagebus.sns.api_secret": "", - "cluster.messagebus.sns.topic_arn": "", - "dbcache.configuration_overloaded": false, - "dbcache.debug": false, - "dbcache.debug_purge": false, - "dbcache.enabled": true, - "dbcache.engine": "memcached", - "dbcache.file.gc": 7200, - "dbcache.file.locking": false, - "dbcache.lifetime": 3600, - "dbcache.memcached.persistent": true, - "dbcache.memcached.aws_autodiscovery": false, - "dbcache.memcached.servers": [ - "127.0.0.1:11211" - ], - "dbcache.memcached.username": "", - "dbcache.memcached.password": "", - "dbcache.memcached.binary_protocol": true, - "dbcache.redis.persistent": true, - "dbcache.redis.servers": [ - "127.0.0.1:6379" - ], - "dbcache.redis.verify_tls_certificates": true, - "dbcache.redis.password": "", - "dbcache.redis.dbid": 0, - "dbcache.redis.timeout": 0, - "dbcache.redis.retry_interval": 0, - "dbcache.redis.read_timeout": 0, - "dbcache.use_filters": false, - "dbcache.reject.constants": [ - "APP_REQUEST", - "DOING_CRON", - "DONOTCACHEDB", - "SHORTINIT", - "XMLRPC_REQUEST" - ], - "dbcache.reject.cookie": [], - "dbcache.reject.logged": true, - "dbcache.reject.sql": [ - "gdsr_", - "wp_rg_", - "_wp_session_", - "_wc_session_" - ], - "dbcache.reject.uri": [ - "" - ], - "dbcache.reject.words": [ - "^\\s*insert\\b", - "^\\s*delete\\b", - "^\\s*update\\b", - "^\\s*replace\\b", - "^\\s*create\\b", - "^\\s*alter\\b", - "^\\s*show\\b", - "^\\s*set\\b", - "\\bautoload\\s+=\\s+'yes'", - "\\bsql_calc_found_rows\\b", - "\\bfound_rows\\(\\)" - ], - "docroot_fix.enable": false, - "lazyload.enabled": false, - "lazyload.threshold": "", - "lazyload.process_img": true, - "lazyload.process_background": true, - "lazyload.googlemaps.google_maps_easy": false, - "lazyload.googlemaps.wp_google_maps": false, - "lazyload.googlemaps.wp_google_map_plugin": false, - "lazyload.exclude": [ - "avia-bg-style-fixed", - "data-bgposition=", - "data-envira-src=", - "data-large_image=", - "data-lazy-original=", - "data-lazy-src=", - "data-lazyload=", - "data-lazysrc=", - "data-no-lazy=", - "data-src=", - "data-srcset=", - "fullurl=", - "lazy-slider-img=", - "loading=\"eager\"", - "no-lazy", - "rev-slidebg", - "skip-lazy", - "soliloquy-image", - "swatch-img", - "w3-total-cache", - "woocommerce\/assets\/images\/placeholder.png", - "wpcf7_captcha" - ], - "lazyload.embed_method": "async_head", - "objectcache.configuration_overloaded": false, - "objectcache.enabled": true, - "objectcache.debug": false, - "objectcache.debug_purge": false, - "objectcache.enabled_for_wp_admin": false, - "objectcache.fallback_transients": true, - "objectcache.engine": "memcached", - "objectcache.file.gc": 7200, - "objectcache.file.locking": false, - "objectcache.memcached.servers": [ - "127.0.0.1:11211" - ], - "objectcache.memcached.persistent": true, - "objectcache.memcached.aws_autodiscovery": false, - "objectcache.memcached.username": "", - "objectcache.memcached.password": "", - "objectcache.memcached.binary_protocol": true, - "objectcache.redis.persistent": true, - "objectcache.redis.servers": [ - "127.0.0.1:6379" - ], - "objectcache.redis.verify_tls_certificates": true, - "objectcache.redis.password": "", - "objectcache.redis.dbid": 0, - "objectcache.redis.timeout": 0, - "objectcache.redis.retry_interval": 0, - "objectcache.redis.read_timeout": 0, - "objectcache.groups.global": [ - "users", - "userlogins", - "usermeta", - "user_meta", - "site-transient", - "site-options", - "site-lookup", - "blog-lookup", - "blog-details", - "rss", - "global-posts" - ], - "objectcache.groups.nonpersistent": [ - "counts", - "plugins" - ], - "objectcache.lifetime": 3600, - "objectcache.purge.all": false, - "pgcache.configuration_overloaded": false, - "pgcache.enabled": true, - "pgcache.comment_cookie_ttl": 86400, - "pgcache.debug": false, - "pgcache.debug_purge": false, - "pgcache.engine": "file_generic", - "pgcache.file.gc": 3600, - "pgcache.file.nfs": false, - "pgcache.file.locking": false, - "pgcache.lifetime": 86400, - "pgcache.memcached.servers": [ - "127.0.0.1:11211" - ], - "pgcache.memcached.persistent": true, - "pgcache.memcached.aws_autodiscovery": false, - "pgcache.memcached.username": "", - "pgcache.memcached.password": "", - "pgcache.memcached.binary_protocol": true, - "pgcache.redis.persistent": true, - "pgcache.redis.servers": [ - "127.0.0.1:6379" - ], - "pgcache.redis.verify_tls_certificates": true, - "pgcache.redis.password": "", - "pgcache.redis.dbid": 0, - "pgcache.redis.timeout": 0, - "pgcache.redis.retry_interval": 0, - "pgcache.redis.read_timeout": 0, - "pgcache.cache.query": false, - "pgcache.cache.home": true, - "pgcache.cache.feed": false, - "pgcache.cache.nginx_handle_xml": false, - "pgcache.cache.ssl": true, - "pgcache.cache.404": false, - "pgcache.cache.headers": [ - "Last-Modified", - "Content-Type", - "X-Pingback", - "P3P", - "Link" - ], - "pgcache.compatibility": false, - "pgcache.remove_charset": false, - "pgcache.accept.uri": [ - "sitemap(_index)?\\.xml(\\.gz)?", - "([a-z0-9_\\-]+)?sitemap\\.xsl", - "[a-z0-9_\\-]+-sitemap([0-9]+)?\\.xml(\\.gz)?" - ], - "pgcache.accept.files": [ - "wp-comments-popup.php", - "wp-links-opml.php", - "wp-locations.php" - ], - "pgcache.accept.qs": [ - "" - ], - "pgcache.late_init": false, - "pgcache.late_caching": false, - "pgcache.mirrors.enabled": false, - "pgcache.mirrors.home_urls": [ - "" - ], - "pgcache.reject.front_page": false, - "pgcache.reject.logged": true, - "pgcache.reject.logged_roles": false, - "pgcache.reject.roles": [ - "" - ], - "pgcache.reject.uri": [ - "wp-.*\\.php", - "index\\.php" - ], - "pgcache.reject.categories": [ - "" - ], - "pgcache.reject.tags": [ - "" - ], - "pgcache.reject.authors": [ - "" - ], - "pgcache.reject.custom": [ - "" - ], - "pgcache.reject.ua": [ - "" - ], - "pgcache.reject.cookie": [ - "wptouch_switch_toggle" - ], - "pgcache.reject.request_head": false, - "pgcache.purge.front_page": true, - "pgcache.purge.home": true, - "pgcache.purge.post": true, - "pgcache.purge.comments": false, - "pgcache.purge.author": false, - "pgcache.purge.terms": false, - "pgcache.purge.archive.daily": false, - "pgcache.purge.archive.monthly": false, - "pgcache.purge.archive.yearly": false, - "pgcache.purge.feed.blog": true, - "pgcache.purge.feed.comments": false, - "pgcache.purge.feed.author": false, - "pgcache.purge.feed.terms": false, - "pgcache.purge.feed.types": [ - "rss2" - ], - "pgcache.purge.postpages_limit": 10, - "pgcache.purge.pages": [ - "" - ], - "pgcache.purge.sitemap_regex": "([a-z0-9_\\-]*?)sitemap([a-z0-9_\\-]*)?\\.xml", - "pgcache.prime.enabled": false, - "pgcache.prime.interval": 900, - "pgcache.prime.limit": 10, - "pgcache.prime.sitemap": "", - "pgcache.prime.post.enabled": false, - "pgcache.rest": "", - "pgcache.cookiegroups.enabled": false, - "pgcache.cookiegroups.groups": { - "mobile": { - "enabled": false, - "cache": true, - "cookies": [ - "wptouch-pro-view=mobile", - "wptouch-pro-cache-state=mobile" - ] - }, - "loggedin": { - "enabled": false, - "cache": true, - "cookies": [ - "wordpress_logged_in_.*" - ] - }, - "subscribers": { - "enabled": false, - "cache": true, - "cookies": [ - "role=subscriber", - "role=member" - ] - } - }, - "stats.enabled": false, - "stats.slot_seconds": 60, - "stats.slots_count": 60, - "stats.cpu.enabled": false, - "stats.access_log.enabled": false, - "stats.access_log.filename": "", - "stats.access_log.format": "%h %l %u %t \\\"%r\\\" %>s %O \\\"%{Referer}i\\\" \\\"%{User-Agent}i\\\"", - "stats.access_log.webserver": "apache", - "minify.configuration_overloaded": false, - "minify.enabled": false, - "minify.auto": true, - "minify.debug": false, - "minify.engine": "file", - "minify.error.notification": "", - "minify.file.gc": 86400, - "minify.file.nfs": false, - "minify.file.locking": false, - "minify.memcached.servers": [ - "127.0.0.1:11211" - ], - "minify.memcached.persistent": true, - "minify.memcached.aws_autodiscovery": false, - "minify.memcached.username": "", - "minify.memcached.password": "", - "minify.memcached.binary_protocol": true, - "minify.redis.persistent": true, - "minify.redis.servers": [ - "127.0.0.1:6379" - ], - "minify.redis.verify_tls_certificates": true, - "minify.redis.password": "", - "minify.redis.dbid": 0, - "minify.redis.timeout": 0, - "minify.redis.retry_interval": 0, - "minify.redis.read_timeout": 0, - "minify.rewrite": true, - "minify.options": [], - "minify.symlinks": [], - "minify.lifetime": 86400, - "minify.upload": true, - "minify.html.enable": false, - "minify.html.engine": "html", - "minify.html.reject.feed": false, - "minify.html.inline.css": false, - "minify.html.inline.js": false, - "minify.html.strip.crlf": false, - "minify.html.comments.ignore": [ - "google_ad_", - "RSPEAK_", - "mfunc" - ], - "minify.css.enable": true, - "minify.css.engine": "css", - "minify.css.method": "both", - "minify.css.http2push": false, - "minify.css.strip.comments": false, - "minify.css.strip.crlf": false, - "minify.css.embed": false, - "minify.css.imports": "", - "minify.css.groups": [], - "minify.js.http2push": false, - "minify.js.enable": true, - "minify.js.engine": "js", - "minify.js.method": "both", - "minify.js.combine.header": false, - "minify.js.header.embed_type": "blocking", - "minify.js.combine.body": false, - "minify.js.body.embed_type": "blocking", - "minify.js.combine.footer": false, - "minify.js.footer.embed_type": "blocking", - "minify.js.strip.comments": false, - "minify.js.strip.crlf": false, - "minify.js.groups": [], - "minify.yuijs.path.java": "java", - "minify.yuijs.path.jar": "yuicompressor.jar", - "minify.yuijs.options.line-break": 5000, - "minify.yuijs.options.nomunge": false, - "minify.yuijs.options.preserve-semi": false, - "minify.yuijs.options.disable-optimizations": false, - "minify.yuicss.path.java": "java", - "minify.yuicss.path.jar": "yuicompressor.jar", - "minify.yuicss.options.line-break": 5000, - "minify.ccjs.path.java": "java", - "minify.ccjs.path.jar": "compiler.jar", - "minify.ccjs.options.compilation_level": "SIMPLE_OPTIMIZATIONS", - "minify.ccjs.options.formatting": "", - "minify.csstidy.options.remove_bslash": true, - "minify.csstidy.options.compress_colors": false, - "minify.csstidy.options.compress_font-weight": false, - "minify.csstidy.options.lowercase_s": false, - "minify.csstidy.options.optimise_shorthands": 0, - "minify.csstidy.options.remove_last_;": false, - "minify.csstidy.options.remove_space_before_important": false, - "minify.csstidy.options.case_properties": 1, - "minify.csstidy.options.sort_properties": false, - "minify.csstidy.options.sort_selectors": false, - "minify.csstidy.options.merge_selectors": 0, - "minify.csstidy.options.discard_invalid_selectors": false, - "minify.csstidy.options.discard_invalid_properties": false, - "minify.csstidy.options.css_level": "CSS3.0", - "minify.csstidy.options.preserve_css": false, - "minify.csstidy.options.timestamp": false, - "minify.csstidy.options.template": "highest_compression", - "minify.htmltidy.options.clean": false, - "minify.htmltidy.options.hide-comments": true, - "minify.htmltidy.options.wrap": 0, - "minify.reject.logged": false, - "minify.reject.ua": [], - "minify.reject.uri": [], - "minify.reject.files.js": [], - "minify.reject.files.css": [], - "minify.cache.files": [ - "" - ], - "minify.cache.files_regexp": false, - "cdn.configuration_overloaded": false, - "cdn.enabled": false, - "cdn.debug": false, - "cdn.flush_manually": false, - "cdn.engine": "stackpath2", - "cdn.uploads.enable": true, - "cdn.includes.enable": true, - "cdn.includes.files": "*.css;*.js;*.gif;*.png;*.jpg;*.xml", - "cdn.theme.enable": true, - "cdn.theme.files": "*.css;*.js;*.gif;*.png;*.jpg;*.ico;*.ttf;*.otf;*.woff;*.woff2;*.less", - "cdn.minify.enable": true, - "cdn.custom.enable": true, - "cdn.custom.files": [ - "favicon.ico", - "{wp_content_dir}\/gallery\/*", - "{wp_content_dir}\/uploads\/avatars\/*", - "{plugins_dir}\/wordpress-seo\/css\/xml-sitemap.xsl", - "{plugins_dir}\/wp-minify\/min*", - "{plugins_dir}\/*.js", - "{plugins_dir}\/*.css", - "{plugins_dir}\/*.gif", - "{plugins_dir}\/*.jpg", - "{plugins_dir}\/*.png" - ], - "cdn.import.files": false, - "cdn.queue.interval": 900, - "cdn.queue.limit": 25, - "cdn.force.rewrite": false, - "cdn.autoupload.enabled": false, - "cdn.autoupload.interval": 3600, - "cdn.canonical_header": false, - "cdn.admin.media_library": false, - "cdn.cors_header": true, - "cdn.ftp.host": "", - "cdn.ftp.type": "", - "cdn.ftp.user": "", - "cdn.ftp.pass": "", - "cdn.ftp.path": "", - "cdn.ftp.pasv": false, - "cdn.ftp.domain": [], - "cdn.ftp.ssl": "auto", - "cdn.ftp.default_keys": true, - "cdn.ftp.pubkey": "", - "cdn.ftp.privkey": "", - "cdn.google_drive.client_id": "", - "cdn.google_drive.refresh_token": "", - "cdn.google_drive.folder.id": "", - "cdn.google_drive.folder.title": "", - "cdn.google_drive.folder.url": "", - "cdn.highwinds.account_hash": "", - "cdn.highwinds.api_token": "", - "cdn.highwinds.host.hash_code": "", - "cdn.highwinds.host.domains": [], - "cdn.highwinds.ssl": "auto", - "cdn.s3.key": "", - "cdn.s3.secret": "", - "cdn.s3.bucket": "", - "cdn.s3.bucket.location": "us-east-1", - "cdn.s3.cname": [], - "cdn.s3.ssl": "auto", - "cdn.s3.public_objects": "enabled", - "cdn.s3_compatible.api_host": "auto", - "cdn.cf.key": "", - "cdn.cf.secret": "", - "cdn.cf.bucket": "", - "cdn.cf.bucket.location": "us-east-1", - "cdn.cf.id": "", - "cdn.cf.cname": [], - "cdn.cf.ssl": "auto", - "cdn.cf.public_objects": "enabled", - "cdn.cf2.key": "", - "cdn.cf2.secret": "", - "cdn.cf2.id": "", - "cdn.cf2.cname": [], - "cdn.cf2.ssl": "", - "cdn.rscf.user": "", - "cdn.rscf.key": "", - "cdn.rscf.location": "us", - "cdn.rscf.container": "", - "cdn.rscf.cname": [], - "cdn.rscf.ssl": "auto", - "cdn.rackspace_cdn.user_name": "", - "cdn.rackspace_cdn.api_key": "", - "cdn.rackspace_cdn.region": "", - "cdn.rackspace_cdn.service.access_url": "", - "cdn.rackspace_cdn.service.id": "", - "cdn.rackspace_cdn.service.name": "", - "cdn.rackspace_cdn.service.protocol": "http", - "cdn.rackspace_cdn.domains": [], - "cdn.azure.user": "", - "cdn.azure.key": "", - "cdn.azure.container": "", - "cdn.azure.cname": [], - "cdn.azure.ssl": "auto", - "cdn.mirror.domain": [], - "cdn.mirror.ssl": "auto", - "cdn.limelight.short_name": "", - "cdn.limelight.username": "", - "cdn.limelight.api_key": "", - "cdn.limelight.host.domains": [], - "cdn.limelight.ssl": "auto", - "cdn.maxcdn.authorization_key": "", - "cdn.maxcdn.domain": [], - "cdn.maxcdn.ssl": "auto", - "cdn.maxcdn.zone_id": 0, - "cdn.cotendo.username": "", - "cdn.cotendo.password": "", - "cdn.cotendo.zones": [], - "cdn.cotendo.domain": [], - "cdn.cotendo.ssl": "auto", - "cdn.akamai.username": "", - "cdn.akamai.password": "", - "cdn.akamai.email_notification": [], - "cdn.akamai.action": "invalidate", - "cdn.akamai.zone": "production", - "cdn.akamai.domain": [], - "cdn.akamai.ssl": "auto", - "cdn.edgecast.account": "", - "cdn.edgecast.token": "", - "cdn.edgecast.domain": [], - "cdn.edgecast.ssl": "auto", - "cdn.att.account": "", - "cdn.att.token": "", - "cdn.att.domain": [], - "cdn.att.ssl": "auto", - "cdn.stackpath.authorization_key": "", - "cdn.stackpath.domain": [], - "cdn.stackpath.ssl": "auto", - "cdn.stackpath.zone_id": 0, - "cdn.stackpath2.client_id": "", - "cdn.stackpath2.client_secret": "", - "cdn.stackpath2.stack_id": "", - "cdn.stackpath2.site_id": 0, - "cdn.stackpath2.site_root_domain": 0, - "cdn.stackpath2.domain": [], - "cdn.stackpath2.ssl": "auto", - "cdn.reject.admins": false, - "cdn.reject.logged_roles": false, - "cdn.reject.roles": [], - "cdn.reject.ua": [], - "cdn.reject.uri": [], - "cdn.reject.files": [ - "{uploads_dir}\/wpcf7_captcha\/*", - "{uploads_dir}\/imagerotator.swf", - "{plugins_dir}\/wp-fb-autoconnect\/facebook-platform\/channel.html" - ], - "cdn.reject.ssl": false, - "cdnfsd.enabled": false, - "cdnfsd.engine": "", - "cdnfsd.debug": false, - "cdnfsd.cloudfront.access_key": "", - "cdnfsd.cloudfront.secret_key": "", - "cdnfsd.cloudfront.distribution_id": "", - "cdnfsd.limelight.short_name": "", - "cdnfsd.limelight.username": "", - "cdnfsd.limelight.api_key": "", - "cdnfsd.maxcdn.api_key": "", - "cdnfsd.maxcdn.zone_id": 0, - "cdnfsd.stackpath.api_key": "", - "cdnfsd.stackpath.zone_id": 0, - "cdnfsd.stackpath2.client_id": "", - "cdnfsd.stackpath2.client_secret": "", - "cdnfsd.stackpath2.stack_id": "", - "cdnfsd.stackpath2.site_id": 0, - "cdnfsd.stackpath2.site_root_domain": 0, - "cdnfsd.stackpath2.domain": [], - "cdnfsd.stackpath2.ssl": "auto", - "cdnfsd.transparentcdn.client_id": "", - "cdnfsd.transparentcdn.client_secret": "", - "cdnfsd.transparentcdn.company_id": "", - "varnish.configuration_overloaded": false, - "varnish.enabled": false, - "varnish.debug": false, - "varnish.servers": [ - "" - ], - "browsercache.configuration_overloaded": false, - "browsercache.enabled": false, - "browsercache.rewrite": false, - "browsercache.no404wp": false, - "browsercache.no404wp.exceptions": [ - "robots\\.txt", - "[a-z0-9_\\-]*sitemap[a-z0-9_\\.\\-]*\\.(xml|xsl|html)(\\.gz)?" - ], - "browsercache.cssjs.last_modified": true, - "browsercache.cssjs.compression": true, - "browsercache.cssjs.brotli": false, - "browsercache.cssjs.expires": true, - "browsercache.cssjs.lifetime": 31536000, - "browsercache.cssjs.nocookies": true, - "browsercache.cssjs.cache.control": false, - "browsercache.cssjs.cache.policy": "cache_public_maxage", - "browsercache.cssjs.etag": true, - "browsercache.cssjs.w3tc": false, - "browsercache.cssjs.replace": false, - "browsercache.cssjs.querystring": false, - "browsercache.html.compression": true, - "browsercache.html.brotli": false, - "browsercache.html.last_modified": true, - "browsercache.html.expires": false, - "browsercache.html.lifetime": 3600, - "browsercache.html.cache.control": false, - "browsercache.html.cache.policy": "cache_public_maxage", - "browsercache.html.etag": true, - "browsercache.html.w3tc": false, - "browsercache.html.replace": false, - "browsercache.other.last_modified": true, - "browsercache.other.compression": true, - "browsercache.other.brotli": false, - "browsercache.other.expires": true, - "browsercache.other.lifetime": 31536000, - "browsercache.other.nocookies": true, - "browsercache.other.cache.control": false, - "browsercache.other.cache.policy": "cache_public_maxage", - "browsercache.other.etag": true, - "browsercache.other.w3tc": false, - "browsercache.other.replace": false, - "browsercache.other.querystring": false, - "browsercache.replace.exceptions": [], - "browsercache.security.session.cookie_httponly": "", - "browsercache.security.session.cookie_secure": "", - "browsercache.security.session.use_only_cookies": "", - "browsercache.hsts": false, - "browsercache.security.hsts.directive": "maxage", - "browsercache.security.xfo": false, - "browsercache.security.xfo.directive": "same", - "browsercache.security.xfo.allow": "", - "browsercache.security.xss": false, - "browsercache.security.xss.directive": "block", - "browsercache.security.xcto": false, - "browsercache.security.pkp": false, - "browsercache.security.pkp.pin": "", - "browsercache.security.pkp.pin.backup": "", - "browsercache.security.pkp.extra": "maxage", - "browsercache.security.pkp.report.url": "", - "browsercache.security.pkp.report.only": "0", - "browsercache.security.referrer.policy": "false", - "browsercache.security.referrer.policy.directive": "no-referrer-when-downgrade", - "browsercache.security.csp": false, - "browsercache.security.csp.base": "", - "browsercache.security.csp.frame": "", - "browsercache.security.csp.connect": "", - "browsercache.security.csp.font": "", - "browsercache.security.csp.script": "", - "browsercache.security.csp.style": "", - "browsercache.security.csp.img": "", - "browsercache.security.csp.media": "", - "browsercache.security.csp.object": "", - "browsercache.security.csp.plugin": "", - "browsercache.security.csp.form": "", - "browsercache.security.csp.frame.ancestors": "", - "browsercache.security.csp.sandbox": "", - "browsercache.security.csp.default": "", - "browsercache.security.fp": false, - "browsercache.security.fp.values": [], - "mobile.configuration_overloaded": false, - "mobile.enabled": false, - "mobile.rgroups": { - "tablets": { - "theme": "", - "enabled": false, - "redirect": "", - "agents": [ - "a1-32ab0", - "a210", - "a211", - "b6000-h", - "b8000-h", - "bnrv200", - "bntv400", - "darwin", - "gt-n8005", - "gt-p3105", - "gt-p6810", - "gt-p7510", - "hmj37", - "hp-tablet", - "hp\\sslate", - "hp\\sslatebook", - "ht7s3", - "ideatab_a1107", - "ideataba2109a", - "ideos\\ss7", - "imm76d", - "ipad", - "k00f", - "kfjwi", - "kfot", - "kftt", - "kindle", - "l-06c", - "lg-f200k", - "lg-f200l", - "lg-f200s", - "m470bsa", - "m470bse", - "maxwell", - "me173x", - "mediapad", - "midc497", - "msi\\senjoy\\s10\\splus", - "mz601", - "mz616", - "nexus", - "nookcolor", - "pg09410", - "pg41200", - "pmp5570c", - "pmp5588c", - "pocketbook", - "qmv7a", - "sgp311", - "sgpt12", - "shv-e230k", - "shw-m305w", - "shw-m380w", - "sm-p605", - "smarttab", - "sonysgp321", - "sph-p500", - "surfpad", - "tab07-200", - "tab10-201", - "tab465euk", - "tab474", - "tablet", - "tegranote", - "tf700t", - "thinkpad", - "viewpad", - "voltaire" - ] - }, - "phones": { - "theme": "", - "enabled": false, - "redirect": "", - "agents": [ - "(android|bb\\d+|meego).+mobile", - "240x320", - "2.0\\ mmp", - "\\bppc\\b", - "acer\\ s100", - "alcatel", - "amoi", - "archos5", - "asus", - "au-mic", - "audiovox", - "avantgo", - "bada", - "benq", - "bird", - "blackberry", - "blazer", - "cdm", - "cellphone", - "cupcake", - "danger", - "ddipocket", - "docomo", - "docomo\\ ht-03a", - "dopod", - "dream", - "elaine\/3.0", - "ericsson", - "eudoraweb", - "fly", - "froyo", - "googlebot-mobile", - "haier", - "hiptop", - "hp.ipaq", - "htc", - "htc\\ hero", - "htc\\ magic", - "htc_dream", - "htc_magic", - "huawei", - "i-mobile", - "iemobile", - "iemobile\/7", - "iemobile\/7.0", - "iemobile\/9", - "incognito", - "iphone", - "ipod", - "j-phone", - "kddi", - "konka", - "kwc", - "kyocera\/wx310k", - "lenovo", - "lg", - "lg\/u990", - "lg-gw620", - "lge\\ vx", - "liquid\\ build", - "maemo", - "midp", - "midp-2.0", - "mmef20", - "mmp", - "mobilephone", - "mot-mb200", - "mot-mb300", - "mot-v", - "motorola", - "msie\\ 10.0", - "netfront", - "newgen", - "newt", - "nexus\\ 7", - "nexus\\ one", - "nintendo\\ ds", - "nintendo\\ wii", - "nitro", - "nokia", - "novarra", - "openweb", - "opera\\ mini", - "opera\\ mobi", - "opera.mobi", - "p160u", - "palm", - "panasonic", - "pantech", - "pdxgw", - "pg", - "philips", - "phone", - "playbook", - "playstation\\ portable", - "portalmmm", - "proxinet", - "psp", - "qtek", - "s8000", - "sagem", - "samsung", - "samsung-s8000", - "sanyo", - "sch", - "sch-i800", - "sec", - "sendo", - "series60.*webkit", - "series60\/5.0", - "sgh", - "sharp", - "sharp-tq-gx10", - "small", - "smartphone", - "softbank", - "sonyericsson", - "sonyericssone10", - "sonyericssonu20", - "sonyericssonx10", - "sph", - "symbian", - "symbian\\ os", - "symbianos", - "t-mobile\\ mytouch\\ 3g", - "t-mobile\\ opal", - "tattoo", - "toshiba", - "touch", - "treo", - "ts21i-10", - "up.browser", - "up.link", - "uts", - "vertu", - "vodafone", - "wap", - "webmate", - "webos", - "willcome", - "windows\\ ce", - "windows.ce", - "winwap", - "xda", - "xoom", - "zte" - ] - } - }, - "referrer.configuration_overloaded": false, - "referrer.enabled": false, - "referrer.rgroups": { - "search_engines": { - "theme": "", - "enabled": false, - "redirect": "", - "referrers": [ - "google\\.com", - "yahoo\\.com", - "bing\\.com", - "ask\\.com", - "msn\\.com" - ] - } - }, - "common.track_usage": true, - "common.tweeted": false, - "config.check": true, - "config.path": "", - "widget.latest.items": 3, - "widget.latest_news.items": 5, - "widget.pagespeed.enabled": false, - "widget.pagespeed.key": "", - "widget.pagespeed.key.restrict.referrer": "", - "widget.pagespeed.show_in_admin_bar": false, - "timelimit.email_send": 180, - "timelimit.varnish_purge": 300, - "timelimit.cache_flush": 600, - "timelimit.cache_gc": 600, - "timelimit.cdn_upload": 600, - "timelimit.cdn_delete": 300, - "timelimit.cdn_purge": 300, - "timelimit.cdn_import": 600, - "timelimit.cdn_test": 300, - "timelimit.domain_rename": 120, - "timelimit.minify_recommendations": 600, - "common.instance_id": 1165104676, - "common.force_master": true, - "extensions.active": { - "fragmentcache": "w3-total-cache\/Extension_FragmentCache_Plugin.php" - }, - "extensions.active_frontend": [], - "extensions.active_dropin": [], - "plugin.license_key": "", - "plugin.type": "", - "jquerymigrate.disabled": false, - "imageservice": { - "compression": "lossy", - "auto": "enabled", - "visibility": "never" - }, - "imageservice.configuration_overloaded": true, - "robots_block.enable": false, - "fragmentcache": { - "engine": "memcached" - }, - "pgcache.bad_behavior_path": "", - "newrelic": { - "monitoring_type": "apm" - } -} diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.sh deleted file mode 100755 index 081aaf19..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php5.6-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -write_file=0 -if [ ! -f "$pool_file_56" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_56) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi -if [ -f "/etc/php/5.6/fpm/pool.d/www.conf" ]; then - rm /etc/php/5.6/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.stpl deleted file mode 100644 index a24b368f..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.tpl deleted file mode 100644 index 55bc8233..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-56.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.sh deleted file mode 100755 index 10c58c57..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.0-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_70" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_70) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi -if [ -f "/etc/php/7.0/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.0/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.stpl deleted file mode 100644 index 5d944c0f..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.tpl deleted file mode 100644 index c9378152..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-70.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.sh deleted file mode 100755 index 90230674..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.1-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_71" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_71) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi -if [ -f "/etc/php/7.1/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.1/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.stpl deleted file mode 100644 index a718b21f..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.tpl deleted file mode 100644 index 9f0cf8a7..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-71.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.sh deleted file mode 100755 index cc76256e..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.2-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_72" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_72) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi -if [ -f "/etc/php/7.2/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.2/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.stpl deleted file mode 100644 index 20792e92..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.tpl deleted file mode 100644 index 89b19147..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-72.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.sh deleted file mode 100755 index a2fea927..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.3-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_73" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_73) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi -if [ -f "/etc/php/7.3/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.3/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.stpl deleted file mode 100644 index 39777224..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.tpl deleted file mode 100644 index b6e306d7..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73-public.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.sh deleted file mode 100755 index a2fea927..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.3-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_73" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_73) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi -if [ -f "/etc/php/7.3/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.3/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.stpl deleted file mode 100644 index 902d647a..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.tpl deleted file mode 100644 index 40df2629..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-73.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh deleted file mode 100755 index e72bb003..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_74" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_74) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi -if [ -f "/etc/php/7.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.4/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.stpl deleted file mode 100644 index 739cb48d..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.tpl deleted file mode 100644 index f31ed5a8..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74-public.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.sh deleted file mode 100755 index e72bb003..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php7.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_74" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_74) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi -if [ -f "/etc/php/7.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/7.4/fpm/pool.d/www.conf -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.stpl deleted file mode 100644 index fbc1d9c6..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.tpl deleted file mode 100644 index aaf8f62c..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-74.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.sh deleted file mode 100644 index a4842ac9..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.0-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_80" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_80) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi -if [ -f "/etc/php/8.0/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.0/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.stpl deleted file mode 100644 index b1335a44..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.0-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.tpl deleted file mode 100644 index 1b0a610c..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80-public.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.0-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.sh deleted file mode 100644 index a4842ac9..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.sh +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.0-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_80" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_80) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi -if [ -f "/etc/php/8.0/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.0/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.stpl deleted file mode 100644 index fae336fc..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.0-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.tpl deleted file mode 100644 index 64699c22..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-80.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.0-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.sh deleted file mode 100644 index 4b4f9d78..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.1-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_81" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_81) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi -if [ -f "/etc/php/8.1/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.1/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.stpl deleted file mode 100644 index 4116fd42..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.1-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.tpl deleted file mode 100644 index ee319a20..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81-public.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.1-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.sh deleted file mode 100644 index 4b4f9d78..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.1-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_81" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_81) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi -if [ -f "/etc/php/8.1/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.1/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.stpl deleted file mode 100644 index 5822a27a..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.stpl +++ /dev/null @@ -1,44 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.1-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.tpl deleted file mode 100644 index 7864b3a4..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-81.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - -# -# RMode config -# RUidGid %user% %group% -# RGroups www-data -# -# -# AssignUserID %user% %group% -# - - - SetHandler "proxy:unix:/run/php/php8.1-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.sh deleted file mode 100644 index a4deb752..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.2-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_82" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_82) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi -if [ -f "/etc/php/8.2/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.2/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.stpl deleted file mode 100644 index 809e7f33..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.tpl deleted file mode 100644 index 679d1409..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82-public.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.sh deleted file mode 100644 index a4deb752..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.2-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_82" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_82) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi -if [ -f "/etc/php/8.2/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.2/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.stpl deleted file mode 100644 index e0d04794..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.tpl deleted file mode 100644 index eba95935..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-82.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.2-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.sh deleted file mode 100644 index f5e7c6fd..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.3-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_83" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_83) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi -if [ -f "/etc/php/8.3/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.3/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl deleted file mode 100644 index cceed0ee..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl deleted file mode 100644 index ac952817..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.sh deleted file mode 100644 index f5e7c6fd..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.sh +++ /dev/null @@ -1,126 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.3-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_83" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_83) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi -if [ -f "/etc/php/8.3/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.3/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.stpl deleted file mode 100644 index f043bfa8..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.tpl deleted file mode 100644 index 9b5bf916..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-83.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.3-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.sh deleted file mode 100644 index cbea2de9..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" -pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -if [ -f "$pool_file_83" ]; then - rm $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_84" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_84) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_84 - systemctl reset-failed php8.4-fpm - systemctl restart php8.4-fpm -fi -if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.4/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl deleted file mode 100644 index 91e05b17..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl deleted file mode 100644 index 94acbf15..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot%/public - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.sh b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.sh deleted file mode 100644 index cbea2de9..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash -# Adding php pool conf -user="$1" -domain="$2" -ip="$3" -home_dir="$4" -docroot="$5" - -pool_conf="[$2] - -listen = /run/php/php8.4-fpm-$2.sock -listen.owner = $1 -listen.group = $1 -listen.mode = 0666 - -user = $1 -group = $1 - -pm = ondemand -pm.max_children = 8 -request_terminate_timeout = 360s -pm.max_requests = 4000 -pm.process_idle_timeout = 10s -pm.status_path = /status - -php_admin_value[upload_tmp_dir] = /home/$1/tmp -php_admin_value[session.save_path] = /home/$1/tmp -php_admin_value[open_basedir] = $5:/home/$1/tmp:/bin:/usr/bin:/usr/local/bin:/var/www/html:/tmp:/usr/share:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/roundcube:/var/log/roundcube:/var/lib/roundcube -php_admin_value[upload_max_filesize] = 800M -php_admin_value[max_execution_time] = 300 -php_admin_value[post_max_size] = 800M -php_admin_value[memory_limit] = 512M -php_admin_value[sendmail_path] = \"/usr/sbin/sendmail -t -i -f info@$2\" -php_admin_flag[mysql.allow_persistent] = off -php_admin_flag[safe_mode] = off - -env[PATH] = /usr/local/bin:/usr/bin:/bin -env[TMP] = /home/$1/tmp -env[TMPDIR] = /home/$1/tmp -env[TEMP] = /home/$1/tmp -" - -pool_file_56="/etc/php/5.6/fpm/pool.d/$2.conf" -pool_file_70="/etc/php/7.0/fpm/pool.d/$2.conf" -pool_file_71="/etc/php/7.1/fpm/pool.d/$2.conf" -pool_file_72="/etc/php/7.2/fpm/pool.d/$2.conf" -pool_file_73="/etc/php/7.3/fpm/pool.d/$2.conf" -pool_file_74="/etc/php/7.4/fpm/pool.d/$2.conf" -pool_file_80="/etc/php/8.0/fpm/pool.d/$2.conf" -pool_file_81="/etc/php/8.1/fpm/pool.d/$2.conf" -pool_file_82="/etc/php/8.2/fpm/pool.d/$2.conf" -pool_file_83="/etc/php/8.3/fpm/pool.d/$2.conf" -pool_file_84="/etc/php/8.4/fpm/pool.d/$2.conf" - -if [ -f "$pool_file_56" ]; then - rm $pool_file_56 - systemctl reset-failed php5.6-fpm - systemctl restart php5.6-fpm -fi - -if [ -f "$pool_file_70" ]; then - rm $pool_file_70 - systemctl reset-failed php7.0-fpm - systemctl restart php7.0-fpm -fi - -if [ -f "$pool_file_71" ]; then - rm $pool_file_71 - systemctl reset-failed php7.1-fpm - systemctl restart php7.1-fpm -fi - -if [ -f "$pool_file_72" ]; then - rm $pool_file_72 - systemctl reset-failed php7.2-fpm - systemctl restart php7.2-fpm -fi - -if [ -f "$pool_file_73" ]; then - rm $pool_file_73 - systemctl reset-failed php7.3-fpm - systemctl restart php7.3-fpm -fi - -if [ -f "$pool_file_74" ]; then - rm $pool_file_74 - systemctl reset-failed php7.4-fpm - systemctl restart php7.4-fpm -fi - -if [ -f "$pool_file_80" ]; then - rm $pool_file_80 - systemctl reset-failed php8.0-fpm - systemctl restart php8.0-fpm -fi - -if [ -f "$pool_file_81" ]; then - rm $pool_file_81 - systemctl reset-failed php8.1-fpm - systemctl restart php8.1-fpm -fi - -if [ -f "$pool_file_82" ]; then - rm $pool_file_82 - systemctl reset-failed php8.2-fpm - systemctl restart php8.2-fpm -fi - -if [ -f "$pool_file_83" ]; then - rm $pool_file_83 - systemctl reset-failed php8.3-fpm - systemctl restart php8.3-fpm -fi - -write_file=0 -if [ ! -f "$pool_file_84" ]; then - write_file=1 -else - user_count=$(grep -c "/home/$1/" $pool_file_84) - if [ $user_count -eq 0 ]; then - write_file=1 - fi -fi -if [ $write_file -eq 1 ]; then - echo "$pool_conf" > $pool_file_84 - systemctl reset-failed php8.4-fpm - systemctl restart php8.4-fpm -fi -if [ -f "/etc/php/8.4/fpm/pool.d/www.conf" ]; then - rm /etc/php/8.4/fpm/pool.d/www.conf -fi - -exit 0 diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.stpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.stpl deleted file mode 100644 index 848abf7c..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.stpl +++ /dev/null @@ -1,36 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %sdocroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - SSLRequireSSL - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/s%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.tpl b/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.tpl deleted file mode 100644 index 065c1f89..00000000 --- a/src/deb/for-download/tools/apache-fpm-tpl/PHP-FPM-84.tpl +++ /dev/null @@ -1,30 +0,0 @@ - - - ServerName %domain_idn% - %alias_string% - ServerAdmin %email% - DocumentRoot %docroot% - ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/ - Alias /vstats/ %home%/%user%/web/%domain%/stats/ - Alias /error/ %home%/%user%/web/%domain%/document_errors/ - #SuexecUserGroup %user% %group% - CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes - CustomLog /var/log/%web_system%/domains/%domain%.log combined - ErrorLog /var/log/%web_system%/domains/%domain%.error.log - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes -FollowSymLinks +SymLinksIfOwnerMatch - - - - SetHandler "proxy:unix:/run/php/php8.4-fpm-%domain%.sock|fcgi://localhost/" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%web_system%.%domain%.conf* - - - diff --git a/src/deb/for-download/tools/clamav/foxhole_all.cdb b/src/deb/for-download/tools/clamav/foxhole_all.cdb deleted file mode 100644 index 3825e194..00000000 --- a/src/deb/for-download/tools/clamav/foxhole_all.cdb +++ /dev/null @@ -1,148 +0,0 @@ -Sanesecurity.Foxhole.7z_ade:CL_TYPE_7Z:*:\.[Aa][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_adp:CL_TYPE_7Z:*:\.[AA][Dd][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_bat:CL_TYPE_7Z:*:\.[Bb][Aa][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_chm:CL_TYPE_7Z:*:\.[Cc][Hh][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_cmd:CL_TYPE_7Z:*:\.[Cc][Mm][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_com:CL_TYPE_7Z:*:\.[Cc][Oo][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_cpl:CL_TYPE_7Z:*:\.[Cc][Pp][Ll]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_exe:CL_TYPE_7Z:*:\.[Ee][Xx][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_hta:CL_TYPE_7Z:*:\.[Hh][Tt][Aa]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_ins:CL_TYPE_7Z:*:\.[Ii][Nn][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_isp:CL_TYPE_7Z:*:\.[Ii][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_jse:CL_TYPE_7Z:*:\.[Jj][Ss][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_lib:CL_TYPE_7Z:*:\.[Ll][Ii][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_mde:CL_TYPE_7Z:*:\.[Mm][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_msc:CL_TYPE_7Z:*:\.[Mm][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_msp:CL_TYPE_7Z:*:\.[Mm][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_mst:CL_TYPE_7Z:*:\.[Mm][Ss][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_pif:CL_TYPE_7Z:*:\.[Pp][Ii][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_scr:CL_TYPE_7Z:*:\.[Ss][Cc][Rr]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_sct:CL_TYPE_7Z:*:\.[Ss][Cc][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_shb:CL_TYPE_7Z:*:\.[Ss][Hh][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_sys:CL_TYPE_7Z:*:\.[Ss][Yy][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_vb:CL_TYPE_7Z:*:\.[Vv][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_vbe:CL_TYPE_7Z:*:\.[Vv][Bb][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_vbs:CL_TYPE_7Z:*:\.[Vv][Bb][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_vxd:CL_TYPE_7Z:*:\.[Vv][Xx][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_wsc:CL_TYPE_7Z:*:\.[Ww][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_wsf:CL_TYPE_7Z:*:\.[Ww][Ss][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_wsh:CL_TYPE_7Z:*:\.[Ww][Ss][Hh]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_lnk:CL_TYPE_7Z:*:\.[Ll][Nn][Kk]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_lnk:CL_TYPE_7Z:*:\.[Uu][Rr][Ll]$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_ps1:CL_TYPE_7Z:*:\.[Pp][Ss]1$:*:*:*:*:*:* -Sanesecurity.Foxhole.7z_iqy:CL_TYPE_7Z:*:\.[Ii][Qq][Yy]$:*:*:*:1:*:* -Sanesecurity.Foxhole.Rar_ade:CL_TYPE_RAR:*:\.[Aa][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_adp:CL_TYPE_RAR:*:\.[AA][Dd][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_bat:CL_TYPE_RAR:*:\.[Bb][Aa][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_chm:CL_TYPE_RAR:*:\.[Cc][Hh][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_cmd:CL_TYPE_RAR:*:\.[Cc][Mm][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_com:CL_TYPE_RAR:*:\.[Cc][Oo][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_cpl:CL_TYPE_RAR:*:\.[Cc][Pp][Ll]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_exe:CL_TYPE_RAR:*:\.[Ee][Xx][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_hta:CL_TYPE_RAR:*:\.[Hh][Tt][Aa]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_ins:CL_TYPE_RAR:*:\.[Ii][Nn][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_isp:CL_TYPE_RAR:*:\.[Ii][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_jse:CL_TYPE_RAR:*:\.[Jj][Ss][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_lib:CL_TYPE_RAR:*:\.[Ll][Ii][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_mde:CL_TYPE_RAR:*:\.[Mm][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_msc:CL_TYPE_RAR:*:\.[Mm][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_msp:CL_TYPE_RAR:*:\.[Mm][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_mst:CL_TYPE_RAR:*:\.[Mm][Ss][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_pif:CL_TYPE_RAR:*:\.[Pp][Ii][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_scr:CL_TYPE_RAR:*:\.[Ss][Cc][Rr]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_sct:CL_TYPE_RAR:*:\.[Ss][Cc][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_shb:CL_TYPE_RAR:*:\.[Ss][Hh][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_sys:CL_TYPE_RAR:*:\.[Ss][Yy][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_vb:CL_TYPE_RAR:*:\.[Vv][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_vbe:CL_TYPE_RAR:*:\.[Vv][Bb][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_vbs:CL_TYPE_RAR:*:\.[Vv][Bb][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_vxd:CL_TYPE_RAR:*:\.[Vv][Xx][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_wsc:CL_TYPE_RAR:*:\.[Ww][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_wsf:CL_TYPE_RAR:*:\.[Ww][Ss][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_wsh:CL_TYPE_RAR:*:\.[Ww][Ss][Hh]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_lnk:CL_TYPE_RAR:*:\.[Ll][Nn][Kk]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_url:CL_TYPE_RAR:*:\.[Uu][Rr][Ll]$:*:*:*:1:*:* -Sanesecurity.Foxhole.Rar_jnlp:CL_TYPE_RAR:*:\.[Jj][Nn][Ll][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_ps1:CL_TYPE_RAR:*:\.[Pp][Ss]1$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_iqy:CL_TYPE_RAR:*:\.[Ii][Qq][Yy]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_ade:CL_TYPE_ZIP:*:\.[Aa][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_adp:CL_TYPE_ZIP:*:\.[AA][Dd][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_bat:CL_TYPE_ZIP:*:\.[Bb][Aa][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_chm:CL_TYPE_ZIP:*:\.[Cc][Hh][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_cmd:CL_TYPE_ZIP:*:\.[Cc][Mm][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_com:CL_TYPE_ZIP:*:\.[Cc][Oo][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_cpl:CL_TYPE_ZIP:*:\.[Cc][Pp][Ll]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_exe:CL_TYPE_ZIP:*:\.[Ee][Xx][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_hta:CL_TYPE_ZIP:*:\.[Hh][Tt][Aa]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_ins:CL_TYPE_ZIP:*:\.[Ii][Nn][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_isp:CL_TYPE_ZIP:*:\.[Ii][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_jse:CL_TYPE_ZIP:*:\.[Jj][Ss][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_lib:CL_TYPE_ZIP:*:\.[Ll][Ii][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_mde:CL_TYPE_ZIP:*:\.[Mm][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_msc:CL_TYPE_ZIP:*:\.[Mm][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_msp:CL_TYPE_ZIP:*:\.[Mm][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_mst:CL_TYPE_ZIP:*:\.[Mm][Ss][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_pif:CL_TYPE_ZIP:*:\.[Pp][Ii][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_scr:CL_TYPE_ZIP:*:\.[Ss][Cc][Rr]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_sct:CL_TYPE_ZIP:*:\.[Ss][Cc][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_shb:CL_TYPE_ZIP:*:\.[Ss][Hh][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_sys:CL_TYPE_ZIP:*:\.[Ss][Yy][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_jar:CL_TYPE_ZIP:*:\.[Jj][Aa][Rr]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_vb:CL_TYPE_ZIP:*:\.[Vv][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_vbe:CL_TYPE_ZIP:*:\.[Vv][Bb][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_vbs:CL_TYPE_ZIP:*:\.[Vv][Bb][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_vxd:CL_TYPE_ZIP:*:\.[Vv][Xx][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_wsc:CL_TYPE_ZIP:*:\.[Ww][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_wsf:CL_TYPE_ZIP:*:\.[Ww][Ss][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_wsh:CL_TYPE_ZIP:*:\.[Ww][Ss][Hh]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_lnk:CL_TYPE_ZIP:*:\.[Ll][Nn][Kk]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_url:CL_TYPE_ZIP:*:\.[Uu][Rr][Ll]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_jnlp:CL_TYPE_ZIP:*:\.[Jj][Nn][Ll][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_ps1:CL_TYPE_ZIP:*:\.[Pp][Ss]1$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_iqy:CL_TYPE_ZIP:*:\.[Ii][Qq][Yy]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_ade:CL_TYPE_ARJ:*:\.[Aa][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_adp:CL_TYPE_ARJ:*:\.[AA][Dd][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_bat:CL_TYPE_ARJ:*:\.[Bb][Aa][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_chm:CL_TYPE_ARJ:*:\.[Cc][Hh][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_cmd:CL_TYPE_ARJ:*:\.[Cc][Mm][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_com:CL_TYPE_ARJ:*:\.[Cc][Oo][Mm]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_cpl:CL_TYPE_ARJ:*:\.[Cc][Pp][Ll]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_exe:CL_TYPE_ARJ:*:\.[Ee][Xx][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_hta:CL_TYPE_ARJ:*:\.[Hh][Tt][Aa]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_ins:CL_TYPE_ARJ:*:\.[Ii][Nn][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_isp:CL_TYPE_ARJ:*:\.[Ii][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_jse:CL_TYPE_ARJ:*:\.[Jj][Ss][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_lib:CL_TYPE_ARJ:*:\.[Ll][Ii][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_mde:CL_TYPE_ARJ:*:\.[Mm][Dd][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_msc:CL_TYPE_ARJ:*:\.[Mm][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_msp:CL_TYPE_ARJ:*:\.[Mm][Ss][Pp]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_mst:CL_TYPE_ARJ:*:\.[Mm][Ss][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_pif:CL_TYPE_ARJ:*:\.[Pp][Ii][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_scr:CL_TYPE_ARJ:*:\.[Ss][Cc][Rr]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_sct:CL_TYPE_ARJ:*:\.[Ss][Cc][Tt]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_shb:CL_TYPE_ARJ:*:\.[Ss][Hh][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_sys:CL_TYPE_ARJ:*:\.[Ss][Yy][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_vb:CL_TYPE_ARJ:*:\.[Vv][Bb]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_vbe:CL_TYPE_ARJ:*:\.[Vv][Bb][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_vbs:CL_TYPE_ARJ:*:\.[Vv][Bb][Ss]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_vxd:CL_TYPE_ARJ:*:\.[Vv][Xx][Dd]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_wsc:CL_TYPE_ARJ:*:\.[Ww][Ss][Cc]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_wsf:CL_TYPE_ARJ:*:\.[Ww][Ss][Ff]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_wsh:CL_TYPE_ARJ:*:\.[Ww][Ss][Hh]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_lnk:CL_TYPE_ARJ:*:\.[Ll][Nn][Kk]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Arj_ps1:CL_TYPE_ARJ:*:\.[Pp][Ss]1$:*:*:*:*:*:* -Sanesecurity.Foxhole.Cab_scr:CL_TYPE_MSCAB:*:\*[Ss][Cc][Rr]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Cab_exe:CL_TYPE_MSCAB:*:\*[Ee][Xx][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Cab_ps1:CL_TYPE_MSCAB:*:\*[Pp][Ss]1$:*:*:*:*:*:* -Sanesecurity.Foxhole.Mail_ps1:CL_TYPE_MAIL:*:\*[Pp][Ss]1$:*:*:*:*:*:* -Sanesecurity.Foxhole.Iso_exe:CL_TYPE_ISO9660:*:\.[Ee][Xx][Ee]$:*:*:0:0:0:* -Sanesecurity.Foxhole.Tar_exe:CL_TYPE_POSIX_TAR:*:\.[Ee][Xx][Ee]$:*:*:*:*:*:* -Sanesecurity.Foxhole.Zip_iqy:CL_TYPE_ZIP:*:\.[Ii][Qq][Yy]$:*:*:*:1:*:* -Sanesecurity.Foxhole.Rar_iqy:CL_TYPE_RAR:*:\.[Ii][Qq][Yy]$:*:*:*:1:*:* -Sanesecurity.Foxhole.Zip_slk:CL_TYPE_ZIP:*:\.[Ss][Ll][Kk]$:*:*:*:1:*:* -Sanesecurity.Foxhole.Rar_slk:CL_TYPE_RAR:*:\.[Ss][Ll][Kk]$:*:*:*:1:*:* -Sanesecurity.Foxhole.Zip_setting:CL_TYPE_ZIP:*:(?i)\.settingcontent-ms$:*:*:*:1:*:* -Sanesecurity.Foxhole.7z_setting:CL_TYPE_7Z:*:(?i)\.settingcontent-ms$:*:*:*:*:*:* -Sanesecurity.Foxhole.Rar_setting:CL_TYPE_RAR:*:(?i)\.settingcontent-ms$:*:*:*:1:*:* -Sanesecurity.Foxhole.Iso_com:CL_TYPE_ISO9660:*:\.[Cc][Oo][Mm]$:*:*:0:0:0:* -Sanesecurity.Foxhole.Iso_scr:CL_TYPE_ISO9660:*:\.[Ss][Cc][Rr]$:*:*:0:0:0:* diff --git a/src/deb/for-download/tools/convert-vesta-to-myvesta.sh b/src/deb/for-download/tools/convert-vesta-to-myvesta.sh deleted file mode 100644 index 0455d1da..00000000 --- a/src/deb/for-download/tools/convert-vesta-to-myvesta.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# *** Debian only *** -# This script is NOT recommended, because a lot of myVesta features will not be added to server this way. -# Better way is described here - https://forum.myvestacp.com/viewtopic.php?f=14&t=50 - -wget -O - http://apt.myvestacp.com/deb_signing.key | sudo apt-key add - -codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))" -echo "deb http://apt.myvestacp.com/$codename/ $codename vesta" > /etc/apt/sources.list.d/vesta.list -apt update -apt install -y vesta vesta-php vesta-nginx - -service vesta stop -service vesta start diff --git a/src/deb/for-download/tools/cpanel-import-godaddy.sh b/src/deb/for-download/tools/cpanel-import-godaddy.sh deleted file mode 100644 index fd62ee22..00000000 --- a/src/deb/for-download/tools/cpanel-import-godaddy.sh +++ /dev/null @@ -1,399 +0,0 @@ -#!/bin/bash -# Author / Idea: Maks Usmanov - Skamasle and good people who help to improve: -# Thanks to https://github.com/Skamasle/sk-import-cpanel-backup-to-vestacp/graphs/contributors -# Github: https://github.com/Skamasle/sk-import-cpanel-backup-to-vestacp -# Run at your own risk -# This script take cpanel full backup and import it in vestacp account -# This script can import databases and database users and password, -# Import domains, subdomains and website files -# This script import also mail accounts and mails into accounts if previous cpanel run dovecot -# Mail password not are restored this was reset by new one. -########### -# If you need restore main database user read line 160 or above -########### - -MYUSERNAME="ENTER-HERE-DESIRED-DESTINATION-USERNAME" - -if [ $# -lt 1 ]; then - echo "usage: bash $0 cpanel-backup.tar.gz" - echo "or" - echo "usage: bash $0 cpanel-backup.tar.gz MX" - exit 1 -fi -if [[ $PATH != *"/usr/local/vesta/bin"* ]]; then - VESTA=/usr/local/vesta - export VESTA - - PATH=$PATH:/usr/local/vesta/bin - export PATH -fi -if [ ! -e /usr/bin/rsync ] || [ ! -e /usr/bin/file ] ; then - echo "#######################################" - echo "rsync not installed, try install it" - echo "This script need: rsync, file" - echo "#######################################" - if [ -e /etc/redhat-release ]; then - echo "Run: yum install rsync file" - else - echo "Run: apt-get install rsync file" - fi - exit 3 -fi -# Put this to 0 if you want use bash -x to debug it -sk_debug=1 -sk_vesta_package=default -# -# Only for gen_password but I dont like it, a lot of lt -# maybe will use it for other functions :) -source /usr/local/vesta/func/main.sh -sk_file=$1 -sk_tmp=sk_tmp -# I see than this is stupid, not know why is here. -sk_file_name=$(ls $sk_file) -tput setaf 2 -echo "Checking provided file..." -tput sgr0 -if file $sk_file |grep -q -c "gzip compressed data," ; then - tput setaf 2 - echo "OK - Gziped File" - tput sgr0 - if [ ! -d /root/${sk_tmp} ]; then - echo "Creating tmp.." - mkdir /root/${sk_tmp} - fi - echo "Extracting backup..." - if [ "$sk_debug" != 0 ]; then - tar xzvf $sk_file -C /root/${sk_tmp} 2>&1 | - while read sk_extracted_file; do - ex=$((ex+1)) - echo -en "wait... $ex files extracted\r" - done - else - tar xzf $sk_file -C /root/${sk_tmp} - fi - if [ $? -eq 0 ];then - tput setaf 2 - echo "Backup extracted without errors..." - tput sgr0 - else - echo "Error on backup extraction, check your file, try extract it manually" - echo "Remove tmp" - rm -rf "/root/${sk_tmp}" - exit 1 - fi - else - echo "Error 3 not-gzip - no stantard cpanel backup provided of file not installed ( Try yum install file, or apt-get install file )" - rm -rf "/root/${sk_tmp}" - exit 3 -fi -cd /root/${sk_tmp}/* -sk_importer_in=$(pwd) -echo "Access tmp directory $sk_importer_in" -echo "Get prefix..." -sk_dead_prefix=$(cat meta/dbprefix) -sk_dead_prefix="$MYUSERNAME" -if [ $sk_dead_prefix = 1 ]; then - echo "Error 666 - I dont like your prefix, I dont want do this job" - exit 666 -else - echo "I like your prefix, start working" -fi - -main_domain1=$(grep main_domain userdata/main |cut -d " " -f2) -if [ "$(ls -A mysql)" ]; then - sk_cp_user=$(ls mysql |grep sql | grep -v roundcube.sql |head -n1 |cut -d "_" -f1) - if [ -z "$sk_cp_user" ]; then - sk_cp_user=$(grep "user:" userdata/${main_domain1} | cut -d " " -f2) - fi - echo "$sk_cp_user" > sk_db_prefix - tput setaf 2 - echo "Get user: $sk_cp_user" - tput sgr0 - sk_restore_dbs=0 -else - sk_restore_dbs=1 -# get real cPanel user if no databases exist - sk_cp_user=$(grep "user:" userdata/${main_domain1} | cut -d " " -f2) -fi -sk_cp_user="$MYUSERNAME" -# So get real user, may be we need it after -- oh yes, not remember where but this save my day march 19 2017 on 0.5 -sk_real_cp_user=$(grep "user:" userdata/${main_domain1} | cut -d " " -f2) -if /usr/local/vesta/bin/v-list-users | grep -q -w $sk_cp_user ;then - echo "User alredy exist on your server, maybe on vestacp or in your /etc/passwd" - echo "**" - echo "Grep your /etc/passwd" - grep -q -w $sk_cp_user /etc/passwd - echo "**" - echo "Stop Working, clening..." - rm -rf /root/${sk_tmp} - exit 21 -else - echo "Generate random password for $sk_cp_user and create Vestacp Account ..." - sk_password=$(generate_password) - /usr/local/vesta/bin/v-add-user $sk_cp_user $sk_password administrator@${main_domain1} $sk_vesta_package $sk_cp_user $sk_cp_user - if [ $? != 0 ]; then - tput setaf 2 - echo "Stop Working... Cant create user...if is fresh install of vestacp try reboot or reopen session check bug https://bugs.vestacp.com/issues/138" - tput sgr0 - rm -rf "/root/${sk_tmp}" - exit 4 - fi -fi - -### Start with Databases -mysql -e "SET GLOBAL max_allowed_packet=1073741824;" -tput setaf 2 -echo "Start with Databases" -tput sgr0 -sed -i 's/\\//g' mysql.sql -sed -i "s/\`/'/g" mysql.sql - -sed -i "s/GRANT USAGE ON *.* TO \'/GRANT USAGE ON *.* TO \'${sk_cp_user}_/g" mysql.sql -sed -i "s/GRANT ALL PRIVILEGES ON \'/GRANT ALL PRIVILEGES ON \'${sk_cp_user}_/g" mysql.sql -sed -i "s/\'.* TO \'/\'.* TO \'${sk_cp_user}_/g" mysql.sql -echo "-----------------" -echo "mysql.sql:" -cat mysql.sql - -## User / Password -grep "GRANT USAGE ON" mysql.sql | awk -F "'" '{ print $2, $6 }' | uniq > user_password_db -echo "-----------------" -echo "user_password_db:" -cat user_password_db - -# User and database -grep "GRANT" mysql.sql |grep -v "USAGE ON" > u_db -echo "-----------------" -echo "u_db:" -cat u_db - -cat u_db | awk -F "'" '{ print $2, $4 }' | sort | uniq > uni_u_db -echo "-----------------" -echo "uni_u_db:" -cat uni_u_db - -sed -i "s/$sk_dead_prefix //g" user_password_db -echo "-----------------" -echo "user_password_db:" -cat user_password_db - -# Get database list -sk_db_list=$(grep -m 1 Database: mysql/*.create | awk '{ print $5 }') -sk_db_list=$(echo "${sk_cp_user}_$sk_db_list" | sed "s| | ${sk_cp_user}_|g") -echo "-----------------" -echo "sk_db_list:" -echo $sk_db_list -mysql -e "SHOW DATABASES" > server_dbs -for sk_dbr in $sk_db_list - do - grep -w $sk_dbr server_dbs - if [ $? == "1" ]; then - echo " Create and restore ${sk_cp_user}_${sk_dbr} " - echo "sed -i s/${sk_dbr}/${sk_cp_user}_${sk_dbr}/g mysql/${sk_dbr}.create" - sed -i "s/${sk_dbr}/${sk_cp_user}_${sk_dbr}/g" mysql/${sk_dbr}.create - mysql < mysql/${sk_dbr}.create - sed -i "s/utf8mb4_unicode_520_ci/utf8mb4_unicode_ci/g" mysql/${sk_dbr}.sql - mysql ${sk_cp_user}_${sk_dbr} < mysql/${sk_dbr}.sql - echo "---------------" - else - echo "Error: Cant restore database $sk_dbr alredy exists in mysql server" - fi -done - -cat uni_u_db | while read db userdb -do - grep -w $userdb user_password_db |while read user end_user_pass - do -# default cpanel user has all database privileges -# if you use default user in your config files to connect with database -# you will need remove && [ "$userdb" != "$sk_cp_user" ] to restore main user, but -# this will cause database duplication in db.conf and will interfer with vestacp backups - # if [ "$userdb" == "$user" ] && [ "$userdb" != "$sk_cp_user" ] && [ "$userdb" != "$sk_real_cp_user" ] ; then - echo "DB='${sk_cp_user}_$db' DBUSER='${sk_cp_user}_$userdb' MD5='$end_user_pass' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='$TIME' DATE='$DATE'" - echo "DB='${sk_cp_user}_$db' DBUSER='${sk_cp_user}_$userdb' MD5='$end_user_pass' HOST='localhost' TYPE='mysql' CHARSET='UTF8' U_DISK='0' SUSPENDED='no' TIME='$TIME' DATE='$DATE'" >> /usr/local/vesta/data/users/${sk_cp_user}/db.conf - # fi - done -done - -# Leave vesta restore passwords and create users -tput setaf 2 -echo "Rebuild databases files for $sk_cp_user" -tput sgr0 -/usr/local/vesta/bin/v-rebuild-databases $sk_cp_user - -## end mysql - -skaddons=$(cat addons |cut -d "=" -f1) -sed -i 's/_/./g; s/=/ /g' addons -echo "Converting addons domains, subdomains and some other fun" -cp sds sk_sds -cp sds2 sk_sds2 -sed -i 's/_/./g' sk_sds -sed -i 's/public_html/public@html/g; s/_/./g; s/public@html/public_html/g; s/=/ /g; s/$sk_default_sub/@/g' sk_sds2 -cat addons | while read sk_addon_domain sk_addon_sub -do - echo "Converting default subdomain: $sk_addon_sub in domain: $sk_addon_domain" - sed -i -e "s/$sk_addon_sub/$sk_addon_domain/g" sk_sds - sed -i -e "s/$sk_addon_sub/$sk_addon_domain/g" sk_sds2 - mv userdata/$sk_addon_sub userdata/${sk_addon_domain} -done - -tput setaf 2 -echo "Start restoring domains" -tput sgr0 -function get_domain_path() { - while read sk_domain path - do - if [ -e userdata/${sk_domain} ];then - /usr/local/vesta/bin/v-add-domain $sk_cp_user $sk_domain - echo "Restoring $sk_domain..." - rm -f /home/${sk_cp_user}/web/${sk_domain}/public_html/index.html - if [ "$sk_debug" != 0 ]; then - rsync -av homedir/${path}/ /home/${sk_cp_user}/web/${sk_domain}/public_html 2>&1 | - while read sk_file_dm; do - sk_sync=$((sk_sync+1)) - echo -en "-- $sk_sync restored files\r" - done - echo " " - else - rsync homedir/${path}/ /home/${sk_cp_user}/web/${sk_domain}/public_html - fi - chown $sk_cp_user:$sk_cp_user -R /home/${sk_cp_user}/web/${sk_domain}/public_html - chmod 751 /home/${sk_cp_user}/web/${sk_domain}/public_html - echo "$sk_domain" >> exclude_path - fi -done - -} -get_domain_path < sk_sds2 - -/usr/local/vesta/bin/v-add-domain $sk_cp_user $main_domain1 -# need it for restore main domain -if [ ! -e exclude_path ];then - touch exclude_path -fi -echo "Restore main domain: $main_domain1" -rm -f /home/${sk_cp_user}/web/${main_domain1}/public_html/index.html -if [ "$sk_debug" != 0 ]; then - rsync -av --exclude-from='exclude_path' homedir/public_html/ /home/${sk_cp_user}/web/${main_domain1}/public_html 2>&1 | - while read sk_file_dm; do - sk_sync=$((sk_sync+1)) - echo -en "-- $sk_sync restored files\r" - done - echo " " -else - rsync --exclude-from='exclude_path' homedir/public_html/ /home/${sk_cp_user}/web/${main_domain1}/public_html 2>&1 -fi -chown $sk_cp_user:$sk_cp_user -R /home/${sk_cp_user}/web/${main_domain1}/public_html -chmod 751 /home/${sk_cp_user}/web/${main_domain1}/public_html -rm -f sk_sds2 sk_sds - -################## -# mail -tput setaf 2 -echo "Start Restoring Mails" -tput sgr0 -sk_cod=$(date +%s) # Just for numbers and create another file if acccount was restored before. -sk_mdir=${sk_importer_in}/homedir/mail -cd $sk_mdir -for sk_maild in $(ls -1) -do -if [[ "$sk_maild" != "cur" && "$sk_maild" != "new" && "$sk_maild" != "tmp" ]]; then - if [ -d "$sk_maild" ]; then - for sk_mail_account in $(ls $sk_maild/) - do - - echo "Create and restore mail account: $sk_mail_account@$sk_maild" - sk_mail_pass1=$(generate_password) - /usr/local/vesta/bin/v-add-mail-account $sk_cp_user $sk_maild $sk_mail_account $sk_mail_pass1 - mv ${sk_maild}/${sk_mail_account} /home/${sk_cp_user}/mail/${sk_maild} - chown ${sk_cp_user}:mail -R /home/${sk_cp_user}/mail/${sk_maild} - find /home/${sk_cp_user}/mail/${sk_maild} -type f -name 'dovecot*' -delete - echo "${sk_mail_account}@${sk_maild} | $sk_mail_pass1" >> /root/sk_mail_password_${sk_cp_user}-${sk_cod} - done - fi -#else -# this only detect default dirs account new, cur, tmp etc -# maybe can do something with this, but on most cpanel default account have only spam. -fi -done -echo "All mail accounts restored" -############# ssl functions <(°-°)> -tput setaf 2 -echo "Restoring SSL for domains" -tput sgr0 - -mv ${sk_importer_in}/sslkeys/* ${sk_importer_in}/sslcerts/ -if ls -1 ${sk_importer_in}/ssl/* >/dev/null 2>&1; then - mv ${sk_importer_in}/ssl/* ${sk_importer_in}/sslcerts/ -else - echo "No SSL Cert. found..." -fi - - -sk_domains=$(/usr/local/vesta/bin/v-list-web-domains $sk_cp_user plain |awk '{ print $1 }') - -for ssl in $sk_domains -do - if [ -e ${sk_importer_in}/sslcerts/${ssl}.key ]; then - echo "Found SSL for ${ssl}, restoring..." - /usr/local/vesta/bin/v-add-web-domain-ssl $sk_cp_user $ssl ${sk_importer_in}/sslcerts/ - fi -done -function sk_restore_pass () { -sk_actual_pass=$(grep -w "^$sk_cp_user:" /etc/shadow |tr ":" " " | awk '{ print $2 }' ) -sk_new_pass=$(cat $sk_importer_in/shadow) -# need replace I hope you have installed it as in most systems... -# sed is a hero but replace is easy and not need space // :D -replace "$sk_cp_user:$sk_actual_pass" "$sk_cp_user:$sk_new_pass" -- /etc/shadow -tput setaf 5 -echo "Old cPanel password restored in $sk_cp_user vesta account" -tput sgr0 -} -function sk_fix_mx () { -tput setaf 2 - echo "Start With MX Records" -tput sgr0 -cd $sk_importer_in/dnszones -for sk_mx in $sk_domains -do - if [ -e $sk_mx.db ]; then - sk_id=$(grep MX /usr/local/vesta/data/users/${sk_cp_user}/dns/${sk_mx}.conf |tr "'" " " | cut -d " " -f 2) - /usr/local/vesta/bin/v-delete-dns-record $sk_cp_user $sk_mx $sk_id - grep MX ${sk_mx}.db | awk '{for(sk=NF;sk>=1;sk--) printf "%s ", $sk;print ""}' | while read value pri ns rest - do - if [ "$ns" == "MX" ];then - if [ "$value" == "$sk_mx" ] || [ "$value" == "$sk_mx." ];then - value=mail.$value - fi - /usr/local/vesta/bin/v-add-dns-record $sk_cp_user $sk_mx @ MX $value $pri - if [[ "$?" -ge "1" ]]; then - /usr/local/vesta/bin/v-add-dns-record $sk_cp_user $sk_mx @ MX mail.${sk_mx} 0 - fi - echo "MX fixed in $sk_mx" - fi - done - fi -done -} -if [ "$2" == "MX" ];then -# Need some fixed so run if you want try it, marked as experimental - sk_fix_mx -fi -sk_restore_pass - -find /home/${sk_cp_user}/web/*/public_html/ -type f -name "wp-config.php" -exec sed -i "s|define('DB_NAME', '|define('DB_NAME', '${sk_cp_user}_|g" {} \; -find /home/${sk_cp_user}/web/*/public_html/ -type f -name "wp-config.php" -exec sed -i "s|define('DB_USER', '|define('DB_USER', '${sk_cp_user}_|g" {} \; -find /home/${sk_cp_user}/web/*/public_html/ -type f -name "wp-config.php" -exec sed -i "s|define( 'DB_NAME', '|define( 'DB_NAME', '${sk_cp_user}_|g" {} \; -find /home/${sk_cp_user}/web/*/public_html/ -type f -name "wp-config.php" -exec sed -i "s|define( 'DB_USER', '|define( 'DB_USER', '${sk_cp_user}_|g" {} \; - -echo "Remove tmp files" -rm -rf "/root/${sk_tmp}" -tput setaf 4 -echo "##############################" -echo "cPanel Backup restored" -echo "Review your content and report any fail" -echo "I reset mail password not posible restore it yet." -echo "Check your new passwords runing: cat /root/sk_mail_password_${sk_cp_user}-${sk_cod}" -echo "##############################" -tput sgr0 diff --git a/src/deb/for-download/tools/default-pool.d/5.6/www.conf b/src/deb/for-download/tools/default-pool.d/5.6/www.conf deleted file mode 100644 index 6bc161d0..00000000 --- a/src/deb/for-download/tools/default-pool.d/5.6/www.conf +++ /dev/null @@ -1,417 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can we used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all IPv4 addresses on a -; specific port; -; '[::]:port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php5.6-fpm.sock - -; Set listen(2) backlog. -; Default Value: 65535 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 65535 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/5.6/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; exectute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/7.0/www.conf b/src/deb/for-download/tools/default-pool.d/7.0/www.conf deleted file mode 100644 index 5eafe960..00000000 --- a/src/deb/for-download/tools/default-pool.d/7.0/www.conf +++ /dev/null @@ -1,420 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php7.0-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/7.1/www.conf b/src/deb/for-download/tools/default-pool.d/7.1/www.conf deleted file mode 100644 index fc09b4c0..00000000 --- a/src/deb/for-download/tools/default-pool.d/7.1/www.conf +++ /dev/null @@ -1,420 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php7.1-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.1/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/7.2/www.conf b/src/deb/for-download/tools/default-pool.d/7.2/www.conf deleted file mode 100644 index 86aca4cc..00000000 --- a/src/deb/for-download/tools/default-pool.d/7.2/www.conf +++ /dev/null @@ -1,424 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php7.2-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.2/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/7.3/www.conf b/src/deb/for-download/tools/default-pool.d/7.3/www.conf deleted file mode 100644 index 03ce7b03..00000000 --- a/src/deb/for-download/tools/default-pool.d/7.3/www.conf +++ /dev/null @@ -1,439 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php7.3-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.3/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout set by 'request_terminate_timeout' ini option is not engaged after -; application calls 'fastcgi_finish_request' or when application has finished and -; shutdown functions are being called (registered via register_shutdown_function). -; This option will enable timeout limit to be applied unconditionally -; even in such cases. -; Default Value: no -;request_terminate_timeout_track_finished = no - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Decorate worker output with prefix and suffix containing information about -; the child that writes to the log and if stdout or stderr is used as well as -; log level and time. This options is used only if catch_workers_output is yes. -; Settings to "no" will output data as written to the stdout or stderr. -; Default value: yes -;decorate_workers_output = no - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/7.4/www.conf b/src/deb/for-download/tools/default-pool.d/7.4/www.conf deleted file mode 100644 index 8ef08a99..00000000 --- a/src/deb/for-download/tools/default-pool.d/7.4/www.conf +++ /dev/null @@ -1,439 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php7.4-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is differrent than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: (min_spare_servers + max_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following informations: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/7.4/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{miliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some exemples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout set by 'request_terminate_timeout' ini option is not engaged after -; application calls 'fastcgi_finish_request' or when application has finished and -; shutdown functions are being called (registered via register_shutdown_function). -; This option will enable timeout limit to be applied unconditionally -; even in such cases. -; Default Value: no -;request_terminate_timeout_track_finished = no - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environement, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Decorate worker output with prefix and suffix containing information about -; the child that writes to the log and if stdout or stderr is used as well as -; log level and time. This options is used only if catch_workers_output is yes. -; Settings to "no" will output data as written to the stdout or stderr. -; Default value: yes -;decorate_workers_output = no - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/8.0/www.conf b/src/deb/for-download/tools/default-pool.d/8.0/www.conf deleted file mode 100644 index e21e6158..00000000 --- a/src/deb/for-download/tools/default-pool.d/8.0/www.conf +++ /dev/null @@ -1,455 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php8.0-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is different than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: (min_spare_servers + max_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following information: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/8.0/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The address on which to accept FastCGI status request. This creates a new -; invisible pool that can handle requests independently. This is useful -; if the main pool is busy with long running requests because it is still possible -; to get the status before finishing the long running requests. -; -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Default Value: value of the listen option -;pm.status_listen = 127.0.0.1:9001 - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{milliseconds}d -; - %{mili}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some examples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsuled in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout set by 'request_terminate_timeout' ini option is not engaged after -; application calls 'fastcgi_finish_request' or when application has finished and -; shutdown functions are being called (registered via register_shutdown_function). -; This option will enable timeout limit to be applied unconditionally -; even in such cases. -; Default Value: no -;request_terminate_timeout_track_finished = no - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environment, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Decorate worker output with prefix and suffix containing information about -; the child that writes to the log and if stdout or stderr is used as well as -; log level and time. This options is used only if catch_workers_output is yes. -; Settings to "no" will output data as written to the stdout or stderr. -; Default value: yes -;decorate_workers_output = no - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/8.1/www.conf b/src/deb/for-download/tools/default-pool.d/8.1/www.conf deleted file mode 100644 index 5278cea0..00000000 --- a/src/deb/for-download/tools/default-pool.d/8.1/www.conf +++ /dev/null @@ -1,463 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php8.1-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user -; or group is different than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; pm.max_spawn_rate - the maximum number of rate to spawn child -; processes at once. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: (min_spare_servers + max_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of rate to spawn child processes at once. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -; Default Value: 32 -;pm.max_spawn_rate = 32 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following information: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/8.1/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The address on which to accept FastCGI status request. This creates a new -; invisible pool that can handle requests independently. This is useful -; if the main pool is busy with long running requests because it is still possible -; to get the status before finishing the long running requests. -; -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Default Value: value of the listen option -;pm.status_listen = 127.0.0.1:9001 - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{milliseconds}d -; - %{milli}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some examples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsulated in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsulated in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout set by 'request_terminate_timeout' ini option is not engaged after -; application calls 'fastcgi_finish_request' or when application has finished and -; shutdown functions are being called (registered via register_shutdown_function). -; This option will enable timeout limit to be applied unconditionally -; even in such cases. -; Default Value: no -;request_terminate_timeout_track_finished = no - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environment, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Decorate worker output with prefix and suffix containing information about -; the child that writes to the log and if stdout or stderr is used as well as -; log level and time. This options is used only if catch_workers_output is yes. -; Settings to "no" will output data as written to the stdout or stderr. -; Default value: yes -;decorate_workers_output = no - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/8.2/www.conf b/src/deb/for-download/tools/default-pool.d/8.2/www.conf deleted file mode 100644 index ffdd57b7..00000000 --- a/src/deb/for-download/tools/default-pool.d/8.2/www.conf +++ /dev/null @@ -1,484 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of processes -; Note: The user is mandatory. If the group is not set, the default user's group -; will be used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php8.2-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: user and group are set as the running user -; mode is set to 0660 -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Set the associated the route table (FIB). FreeBSD only -; Default Value: -1 -;listen.setfib = 1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or -; PROC_TRACE_CTL procctl for FreeBSD) even if the process user -; or group is different than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; pm.max_spawn_rate - the maximum number of rate to spawn child -; processes at once. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: (min_spare_servers + max_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of rate to spawn child processes at once. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -; Default Value: 32 -;pm.max_spawn_rate = 32 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following information: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/8.2/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The address on which to accept FastCGI status request. This creates a new -; invisible pool that can handle requests independently. This is useful -; if the main pool is busy with long running requests because it is still possible -; to get the status before finishing the long running requests. -; -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Default Value: value of the listen option -;pm.status_listen = 127.0.0.1:9001 - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{milliseconds}d -; - %{milli}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some examples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsulated in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsulated in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" - -; A list of request_uri values which should be filtered from the access log. -; -; As a security precuation, this setting will be ignored if: -; - the request method is not GET or HEAD; or -; - there is a request body; or -; - there are query parameters; or -; - the response code is outwith the successful range of 200 to 299 -; -; Note: The paths are matched against the output of the access.format tag "%r". -; On common configurations, this may look more like SCRIPT_NAME than the -; expected pre-rewrite URI. -; -; Default Value: not set -;access.suppress_path[] = /ping -;access.suppress_path[] = /health_check.php - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout set by 'request_terminate_timeout' ini option is not engaged after -; application calls 'fastcgi_finish_request' or when application has finished and -; shutdown functions are being called (registered via register_shutdown_function). -; This option will enable timeout limit to be applied unconditionally -; even in such cases. -; Default Value: no -;request_terminate_timeout_track_finished = no - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environment, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Decorate worker output with prefix and suffix containing information about -; the child that writes to the log and if stdout or stderr is used as well as -; log level and time. This options is used only if catch_workers_output is yes. -; Settings to "no" will output data as written to the stdout or stderr. -; Default value: yes -;decorate_workers_output = no - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/default-pool.d/8.3/www.conf b/src/deb/for-download/tools/default-pool.d/8.3/www.conf deleted file mode 100644 index f18939a3..00000000 --- a/src/deb/for-download/tools/default-pool.d/8.3/www.conf +++ /dev/null @@ -1,490 +0,0 @@ -; Start a new pool named 'www'. -; the variable $pool can be used in any directive and will be replaced by the -; pool name ('www' here) -[www] - -; Per pool prefix -; It only applies on the following directives: -; - 'access.log' -; - 'slowlog' -; - 'listen' (unixsocket) -; - 'chroot' -; - 'chdir' -; - 'php_values' -; - 'php_admin_values' -; When not set, the global prefix (or /usr) applies instead. -; Note: This directive can also be relative to the global prefix. -; Default Value: none -;prefix = /path/to/pools/$pool - -; Unix user/group of the child processes. This can be used only if the master -; process running user is root. It is set after the child process is created. -; The user and group can be specified either by their name or by their numeric -; IDs. -; Note: If the user is root, the executable needs to be started with -; --allow-to-run-as-root option to work. -; Default Values: The user is set to master process running user by default. -; If the group is not set, the user's group is used. -user = www-data -group = www-data - -; The address on which to accept FastCGI requests. -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Note: This value is mandatory. -listen = /run/php/php8.3-fpm.sock - -; Set listen(2) backlog. -; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD) -;listen.backlog = 511 - -; Set permissions for unix socket, if one is used. In Linux, read/write -; permissions must be set in order to allow connections from a web server. Many -; BSD-derived systems allow connections regardless of permissions. The owner -; and group can be specified either by name or by their numeric IDs. -; Default Values: Owner is set to the master process running user. If the group -; is not set, the owner's group is used. Mode is set to 0660. -listen.owner = www-data -listen.group = www-data -;listen.mode = 0660 - -; When POSIX Access Control Lists are supported you can set them using -; these options, value is a comma separated list of user/group names. -; When set, listen.owner and listen.group are ignored -;listen.acl_users = -;listen.acl_groups = - -; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect. -; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original -; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address -; must be separated by a comma. If this value is left blank, connections will be -; accepted from any ip address. -; Default Value: any -;listen.allowed_clients = 127.0.0.1 - -; Set the associated the route table (FIB). FreeBSD only -; Default Value: -1 -;listen.setfib = 1 - -; Specify the nice(2) priority to apply to the pool processes (only if set) -; The value can vary from -19 (highest priority) to 20 (lower priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool processes will inherit the master process priority -; unless it specified otherwise -; Default Value: no set -; process.priority = -19 - -; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or -; PROC_TRACE_CTL procctl for FreeBSD) even if the process user -; or group is different than the master process user. It allows to create process -; core dump and ptrace the process for the pool user. -; Default Value: no -; process.dumpable = yes - -; Choose how the process manager will control the number of child processes. -; Possible Values: -; static - a fixed number (pm.max_children) of child processes; -; dynamic - the number of child processes are set dynamically based on the -; following directives. With this process management, there will be -; always at least 1 children. -; pm.max_children - the maximum number of children that can -; be alive at the same time. -; pm.start_servers - the number of children created on startup. -; pm.min_spare_servers - the minimum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is less than this -; number then some children will be created. -; pm.max_spare_servers - the maximum number of children in 'idle' -; state (waiting to process). If the number -; of 'idle' processes is greater than this -; number then some children will be killed. -; pm.max_spawn_rate - the maximum number of rate to spawn child -; processes at once. -; ondemand - no children are created at startup. Children will be forked when -; new requests will connect. The following parameter are used: -; pm.max_children - the maximum number of children that -; can be alive at the same time. -; pm.process_idle_timeout - The number of seconds after which -; an idle process will be killed. -; Note: This value is mandatory. -pm = dynamic - -; The number of child processes to be created when pm is set to 'static' and the -; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. -; This value sets the limit on the number of simultaneous requests that will be -; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. -; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP -; CGI. The below defaults are based on a server without much resources. Don't -; forget to tweak pm.* to fit your needs. -; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' -; Note: This value is mandatory. -pm.max_children = 5 - -; The number of child processes created on startup. -; Note: Used only when pm is set to 'dynamic' -; Default Value: (min_spare_servers + max_spare_servers) / 2 -pm.start_servers = 2 - -; The desired minimum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.min_spare_servers = 1 - -; The desired maximum number of idle server processes. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -pm.max_spare_servers = 3 - -; The number of rate to spawn child processes at once. -; Note: Used only when pm is set to 'dynamic' -; Note: Mandatory when pm is set to 'dynamic' -; Default Value: 32 -;pm.max_spawn_rate = 32 - -; The number of seconds after which an idle process will be killed. -; Note: Used only when pm is set to 'ondemand' -; Default Value: 10s -;pm.process_idle_timeout = 10s; - -; The number of requests each child process should execute before respawning. -; This can be useful to work around memory leaks in 3rd party libraries. For -; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. -; Default Value: 0 -;pm.max_requests = 500 - -; The URI to view the FPM status page. If this value is not set, no URI will be -; recognized as a status page. It shows the following information: -; pool - the name of the pool; -; process manager - static, dynamic or ondemand; -; start time - the date and time FPM has started; -; start since - number of seconds since FPM has started; -; accepted conn - the number of request accepted by the pool; -; listen queue - the number of request in the queue of pending -; connections (see backlog in listen(2)); -; max listen queue - the maximum number of requests in the queue -; of pending connections since FPM has started; -; listen queue len - the size of the socket queue of pending connections; -; idle processes - the number of idle processes; -; active processes - the number of active processes; -; total processes - the number of idle + active processes; -; max active processes - the maximum number of active processes since FPM -; has started; -; max children reached - number of times, the process limit has been reached, -; when pm tries to start more children (works only for -; pm 'dynamic' and 'ondemand'); -; Value are updated in real time. -; Example output: -; pool: www -; process manager: static -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 62636 -; accepted conn: 190460 -; listen queue: 0 -; max listen queue: 1 -; listen queue len: 42 -; idle processes: 4 -; active processes: 11 -; total processes: 15 -; max active processes: 12 -; max children reached: 0 -; -; By default the status page output is formatted as text/plain. Passing either -; 'html', 'xml' or 'json' in the query string will return the corresponding -; output syntax. Example: -; http://www.foo.bar/status -; http://www.foo.bar/status?json -; http://www.foo.bar/status?html -; http://www.foo.bar/status?xml -; -; By default the status page only outputs short status. Passing 'full' in the -; query string will also return status for each pool process. -; Example: -; http://www.foo.bar/status?full -; http://www.foo.bar/status?json&full -; http://www.foo.bar/status?html&full -; http://www.foo.bar/status?xml&full -; The Full status returns for each process: -; pid - the PID of the process; -; state - the state of the process (Idle, Running, ...); -; start time - the date and time the process has started; -; start since - the number of seconds since the process has started; -; requests - the number of requests the process has served; -; request duration - the duration in µs of the requests; -; request method - the request method (GET, POST, ...); -; request URI - the request URI with the query string; -; content length - the content length of the request (only with POST); -; user - the user (PHP_AUTH_USER) (or '-' if not set); -; script - the main script called (or '-' if not set); -; last request cpu - the %cpu the last request consumed -; it's always 0 if the process is not in Idle state -; because CPU calculation is done when the request -; processing has terminated; -; last request memory - the max amount of memory the last request consumed -; it's always 0 if the process is not in Idle state -; because memory calculation is done when the request -; processing has terminated; -; If the process is in Idle state, then informations are related to the -; last request the process has served. Otherwise informations are related to -; the current request being served. -; Example output: -; ************************ -; pid: 31330 -; state: Running -; start time: 01/Jul/2011:17:53:49 +0200 -; start since: 63087 -; requests: 12808 -; request duration: 1250261 -; request method: GET -; request URI: /test_mem.php?N=10000 -; content length: 0 -; user: - -; script: /home/fat/web/docs/php/test_mem.php -; last request cpu: 0.00 -; last request memory: 0 -; -; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php/8.3/fpm/status.html -; -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;pm.status_path = /status - -; The address on which to accept FastCGI status request. This creates a new -; invisible pool that can handle requests independently. This is useful -; if the main pool is busy with long running requests because it is still possible -; to get the status before finishing the long running requests. -; -; Valid syntaxes are: -; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on -; a specific port; -; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on -; a specific port; -; 'port' - to listen on a TCP socket to all addresses -; (IPv6 and IPv4-mapped) on a specific port; -; '/path/to/unix/socket' - to listen on a unix socket. -; Default Value: value of the listen option -;pm.status_listen = 127.0.0.1:9001 - -; The ping URI to call the monitoring page of FPM. If this value is not set, no -; URI will be recognized as a ping page. This could be used to test from outside -; that FPM is alive and responding, or to -; - create a graph of FPM availability (rrd or such); -; - remove a server from a group if it is not responding (load balancing); -; - trigger alerts for the operating team (24/7). -; Note: The value must start with a leading slash (/). The value can be -; anything, but it may not be a good idea to use the .php extension or it -; may conflict with a real PHP file. -; Default Value: not set -;ping.path = /ping - -; This directive may be used to customize the response of a ping request. The -; response is formatted as text/plain with a 200 response code. -; Default Value: pong -;ping.response = pong - -; The access log file -; Default: not set -;access.log = log/$pool.access.log - -; The access log format. -; The following syntax is allowed -; %%: the '%' character -; %C: %CPU used by the request -; it can accept the following format: -; - %{user}C for user CPU only -; - %{system}C for system CPU only -; - %{total}C for user + system CPU (default) -; %d: time taken to serve the request -; it can accept the following format: -; - %{seconds}d (default) -; - %{milliseconds}d -; - %{milli}d -; - %{microseconds}d -; - %{micro}d -; %e: an environment variable (same as $_ENV or $_SERVER) -; it must be associated with embraces to specify the name of the env -; variable. Some examples: -; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e -; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e -; %f: script filename -; %l: content-length of the request (for POST request only) -; %m: request method -; %M: peak of memory allocated by PHP -; it can accept the following format: -; - %{bytes}M (default) -; - %{kilobytes}M -; - %{kilo}M -; - %{megabytes}M -; - %{mega}M -; %n: pool name -; %o: output header -; it must be associated with embraces to specify the name of the header: -; - %{Content-Type}o -; - %{X-Powered-By}o -; - %{Transfert-Encoding}o -; - .... -; %p: PID of the child that serviced the request -; %P: PID of the parent of the child that serviced the request -; %q: the query string -; %Q: the '?' character if query string exists -; %r: the request URI (without the query string, see %q and %Q) -; %R: remote IP address -; %s: status (response code) -; %t: server time the request was received -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsulated in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %T: time the log has been written (the request has finished) -; it can accept a strftime(3) format: -; %d/%b/%Y:%H:%M:%S %z (default) -; The strftime(3) format must be encapsulated in a %{}t tag -; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t -; %u: remote user -; -; Default: "%R - %u %t \"%m %r\" %s" -;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%" - -; A list of request_uri values which should be filtered from the access log. -; -; As a security precuation, this setting will be ignored if: -; - the request method is not GET or HEAD; or -; - there is a request body; or -; - there are query parameters; or -; - the response code is outwith the successful range of 200 to 299 -; -; Note: The paths are matched against the output of the access.format tag "%r". -; On common configurations, this may look more like SCRIPT_NAME than the -; expected pre-rewrite URI. -; -; Default Value: not set -;access.suppress_path[] = /ping -;access.suppress_path[] = /health_check.php - -; The log file for slow requests -; Default Value: not set -; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/$pool.log.slow - -; The timeout for serving a single request after which a PHP backtrace will be -; dumped to the 'slowlog' file. A value of '0s' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_slowlog_timeout = 0 - -; Depth of slow log stack trace. -; Default Value: 20 -;request_slowlog_trace_depth = 20 - -; The timeout for serving a single request after which the worker process will -; be killed. This option should be used when the 'max_execution_time' ini option -; does not stop script execution for some reason. A value of '0' means 'off'. -; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) -; Default Value: 0 -;request_terminate_timeout = 0 - -; The timeout set by 'request_terminate_timeout' ini option is not engaged after -; application calls 'fastcgi_finish_request' or when application has finished and -; shutdown functions are being called (registered via register_shutdown_function). -; This option will enable timeout limit to be applied unconditionally -; even in such cases. -; Default Value: no -;request_terminate_timeout_track_finished = no - -; Set open file descriptor rlimit. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Chroot to this directory at the start. This value must be defined as an -; absolute path. When this value is not set, chroot is not used. -; Note: you can prefix with '$prefix' to chroot to the pool prefix or one -; of its subdirectories. If the pool prefix is not set, the global prefix -; will be used instead. -; Note: chrooting is a great security feature and should be used whenever -; possible. However, all PHP paths will be relative to the chroot -; (error_log, sessions.save_path, ...). -; Default Value: not set -;chroot = - -; Chdir to this directory at the start. -; Note: relative path can be used. -; Default Value: current directory or / when chroot -;chdir = /var/www - -; Redirect worker stdout and stderr into main error log. If not set, stdout and -; stderr will be redirected to /dev/null according to FastCGI specs. -; Note: on highloaded environment, this can cause some delay in the page -; process time (several ms). -; Default Value: no -;catch_workers_output = yes - -; Decorate worker output with prefix and suffix containing information about -; the child that writes to the log and if stdout or stderr is used as well as -; log level and time. This options is used only if catch_workers_output is yes. -; Settings to "no" will output data as written to the stdout or stderr. -; Default value: yes -;decorate_workers_output = no - -; Clear environment in FPM workers -; Prevents arbitrary environment variables from reaching FPM worker processes -; by clearing the environment in workers before env vars specified in this -; pool configuration are added. -; Setting to "no" will make all environment variables available to PHP code -; via getenv(), $_ENV and $_SERVER. -; Default Value: yes -;clear_env = no - -; Limits the extensions of the main script FPM will allow to parse. This can -; prevent configuration mistakes on the web server side. You should only limit -; FPM to .php extensions to prevent malicious users to use other extensions to -; execute php code. -; Note: set an empty value to allow all extensions. -; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php7 - -; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from -; the current environment. -; Default Value: clean env -;env[HOSTNAME] = $HOSTNAME -;env[PATH] = /usr/local/bin:/usr/bin:/bin -;env[TMP] = /tmp -;env[TMPDIR] = /tmp -;env[TEMP] = /tmp - -; Additional php.ini defines, specific to this pool of workers. These settings -; overwrite the values previously defined in the php.ini. The directives are the -; same as the PHP SAPI: -; php_value/php_flag - you can set classic ini defines which can -; be overwritten from PHP call 'ini_set'. -; php_admin_value/php_admin_flag - these directives won't be overwritten by -; PHP call 'ini_set' -; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. - -; Defining 'extension' will load the corresponding shared extension from -; extension_dir. Defining 'disable_functions' or 'disable_classes' will not -; overwrite previously defined php.ini values, but will append the new value -; instead. - -; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /usr) - -; Default Value: nothing is defined by default except the values in php.ini and -; specified at startup with the -d argument -;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com -;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/fpm-php.www.log -;php_admin_flag[log_errors] = on -;php_admin_value[memory_limit] = 32M diff --git a/src/deb/for-download/tools/exim-without-limits/exim4.conf.template b/src/deb/for-download/tools/exim-without-limits/exim4.conf.template deleted file mode 100644 index dcc889fe..00000000 --- a/src/deb/for-download/tools/exim-without-limits/exim4.conf.template +++ /dev/null @@ -1,389 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Vesta Control Panel # -# # -###################################################################### - -# Uncomment these 3 lines if you have ClamAV or Spamassassin -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#CLAMD = yes - -disable_ipv6=true -add_environment=<; PATH=/bin:/usr/bin -keep_environment= - -domainlist local_domains = dsearch;/etc/exim4/domains/ -domainlist relay_to_domains = dsearch;/etc/exim4/domains/ -hostlist relay_from_hosts = 127.0.0.1 -hostlist whitelist = net-iplsearch;/etc/exim4/white-blocks.conf -hostlist spammers = net-iplsearch;/etc/exim4/spam-blocks.conf -no_local_from_check -untrusted_set_sender = * -acl_smtp_connect = acl_check_spammers -acl_smtp_mail = acl_check_mail -acl_smtp_rcpt = acl_check_rcpt -acl_smtp_data = acl_check_data -acl_smtp_mime = acl_check_mime - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /var/lib/clamav/clamd.sock -.endif - -tls_advertise_hosts = * -tls_certificate = /usr/local/vesta/ssl/certificate.crt -tls_privatekey = /usr/local/vesta/ssl/certificate.key - -daemon_smtp_ports = 25 : 465 : 587 : 2525 -tls_on_connect_ports = 465 -never_users = root -host_lookup = * -rfc1413_hosts = * -rfc1413_query_timeout = 0s -ignore_bounce_errors_after = 2d -timeout_frozen_after = 7d - -DKIM_DOMAIN = ${lc:${domain:$h_from:}} -DKIM_FILE = /etc/exim4/domains/${lc:${domain:$h_from:}}/dkim.pem -DKIM_PRIVATE_KEY = ${if exists{DKIM_FILE}{DKIM_FILE}{0}} - - - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -begin acl - -acl_check_spammers: - accept hosts = +whitelist - - drop message = Your host in blacklist on this server. - log_message = Host in blacklist - hosts = +spammers - - accept - - -acl_check_mail: - deny condition = ${if eq{$sender_helo_name}{}} - message = HELO required before MAIL - - drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid - condition = ${if match{$sender_helo_name}{\N((\d{1,3}[.-]\d{1,3}[.-]\d{1,3}[.-]\d{1,3})|([0-9a-f]{8})|([0-9A-F]{8}))\N}{yes}{no}} - condition = ${if match{${lc:$sender_host_name}}{.telenor.rs}{false}{true}} - condition = ${if match {${lookup dnsdb{>: defer_never,ptr=$sender_host_address}}\}{$sender_helo_name}{no}{yes}} - delay = 45s - - drop condition = ${if isip{$sender_helo_name}} - message = Access denied - Invalid HELO name (See RFC2821 4.1.3) - - drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} - message = $interface_address is _my_ address - - accept - - -acl_check_rcpt: - accept hosts = : - - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] - - deny message = Restricted characters in address - domains = !+local_domains - local_parts = ^[./|] : ^.*[@%!] : ^.*/\\.\\./ - - require verify = sender - - accept hosts = +relay_from_hosts - control = submission - - accept authenticated = * - control = submission/domain= - - deny message = Rejected because $sender_host_address is in a black list at $dnslist_domain\n$dnslist_text - hosts = !+whitelist - dnslists = ${readfile {/etc/exim4/dnsbl.conf}{:}} - - require message = relay not permitted - domains = +local_domains : +relay_to_domains - - deny message = smtp auth requried - sender_domains = +local_domains - !authenticated = * - - require verify = recipient - -.ifdef CLAMD - warn set acl_m0 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antivirus}{yes}{no}} - set acl_m0 = yes -.endif - -.ifdef SPAMASSASSIN - warn set acl_m1 = no - - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes -.endif - - accept - - -acl_check_data: - - deny senders = /etc/exim4/deny_senders - -.ifdef CLAMD - deny message = Message contains a virus ($malware_name) and has been rejected - malware = */defer_ok - condition = ${if eq{$acl_m0}{yes}{yes}{no}} -.endif - -.ifdef SPAMASSASSIN - warn !authenticated = * - hosts = !+relay_from_hosts - condition = ${if < {$message_size}{100K}} - condition = ${if eq{$acl_m1}{yes}{yes}{no}} - spam = nobody:true/defer_ok - add_header = X-Spam-Score: $spam_score_int - add_header = X-Spam-Bar: $spam_bar - add_header = X-Spam-Report: $spam_report - set acl_m2 = $spam_score_int - - warn condition = ${if !eq{$acl_m2}{} {yes}{no}} - condition = ${if >{$acl_m2}{SPAM_SCORE} {yes}{no}} - add_header = X-Spam-Status: Yes - message = SpamAssassin detected spam (from $sender_address to $recipients). -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ade|\.adp|\.bat|\.chm|\.cmd|\.com|\.cpl|\.exe|\.hta|\.ins|\.isp|\.jse|\.lib|\.lnk|\.mde|\.msc|\.msp|\.mst|\.pif|\.scr|\.sct|\.shb|\.sys|\.vb|\.vbe|\.vbs|\.vxd|\.wsc|\.wsf|\.wsh|\.jar)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /var/run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -#smarthost: -# driver = manualroute -# domains = ! +local_domains -# transport = remote_smtp -# route_list = * smartrelay.vestacp.com -# no_more -# no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -localuser_spam: - driver = accept - transport = local_spam_delivery - condition = ${if eq {${if match{$h_X-Spam-Status:}{\N^Yes\N}{yes}{no}}} {${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{yes}{no_such_user}}}} - -userforward: - driver = redirect - check_local_user - file = $home/.forward - allow_filter - no_verify - no_expn - check_ancestor - file_transport = address_file - pipe_transport = address_pipe - reply_transport = address_reply - -procmail: - driver = accept - check_local_user - require_files = ${local_part}:+${home}/.procmailrc:/usr/bin/procmail - transport = procmail - no_verify - -autoreplay: - driver = accept - require_files = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - condition = ${if exists{/etc/exim4/domains/$domain/autoreply.${local_part}.msg}{yes}{no}} - retry_use_local_part - transport = userautoreply - unseen - -aliases: - driver = redirect - headers_add = X-redirected: yes - data = ${extract{1}{:}{${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - require_files = /etc/exim4/domains/$domain/aliases - redirect_router = dnslookup - pipe_transport = address_pipe - unseen - -localuser_fwd_only: - driver = accept - transport = devnull - condition = ${if exists{/etc/exim4/domains/$domain/fwd_only}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/fwd_only}{true}{false}}}} - -localuser: - driver = accept - transport = local_delivery - condition = ${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}{true}{false}} - -catchall: - driver = redirect - headers_add = X-redirected: yes - require_files = /etc/exim4/domains/$domain/aliases - data = ${extract{1}{:}{${lookup{*@$domain}lsearch{/etc/exim4/domains/$domain/aliases}}}} - file_transport = local_delivery - redirect_router = dnslookup - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - - - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -remote_smtp: - driver = smtp - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_chunking = !93.188.3.0/24 - -procmail: - driver = pipe - command = "/usr/bin/procmail -d $local_part" - return_path_add - delivery_date_add - envelope_to_add - user = $local_part - initgroups - return_output - -local_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_warn_threshold = 75% - -local_spam_delivery: - driver = appendfile - maildir_format - maildir_use_size_file - user = ${extract{2}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}} - group = mail - create_directory - directory_mode = 770 - mode = 660 - use_lockfile = no - delivery_date_add - envelope_to_add - return_path_add - directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part/.Spam" - quota = ${extract{6}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}M - quota_directory = "${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/$domain/passwd}}}}/mail/$domain/$local_part" - quota_warn_threshold = 75% - -address_pipe: - driver = pipe - return_output - -address_file: - driver = appendfile - delivery_date_add - envelope_to_add - return_path_add - -address_reply: - driver = autoreply - -userautoreply: - driver = autoreply - file = /etc/exim4/domains/$domain/autoreply.${local_part}.msg - from = "${local_part}@${domain}" - headers = Content-Type: text/plain; charset=utf-8;\nContent-Transfer-Encoding: 8bit - subject = "${if def:h_Subject: {Autoreply: \"${rfc2047:$h_Subject:}\"} {Autoreply Message}}" - to = "${sender_address}" - -devnull: - driver = appendfile - file = /dev/null - - - -###################################################################### -# RETRY CONFIGURATION # -###################################################################### -begin retry - -# Address or Domain Error Retries -# ----------------- ----- ------- -* * F,2h,15m; G,16h,1h,1.5; F,4d,6h - - - -###################################################################### -# REWRITE CONFIGURATION # -###################################################################### -begin rewrite - - - -###################################################################### diff --git a/src/deb/for-download/tools/imapsync/create-mail-sync.sh b/src/deb/for-download/tools/imapsync/create-mail-sync.sh deleted file mode 100644 index 94762505..00000000 --- a/src/deb/for-download/tools/imapsync/create-mail-sync.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -################################## -# usage: ./create-mail-sync.sh SRCHOST EMAIL PASSWORD-ON-REMOTE-SERVER [PASSWORD-ON-THIS-SERVER] [TEST] -################################## - -if [ $# -lt 3 ]; then - echo "usage: ./create-mail-sync.sh SRCHOST EMAIL PASSWORD-ON-REMOTE-SERVER [PASSWORD-ON-THIS-SERVER] [TEST]" - exit 1 -fi - -if [ $# -eq 3 ]; then -SRCHOST=$1 -EMAIL=$2 -PASS=$3 -PASS2=$3 -TEST=1 -fi - -if [ $# -eq 4 ]; then -SRCHOST=$1 -EMAIL=$2 -PASS=$3 -PASS2=$4 -TEST=1 -fi - -if [ $# -eq 5 ]; then -SRCHOST=$1 -EMAIL=$2 -PASS=$3 -PASS2=$4 -TEST=$5 -fi - -TESTOPT="" -if [[ $TEST -eq 1 ]]; then - TESTOPT="--justlogin" -fi - -if [ ! -d "accounts" ]; then - mkdir accounts -fi -if [ -f "accounts/$EMAIL" ]; then - echo "********* EMAIL $EMAIL ALREADY EXISTS !!! ************" - exit 1; - exit -fi - -euser=$(echo $EMAIL | cut -d '@' -f 1) -domain=$(echo $EMAIL | cut -d '@' -f 2) -user=$(/usr/local/vesta/bin/v-search-domain-owner $domain) -if [ "$user" != "" ]; then - echo "=== Email '$EMAIL' has username email part '$euser', domain is '$domain', and belongs to myVesta account: $user" - if [ ! -d "/home/$user/mail/$domain" ]; then - echo "======= Creating '$domail' in MAIL section" - /usr/local/vesta/bin/v-add-mail-domain "$user" "$domain" - fi - if [ ! -d "/home/$user/mail/$domain/$euser" ]; then - echo "======= Creating '$euser' mail account for domain '$domain'" - /usr/local/vesta/bin/v-add-mail-account "$user" "$domain" "$euser" "$PASS2" - echo "" - fi -fi - - -echo "Writing to: accounts/$EMAIL" -echo "#!/bin/bash - -# --- -# SRCHOST = $SRCHOST -# email = $EMAIL -# pass = $PASS -# pass2 = $PASS2 -# test = $TEST -# --- - -/root/imapsync/imapsync --host1 $SRCHOST --user1 $EMAIL --password1 '$PASS' --ssl1 --host2 localhost --user2 $EMAIL --password2 '$PASS2' $TESTOPT --addheader --automap \"\$@\" - -exit; -# --- -" > accounts/$EMAIL - -chmod a=rwx accounts/$EMAIL - -if [[ $TEST -eq 0 ]]; then - exit 0; -fi - -accounts/$EMAIL -RET=$? - -if [ $RET -eq 0 ]; then - # echo "./create-mail-sync.sh $EMAIL $PASS $PASS2 $TEST" - sed -i "s/--justlogin//g" accounts/$EMAIL - echo "--- OK! ---" - echo "./create-mail-sync.sh '$SRCHOST' '$EMAIL' '$PASS' '$PASS2' $TEST" >> accounts.log -else - echo "********* $EMAIL ERROR !!! [ret: $RET ] ************" - rm accounts/$EMAIL - read -p "=== Press ENTER to continue ===" entered -fi -exit $RET; diff --git a/src/deb/for-download/tools/imapsync/import-from-file.sh b/src/deb/for-download/tools/imapsync/import-from-file.sh deleted file mode 100644 index ac0c42f4..00000000 --- a/src/deb/for-download/tools/imapsync/import-from-file.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -# -# This script reads email and password=s in following format: -# email1 pass -# email2 pass -# email3 pass - -# The first parameter is the text file from which we read emails and passwords -# The second parameter is SMTP Hostname -# The third parameter is domain if lines contains only username part - - -host='' -if [ $# -gt 1 ]; then - host=$2 -else - echo "Usage: ./import-from-file.sh 'FILE' 'SMTPHOST' ['DOMAIN']" - exit 1; -fi - -domain='' -if [ $# -gt 2 ]; then - domain=$3 -fi - -end_of_file=0 -while [[ $end_of_file == 0 ]]; do - - read -r line - end_of_file=$? - - if [ "$line" == "" ]; then - if [[ $end_of_file == 1 ]]; then - echo "===EOF===" - break; - fi - continue - fi - - email=$(echo "$line" | awk '{print $1}') - pass=$(echo "$line" | awk '{print $2}') - - if [[ $email != *"@"* ]]; then - email="$email@$domain" - fi - - echo "Extracted: '$email' = '$pass'" - - ./create-mail-sync.sh "$host" "$email" "$pass" - - if [[ $end_of_file == 1 ]]; then - echo "===EOF===" - break; - fi - -done < $1 diff --git a/src/deb/for-download/tools/imapsync/run-all.sh b/src/deb/for-download/tools/imapsync/run-all.sh deleted file mode 100644 index fa535927..00000000 --- a/src/deb/for-download/tools/imapsync/run-all.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -cd accounts - -for name in * -do - if [ -f "$name" ]; then - ./$name - fi -done diff --git a/src/deb/for-download/tools/install-new-roundcube.sh b/src/deb/for-download/tools/install-new-roundcube.sh deleted file mode 100644 index 0f6a343a..00000000 --- a/src/deb/for-download/tools/install-new-roundcube.sh +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/bash - -USER='webmail' -DOMAIN='' # enter domain or subdomain - -VERSION='1.6.6' -DOWNLOAD="https://github.com/roundcube/roundcubemail/releases/download/$VERSION/roundcubemail-$VERSION-complete.tar.gz" - -LOGINMESSAGE1='Click here for NEW Webmail' -LOGINMESSAGE2='(it is adapted for mobile phones too)' - -DATABASE_NAME_WITHOUT_PREFIX="roundcube" - -############################################################################################################################# - -if [ $# -gt 0 ]; then - USER=$1 -fi -if [ $# -gt 1 ]; then - DOMAIN=$2 -fi - -DATABASE_NAME="${USER}_${DATABASE_NAME_WITHOUT_PREFIX}" - -if [ -z "$USER" ] || [ -z "$DOMAIN" ]; then - echo "Usage:" - echo "bash install-new-roundcube.sh VESTAUSER YOURDOMAIN.com" - exit 1 -fi - -source /usr/local/vesta/func/main.sh -source /usr/local/vesta/func/db.sh - -# Defining password-gen function -gen_pass() { - MATRIX='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz' - LENGTH=32 - while [ ${n:=1} -le $LENGTH ]; do - PASS="$PASS${MATRIX:$(($RANDOM%${#MATRIX})):1}" - let n+=1 - done - echo "$PASS" -} -DATABASE_PASSWORD=$(gen_pass) - -fix_ownership() { - chown -R $USER:$USER /home/$USER/web/$DOMAIN/public_html/ - find /home/$USER/web/$DOMAIN/public_html/ -type d -exec chmod 755 {} + - find /home/$USER/web/$DOMAIN/public_html/ -type f -exec chmod 644 {} + -} - - -if [ ! -d "/home/$USER" ]; then - echo "== Creating user: $USER" - USER_PASSWORD=$(gen_pass) - /usr/local/vesta/bin/v-add-user "$USER" "$USER_PASSWORD" "admin@$DOMAIN" 'default' 'Webmail' 'Roundcube' - /usr/local/vesta/bin/v-change-user-language "$USER" 'en' -fi - -if [ ! -d "/home/$USER/web/$DOMAIN" ]; then - echo "== Adding domain: $DOMAIN" - /usr/local/vesta/bin/v-add-domain "$USER" "$DOMAIN" "" "yes" - if [ ! -d "/home/$USER/web/$DOMAIN" ]; then - echo "ERROR: Can't create domain $DOMAIN, maybe it's already created under the other user?" - exit 1 - fi - if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.tpl" ]; then - /usr/local/vesta/bin/v-change-web-domain-tpl "$USER" "$DOMAIN" 'PHP-FPM-74' 'yes' - fi -fi - -pub_ip=$(curl -4 -s https://scripts.myvestacp.com/ip.php) -domain_host_ip=$(host $DOMAIN | head -n 1 | awk '{print $NF}') -if [ "$pub_ip" != "$domain_host_ip" ]; then - echo "ERROR:" - echo "$DOMAIN is not pointing to $pub_ip" - echo "I see it is pointing to $domain_host_ip" - read -p "Are you sure you want to continue? (y/n)" answer - if [ "$answer" = "y" ] || [ "$answer" = "Y" ]; then - echo "Okay, we will continue." - else - echo "OK, good bye!" - exit 1 - fi -fi - -number_of_files=$(ls /home/$USER/web/$DOMAIN/public_html | wc -l) -if [ $number_of_files -ne 0 ]; then - if [ $number_of_files -eq 2 ] && [ -f "/home/$USER/web/$DOMAIN/public_html/index.html" ] && [ -f "/home/$USER/web/$DOMAIN/public_html/robots.txt" ]; then - rm /home/$USER/web/$DOMAIN/public_html/index.html - rm /home/$USER/web/$DOMAIN/public_html/robots.txt - else - echo "== public_html folder is not empty, aborting." - exit 1 - fi -fi - -if [ ! -f "/home/$USER/conf/web/ssl.$DOMAIN.ca" ]; then - www_host="www.$DOMAIN" - www_host_ip=$(host $www_host | head -n 1 | awk '{print $NF}') - if [ "$www_host_ip" != "$domain_host_ip" ]; then - echo "=== Deleting www" - /usr/local/vesta/bin/v-delete-web-domain-alias "$USER" "$DOMAIN" "$www_host" 'no' - /usr/local/vesta/bin/v-delete-dns-on-web-alias "$USER" "$DOMAIN" "$www_host" 'no' - www_host="" - fi - echo "== Installing LetsEncrypt SSL, please wait..." - /usr/local/vesta/bin/v-add-letsencrypt-domain "$USER" "$DOMAIN" "$www_host" 'yes' - /usr/local/vesta/bin/v-change-web-domain-proxy-tpl "$USER" "$DOMAIN" 'force-https' 'jpg,jpeg,gif,png,ico,svg,css,zip,tgz,gz,rar,bz2,doc,xls,exe,pdf,ppt,txt,odt,ods,odp,odf,tar,wav,bmp,rtf,js,mp3,avi,mpeg,flv,woff,woff2' 'yes' -fi - -echo "== Downloading Roundcube..." -wget -nv "$DOWNLOAD" -O /root/roundcubemail.tar.gz - -echo "== Extracting Roundcube..." -tar --directory /home/$USER/web/$DOMAIN/public_html --strip-components=1 -xzf /root/roundcubemail.tar.gz roundcubemail-$VERSION/ - -fix_ownership - -DB_EXISTS=$(check_if_database_exists "$USER" "$DATABASE_NAME") -if [ "$DB_EXISTS" = "no" ]; then - echo "== Creating database: $DATABASE_NAME" - /usr/local/vesta/bin/v-add-database "$USER" "$DATABASE_NAME_WITHOUT_PREFIX" "$DATABASE_NAME_WITHOUT_PREFIX" "$DATABASE_PASSWORD" 'mysql' 'localhost' 'utf8' -else - echo "== Database $DATABASE_NAME already exists, and it's maybe used by another site. I will not continue. Please edit this script and enter other database name." - exit 1 -fi - -if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.tpl" ]; then - echo "================================" - echo "== Installing php7.3-imap module" - apt update - apt install -y php7.3-imap - echo "================================" -fi -if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.tpl" ]; then - echo "================================" - echo "== Installing php7.4-imap module" - apt update - apt install -y php7.4-imap - echo "================================" -fi -if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-80.tpl" ]; then - echo "================================" - echo "== Installing php8.0-imap module" - apt update - apt install -y php8.0-imap - echo "================================" -fi -if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-81.tpl" ]; then - echo "================================" - echo "== Installing php8.1-imap module" - apt update - apt install -y php8.1-imap - echo "================================" -fi -if [ -f "/usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl" ]; then - echo "================================" - echo "== Installing php8.2-imap module" - apt update - apt install -y php8.2-imap - echo "================================" -fi - -echo "-------------------------------------" -echo "Go to:" -echo "https://${DOMAIN}/installer/" -echo "... and finish the Roundcube installation." -echo "" -echo "You will be asked for:" -echo "Database host: localhost" -echo "Database user: $DATABASE_NAME" -echo "Database name: $DATABASE_NAME" -echo "Database pass: $DATABASE_PASSWORD" -echo "" -echo "Suggestion: plugins to be enabled: new_user_dialog, password" -echo "-------------------------------------" -echo "" -echo "=== When you click 'Initialize database' button (and see DB Write: OK), you can consider the installation as done." -read -p "=== Then press Enter here, and this script will remove /home/$USER/web/$DOMAIN/public_html/installer folder ===" - -if [ ! -f "/home/$USER/web/$DOMAIN/public_html/config/config.inc.php" ]; then - echo "=== ERROR: You didn't finish the installation." - echo "=== Please read carefully what is written above." - read -p "=== Then press Enter when you finish installation ===" -fi -if [ ! -f "/home/$USER/web/$DOMAIN/public_html/config/config.inc.php" ]; then - echo "=== ERROR: You didn't finish the installation." - echo "=== Sorry, the script will exit now." - exit 1; -fi - -rm -rf /home/$USER/web/$DOMAIN/public_html/installer - -if [ -d "/home/$USER/web/$DOMAIN/public_html/plugins/password" ]; then - cp /usr/share/roundcube/plugins/password/config.inc.php /home/$USER/web/$DOMAIN/public_html/plugins/password/config.inc.php - cp /usr/share/roundcube/plugins/password/drivers/vesta.php /home/$USER/web/$DOMAIN/public_html/plugins/password/drivers/vesta.php -fi - -# wget -nv https://c.myvestacp.com/tools/roundcube-filters.tgz -O /root/roundcube-filters.tgz -# tar --directory /home/$USER/web/$DOMAIN/public_html/plugins -xzf /root/roundcube-filters.tgz -# sed -i "s/\$config\['plugins'\] = \[/\$config['plugins'] = ['filters', /g" /home/$USER/web/$DOMAIN/public_html/config/config.inc.php - -echo "\$config['session_lifetime'] = 1080;" >> /home/$USER/web/$DOMAIN/public_html/config/config.inc.php - -fix_ownership - -if [ -f "/usr/share/roundcube/skins/larry/templates/login.html" ]; then - check_grep=$(grep -c 'color: white; font-size: 12pt' /usr/share/roundcube/skins/larry/templates/login.html) - if [ "$check_grep" -eq 0 ]; then - sed -i "s||

$LOGINMESSAGE1
$LOGINMESSAGE2


\n\n|g" /usr/share/roundcube/skins/larry/templates/login.html - fi -fi - -check_grep=$(grep -c 'MAIL_URL=' /usr/local/vesta/conf/vesta.conf) -if [ "$check_grep" -eq 0 ]; then - echo "MAIL_URL='https://$DOMAIN/'" >> /usr/local/vesta/conf/vesta.conf -fi - - -echo "-------------------------------------" -echo "Roundcube installed!" -echo "Go to:" -echo "https://${DOMAIN}/" -echo "-------------------------------------" diff --git a/src/deb/for-download/tools/install-rocket-nginx.sh b/src/deb/for-download/tools/install-rocket-nginx.sh deleted file mode 100644 index ca1f8b2a..00000000 --- a/src/deb/for-download/tools/install-rocket-nginx.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/wprocket-force-https.tpl https://c.myvestacp.com/tools/rocket-nginx-templates/wprocket-force-https.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/wprocket-force-https.stpl https://c.myvestacp.com/tools/rocket-nginx-templates/wprocket-force-https.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/wprocket-hosting.tpl https://c.myvestacp.com/tools/rocket-nginx-templates/wprocket-hosting.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/wprocket-hosting.stpl https://c.myvestacp.com/tools/rocket-nginx-templates/wprocket-hosting.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/wprocket-webp-express-force-https.tpl https://c.myvestacp.com/tools/rocket-nginx-templates/wprocket-webp-express-force-https.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/wprocket-webp-express-force-https.stpl https://c.myvestacp.com/tools/rocket-nginx-templates/wprocket-webp-express-force-https.stpl - -echo "Updating apt, please wait..." -apt-get update > /dev/null 2>&1 - -apt-get -y install git > /dev/null 2>&1 - -if [ ! -d "/etc/nginx/rocket-nginx" ]; then - cd /etc/nginx - git clone https://github.com/satellitewp/rocket-nginx.git -else - cd /etc/nginx/rocket-nginx - git pull - cd .. -fi - -cd rocket-nginx -cp rocket-nginx.ini.disabled rocket-nginx.ini -php rocket-parser.php -if [ -f "/etc/nginx/rocket-nginx/conf.d/default.conf" ]; then - /usr/local/vesta/bin/v-php-func 'strip_once_in_file_between_including_borders' '/etc/nginx/rocket-nginx/conf.d/default.conf' '# BROWSER MEDIA CACHE' '}' -fi diff --git a/src/deb/for-download/tools/install-softaculous.sh b/src/deb/for-download/tools/install-softaculous.sh deleted file mode 100644 index b209c68d..00000000 --- a/src/deb/for-download/tools/install-softaculous.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -if [ -f "/usr/local/vesta/web/inc/login_url.php" ]; then - mv /usr/local/vesta/web/inc/login_url.php /usr/local/vesta/web/inc/login_url.php-bak -fi - -source /etc/profile -PATH=$PATH:/usr/local/vesta/bin && export PATH - -sed -i '/SOFTACULOUS/d' /usr/local/vesta/conf/vesta.conf - -rm -rf /var/softaculous/ -rm -rf /usr/local/vesta/softaculous/ -rm -rf /usr/local/vesta/web/softaculous/ - -apt update - -# apt install --reinstall vesta-php - -apt install --reinstall vesta-ioncube vesta-softaculous - -service vesta stop -service vesta start - -/usr/local/vesta/bin/v-add-vesta-softaculous - -if [ -f "/usr/local/vesta/web/inc/login_url.php-bak" ]; then - mv /usr/local/vesta/web/inc/login_url.php-bak /usr/local/vesta/web/inc/login_url.php -fi - -echo "" -echo "" -echo "=== Softaculous installation done ===" -echo "" -echo "Wait for about 5 minutes so softaculous-cron download all packages." -echo "You can check if it is still downloading packages by running command:" -echo 'ps -Af | grep "cron.php" | grep -v "grep"' -echo "" diff --git a/src/deb/for-download/tools/multi-php-install.sh b/src/deb/for-download/tools/multi-php-install.sh deleted file mode 100644 index aa1b7353..00000000 --- a/src/deb/for-download/tools/multi-php-install.sh +++ /dev/null @@ -1,463 +0,0 @@ -#!/bin/bash - -######################################################################### -# First enter 1 below for desired PHP versions and then run this script # -######################################################################### - -inst_56=0 -inst_70=0 -inst_71=0 -inst_72=0 -inst_73=0 -inst_74=0 -inst_80=0 -inst_81=0 -inst_82=0 -inst_83=0 -inst_84=0 - -####################################################################### - -check_grep=$(grep -c "WEB_SYSTEM='nginx'" /usr/local/vesta/conf/vesta.conf) -if [ "$check_grep" -eq 1 ]; then - echo "Multi-PHP support is only for myVesta that is installed in nginx+Apache or Apache variant" - exit 1 -fi - -inst_repo=0 -debian_version=$(cat /etc/debian_version | tr "." "\n" | head -n1) -memory=$(grep 'MemTotal' /proc/meminfo |tr ' ' '\n' |grep [0-9]) - -if [ $# -gt 0 ]; then - inst_repo=$1 -fi -if [ $# -gt 1 ]; then - inst_56=$2 -fi -if [ $# -gt 2 ]; then - inst_70=$3 -fi -if [ $# -gt 3 ]; then - inst_71=$4 -fi -if [ $# -gt 4 ]; then - inst_72=$5 -fi -if [ $# -gt 5 ]; then - inst_73=$6 -fi -if [ $# -gt 6 ]; then - inst_74=$7 -fi -if [ $# -gt 7 ]; then - inst_80=$8 -fi -if [ $# -gt 8 ]; then - inst_81=$9 -fi -if [ $# -gt 9 ]; then - inst_82=${10} -fi -if [ $# -gt 10 ]; then - inst_83=${11} -fi -if [ $# -gt 11 ]; then - inst_84=${12} -fi - -if [ $inst_56 -eq 1 ] || [ $inst_70 -eq 1 ] || [ $inst_71 -eq 1 ] || [ $inst_72 -eq 1 ] || [ $inst_73 -eq 1 ] || [ $inst_74 -eq 1 ] || [ $inst_80 -eq 1 ] || [ $inst_81 -eq 1 ] || [ $inst_82 -eq 1 ] || [ $inst_83 -eq 1 ] || [ $inst_84 -eq 1 ]; then - inst_repo=1 -fi - -wait_to_press_enter=0 -if [ -f "/root/wait_to_press_enter" ]; then - wait_to_press_enter=1 -fi - -function press_enter { - if [ $wait_to_press_enter -eq 1 ]; then - read -p "$1" - else - echo $1 - fi -} - - -# echo "parameters=$#" -echo "debian_version=$debian_version" -echo "inst_repo=$inst_repo" -echo "inst_56=$inst_56" -echo "inst_70=$inst_70" -echo "inst_71=$inst_71" -echo "inst_72=$inst_72" -echo "inst_73=$inst_73" -echo "inst_74=$inst_74" -echo "inst_80=$inst_80" -echo "inst_81=$inst_81" -echo "inst_82=$inst_82" -echo "inst_83=$inst_83" -echo "inst_84=$inst_84" -echo "wait_to_press_enter=$wait_to_press_enter" - -press_enter "=== Press enter to continue ===============================================================================" - -apt update -if [ "$inst_repo" -eq 1 ]; then - press_enter "=== Press enter to install sury.org repo ===============================================================================" - apt -y install apt-transport-https ca-certificates - if [ $debian_version -ge 11 ]; then - wget -nv -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg - fi - # if [ $debian_version -eq 10 ]; then - # sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' - # fi - if [ $debian_version -eq 11 ]; then - sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' - fi - if [ $debian_version -eq 12 ]; then - sh -c 'echo "deb https://packages.sury.org/php/ bookworm main" > /etc/apt/sources.list.d/php.list' - fi - apt update - # apt upgrade -y - press_enter "=== Press enter to continue ===============================================================================" -fi - -echo "=== Enabling proxy_fcgi setenvif" -a2enmod proxy_fcgi setenvif -service apache2 restart - - -if [ "$inst_56" -eq 1 ]; then - press_enter "=== Press enter to install PHP 5.6 ===============================================================================" - apt -y install php5.6-mbstring php5.6-bcmath php5.6-cli php5.6-curl php5.6-fpm php5.6-gd php5.6-intl php5.6-mcrypt php5.6-mysql php5.6-soap php5.6-xml php5.6-zip php5.6-memcache php5.6-memcached php5.6-imagick - update-rc.d php5.6-fpm defaults - a2enconf php5.6-fpm - systemctl restart apache2 - cp -r /etc/php/5.6/ /root/vst_install_backups/php5.6/ - # rm -f /etc/php/5.6/fpm/pool.d/* - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-56.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-56.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-56.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-56.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-56.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-56.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-56.sh - mkdir -p /root/vesta-temp-dl/vesta/patch - wget -nv https://c.myvestacp.com/tools/patches/php5.6.patch -O /root/vesta-temp-dl/vesta/patch/php5.6.patch - patch -p1 --directory=/ < /root/vesta-temp-dl/vesta/patch/php5.6.patch - rm -rf /root/vesta-temp-dl - press_enter "=== Press enter to continue ===============================================================================" -fi - -if [ "$inst_70" -eq 1 ]; then - press_enter "=== Press enter to install PHP 7.0 ===============================================================================" - apt -y install php7.0-mbstring php7.0-bcmath php7.0-cli php7.0-curl php7.0-fpm php7.0-gd php7.0-intl php7.0-mcrypt php7.0-mysql php7.0-soap php7.0-xml php7.0-zip php7.0-memcache php7.0-memcached php7.0-imagick - update-rc.d php7.0-fpm defaults - a2enconf php7.0-fpm - systemctl restart apache2 - cp -r /etc/php/7.0/ /root/vst_install_backups/php7.0/ - # rm -f /etc/php/7.0/fpm/pool.d/* - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-70.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-70.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-70.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-70.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-70.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-70.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-70.sh - if [ $debian_version -eq 9 ]; then - cp /etc/php/7.0/apache2/php.ini /etc/php/7.0/fpm/php.ini - fi - if [ $debian_version -eq 10 ]; then - cp /etc/php/7.3/fpm/php.ini /etc/php/7.0/fpm/php.ini - fi - if [ $debian_version -eq 11 ]; then - cp /etc/php/7.4/fpm/php.ini /etc/php/7.0/fpm/php.ini - fi - press_enter "=== Press enter to continue ===============================================================================" -fi - -if [ "$inst_71" -eq 1 ]; then - press_enter "=== Press enter to install PHP 7.1 ===============================================================================" - apt -y install php7.1-mbstring php7.1-bcmath php7.1-cli php7.1-curl php7.1-fpm php7.1-gd php7.1-intl php7.1-mcrypt php7.1-mysql php7.1-soap php7.1-xml php7.1-zip php7.1-memcache php7.1-memcached php7.1-imagick - update-rc.d php7.1-fpm defaults - a2enconf php7.1-fpm - systemctl restart apache2 - cp -r /etc/php/7.1/ /root/vst_install_backups/php7.1/ - # rm -f /etc/php/7.1/fpm/pool.d/* - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-71.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-71.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-71.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-71.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-71.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-71.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-71.sh - if [ $debian_version -eq 9 ]; then - cp /etc/php/7.0/apache2/php.ini /etc/php/7.1/fpm/php.ini - fi - if [ $debian_version -eq 10 ]; then - cp /etc/php/7.3/fpm/php.ini /etc/php/7.1/fpm/php.ini - fi - if [ $debian_version -eq 11 ]; then - cp /etc/php/7.4/fpm/php.ini /etc/php/7.1/fpm/php.ini - fi - press_enter "=== Press enter to continue ===============================================================================" -fi - -if [ "$inst_72" -eq 1 ]; then - press_enter "=== Press enter to install PHP 7.2 ===============================================================================" - apt -y install php7.2-mbstring php7.2-bcmath php7.2-cli php7.2-curl php7.2-fpm php7.2-gd php7.2-intl php7.2-mysql php7.2-soap php7.2-xml php7.2-zip php7.2-memcache php7.2-memcached php7.2-imagick - update-rc.d php7.2-fpm defaults - a2enconf php7.2-fpm - systemctl restart apache2 - cp -r /etc/php/7.2/ /root/vst_install_backups/php7.2/ - # rm -f /etc/php/7.2/fpm/pool.d/* - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-72.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-72.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-72.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-72.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-72.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-72.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-72.sh - if [ $debian_version -eq 9 ]; then - cp /etc/php/7.0/apache2/php.ini /etc/php/7.2/fpm/php.ini - fi - if [ $debian_version -eq 10 ]; then - cp /etc/php/7.3/fpm/php.ini /etc/php/7.2/fpm/php.ini - fi - if [ $debian_version -eq 11 ]; then - cp /etc/php/7.4/fpm/php.ini /etc/php/7.2/fpm/php.ini - fi - press_enter "=== Press enter to continue ===============================================================================" -fi - -if [ "$inst_73" -eq 1 ]; then - press_enter "=== Press enter to install PHP 7.3 ===============================================================================" - apt -y install php7.3-mbstring php7.3-bcmath php7.3-cli php7.3-curl php7.3-fpm php7.3-gd php7.3-intl php7.3-mysql php7.3-soap php7.3-xml php7.3-zip php7.3-memcache php7.3-memcached php7.3-imagick - update-rc.d php7.3-fpm defaults - a2enconf php7.3-fpm - systemctl restart apache2 - cp -r /etc/php/7.3/ /root/vst_install_backups/php7.3/ - # rm -f /etc/php/7.3/fpm/pool.d/* - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-73.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-73.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-73.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-73-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-73-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-73-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-73-public.sh - if [ $debian_version -eq 9 ]; then - cp /etc/php/7.0/apache2/php.ini /etc/php/7.3/fpm/php.ini - fi - if [ $debian_version -eq 11 ]; then - cp /etc/php/7.4/fpm/php.ini /etc/php/7.3/fpm/php.ini - fi - press_enter "=== Press enter to continue ===============================================================================" -fi - -if [ "$inst_74" -eq 1 ]; then - press_enter "=== Press enter to install PHP 7.4 ===============================================================================" - apt -y install php7.4-mbstring php7.4-bcmath php7.4-cli php7.4-curl php7.4-fpm php7.4-gd php7.4-intl php7.4-mysql php7.4-soap php7.4-xml php7.4-zip php7.4-memcache php7.4-memcached php7.4-imagick - update-rc.d php7.4-fpm defaults - a2enconf php7.4-fpm - apt-get -y remove libapache2-mod-php7.4 - systemctl restart apache2 - cp -r /etc/php/7.4/ /root/vst_install_backups/php7.4/ - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-74.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-74.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-74.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-74-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-74-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-74-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-74-public.sh - if [ $debian_version -eq 9 ]; then - cp /etc/php/7.0/apache2/php.ini /etc/php/7.4/fpm/php.ini - fi - if [ $debian_version -eq 10 ]; then - cp /etc/php/7.3/fpm/php.ini /etc/php/7.4/fpm/php.ini - fi - press_enter "=== Press enter to continue ===============================================================================" -fi - - -if [ "$inst_80" -eq 1 ]; then - press_enter "=== Press enter to install PHP 8.0 ===============================================================================" - apt -y install php8.0-mbstring php8.0-bcmath php8.0-cli php8.0-curl php8.0-fpm php8.0-gd php8.0-intl php8.0-mysql php8.0-soap php8.0-xml php8.0-zip php8.0-memcache php8.0-memcached php8.0-imagick - update-rc.d php8.0-fpm defaults - a2enconf php8.0-fpm - a2dismod php8.0 - apt-get -y remove libapache2-mod-php8.0 - systemctl restart apache2 - cp -r /etc/php/8.0/ /root/vst_install_backups/php8.0/ - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-80.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-80.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-80.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-80-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-80-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-80-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-80-public.sh - echo "=== Patching php.ini for php8.0" - wget -nv https://c.myvestacp.com/tools/patches/php8.0.patch -O /root/php8.0.patch - patch /etc/php/8.0/fpm/php.ini < /root/php8.0.patch - if [ $memory -gt 9999999 ]; then - sed -i "s|opcache.memory_consumption=512|opcache.memory_consumption=2048|g" /etc/php/8.0/fpm/php.ini - fi - service php8.0-fpm restart - press_enter "=== PHP 8.0 installed, press enter to continue ===============================================================================" -fi - -if [ "$inst_81" -eq 1 ]; then - press_enter "=== Press enter to install PHP 8.1 ===============================================================================" - apt -y install php8.1-mbstring php8.1-bcmath php8.1-cli php8.1-curl php8.1-fpm php8.1-gd php8.1-intl php8.1-mysql php8.1-soap php8.1-xml php8.1-zip php8.1-memcache php8.1-memcached php8.1-imagick - update-rc.d php8.1-fpm defaults - a2enconf php8.1-fpm - a2dismod php8.1 - apt-get -y remove libapache2-mod-php8.1 - systemctl restart apache2 - cp -r /etc/php/8.1/ /root/vst_install_backups/php8.1/ - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-81.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-81.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-81.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-81-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-81-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-81-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-81-public.sh - echo "=== Patching php.ini for php8.1" - wget -nv https://c.myvestacp.com/tools/patches/php8.1.patch -O /root/php8.1.patch - patch /etc/php/8.1/fpm/php.ini < /root/php8.1.patch - if [ $memory -gt 9999999 ]; then - sed -i "s|opcache.memory_consumption=512|opcache.memory_consumption=2048|g" /etc/php/8.1/fpm/php.ini - fi - service php8.1-fpm restart - press_enter "=== PHP 8.1 installed, press enter to continue ===============================================================================" -fi - -if [ "$inst_82" -eq 1 ]; then - press_enter "=== Press enter to install PHP 8.2 ===============================================================================" - apt -y install php8.2-mbstring php8.2-bcmath php8.2-cli php8.2-curl php8.2-fpm php8.2-gd php8.2-intl php8.2-mysql php8.2-soap php8.2-xml php8.2-zip php8.2-memcache php8.2-memcached php8.2-imagick - update-rc.d php8.2-fpm defaults - a2enconf php8.2-fpm - a2dismod php8.2 - apt-get -y remove libapache2-mod-php8.2 - systemctl restart apache2 - cp -r /etc/php/8.2/ /root/vst_install_backups/php8.2/ - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-82.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-82.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-82.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-82-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-82-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-82-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-82-public.sh - echo "=== Patching php.ini for php8.2" - wget -nv https://c.myvestacp.com/tools/patches/php8.2.patch -O /root/php8.2.patch - patch /etc/php/8.2/fpm/php.ini < /root/php8.2.patch - if [ $memory -gt 9999999 ]; then - sed -i "s|opcache.memory_consumption=512|opcache.memory_consumption=2048|g" /etc/php/8.2/fpm/php.ini - fi - service php8.2-fpm restart - press_enter "=== PHP 8.2 installed, press enter to continue ===============================================================================" -fi - -if [ "$inst_83" -eq 1 ]; then - press_enter "=== Press enter to install PHP 8.3 ===============================================================================" - apt -y install php8.3-mbstring php8.3-bcmath php8.3-cli php8.3-curl php8.3-fpm php8.3-gd php8.3-intl php8.3-mysql php8.3-soap php8.3-xml php8.3-zip php8.3-memcache php8.3-memcached php8.3-imagick - update-rc.d php8.3-fpm defaults - a2enconf php8.3-fpm - a2dismod php8.3 - apt-get -y remove libapache2-mod-php8.3 - systemctl restart apache2 - cp -r /etc/php/8.3/ /root/vst_install_backups/php8.3/ - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-83.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-83.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-83.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-83-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-83-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-83-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-83-public.sh - echo "=== Patching php.ini for php8.3" - wget -nv https://c.myvestacp.com/tools/patches/php8.2.patch -O /root/php8.3.patch - patch /etc/php/8.3/fpm/php.ini < /root/php8.3.patch - if [ $memory -gt 9999999 ]; then - sed -i "s|opcache.memory_consumption=512|opcache.memory_consumption=2048|g" /etc/php/8.3/fpm/php.ini - fi - service php8.3-fpm restart - press_enter "=== PHP 8.3 installed, press enter to continue ===============================================================================" -fi - -if [ "$inst_84" -eq 1 ]; then - press_enter "=== Press enter to install PHP 8.4 ===============================================================================" - apt -y install php8.4-mbstring php8.4-bcmath php8.4-cli php8.4-curl php8.4-fpm php8.4-gd php8.4-intl php8.4-mysql php8.4-soap php8.4-xml php8.4-zip php8.4-memcache php8.4-memcached php8.4-imagick - update-rc.d php8.4-fpm defaults - a2enconf php8.4-fpm - a2dismod php8.4 - apt-get -y remove libapache2-mod-php8.4 - systemctl restart apache2 - cp -r /etc/php/8.4/ /root/vst_install_backups/php8.4/ - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-84.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-84.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-84.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.sh - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-84-public.stpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84-public.stpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-84-public.tpl -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84-public.tpl - wget -nv https://c.myvestacp.com/tools/apache-fpm-tpl/PHP-FPM-84-public.sh -O /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84-public.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84.sh - chmod a+x /usr/local/vesta/data/templates/web/apache2/PHP-FPM-84-public.sh - echo "=== Patching php.ini for php8.4" - wget -nv https://c.myvestacp.com/tools/patches/php8.2.patch -O /root/php8.4.patch - patch /etc/php/8.4/fpm/php.ini < /root/php8.4.patch - if [ $memory -gt 9999999 ]; then - sed -i "s|opcache.memory_consumption=512|opcache.memory_consumption=2048|g" /etc/php/8.4/fpm/php.ini - fi - service php8.4-fpm restart - press_enter "=== PHP 8.4 installed, press enter to continue ===============================================================================" -fi - - -# apt update > /dev/null 2>&1 -# apt upgrade -y > /dev/null 2>&1 - -if [ $debian_version -ge 10 ]; then - a2dismod ruid2 > /dev/null 2>&1 - a2dismod suexec > /dev/null 2>&1 - a2dismod php5.6 > /dev/null 2>&1 - a2dismod php7.0 > /dev/null 2>&1 - a2dismod php7.1 > /dev/null 2>&1 - a2dismod php7.2 > /dev/null 2>&1 - a2dismod php7.3 > /dev/null 2>&1 - a2dismod php7.4 > /dev/null 2>&1 - a2dismod php8.0 > /dev/null 2>&1 - a2dismod php8.1 > /dev/null 2>&1 - a2dismod php8.2 > /dev/null 2>&1 - a2dismod php8.3 > /dev/null 2>&1 - a2dismod php8.4 > /dev/null 2>&1 - a2dismod mpm_prefork > /dev/null 2>&1 - a2enmod mpm_event > /dev/null 2>&1 - apt-get -y remove libapache2-mod-php* > /dev/null 2>&1 - service apache2 restart -fi - -if [ -f "/usr/share/phpgate/phpgate.php" ]; then - echo "=== upgrading phpgate" - /usr/local/vesta/bin/v-commander 'm' 'inst pgw' 'q' - echo "=== upgrading phpgate done." - echo "" -fi - -if [ -f "/usr/local/bin/tailf_apache_error.php" ]; then - echo "=== upgrading tailf_apache_error.php" - wget -nv http://dl.myvestacp.com/vesta/tailf.php -O /usr/local/bin/tailf.php - wget -nv http://dl.myvestacp.com/vesta/tailf_apache_error.php -O /usr/local/bin/tailf_apache_error.php - wget -nv http://dl.myvestacp.com/vesta/see-apache-processlist-once.sh -O /usr/local/bin/see-apache-processlist-once.sh - wget -nv http://dl.myvestacp.com/vesta/see-mysql-processlist-once.sh -O /usr/local/bin/see-mysql-processlist-once.sh - chmod u+x /usr/local/bin/see-apache-processlist-once.sh - chmod u+x /usr/local/bin/see-mysql-processlist-once.sh - - # ps aux | grep 'tailf_apache_error' | grep -v "grep tailf_apache_error" - # echo $(ps aux | grep 'tailf_apache_error' | grep -v "grep tailf_apache_error" | awk '{print $2}') - kill $(ps aux | grep 'tailf_apache_error' | grep -v "grep tailf_apache_error" | awk '{print $2}') - sleep 1 - # ps -Af | grep 'tailf_apache_error' | grep -v "grep tailf_apache_error" - # sleep 1 - nohup php /usr/local/bin/tailf_apache_error.php > /var/log/tailf_apache_error.log & - echo "=== upgrading tailf_apache_error.php done." - sleep 3 - echo "" -fi - -# Fixing php.ini files to have the correct disable_functions line -/usr/local/vesta/bin/v-fix-php-ini-disable-functions - -echo "Everything done." -echo "" diff --git a/src/deb/for-download/tools/nginx-templates/hosting-webp-smush.stpl b/src/deb/for-download/tools/nginx-templates/hosting-webp-smush.stpl deleted file mode 100644 index 7597746c..00000000 --- a/src/deb/for-download/tools/nginx-templates/hosting-webp-smush.stpl +++ /dev/null @@ -1,56 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # #ssl_on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - # BEGIN SMUSH-WEBP - location ~* "wp-content\/(uploads\/)(.*.(?:png|jpe?g))" { - root %sdocroot%; - add_header Vary Accept; - expires max; - set $image_path $2; - if (-f "%sdocroot%/wp-content/smush-webp/disable_smush_webp") { - break; - } - if ($http_accept !~* "webp") { - break; - } - # add_header X_WebP_Try /wp-content/smush-webp/$image_path.webp; - try_files /wp-content/smush-webp/$image_path.webp $uri =404; - } - # END SMUSH-WEBP - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/nginx-templates/hosting-webp-smush.tpl b/src/deb/for-download/tools/nginx-templates/hosting-webp-smush.tpl deleted file mode 100644 index 7e408254..00000000 --- a/src/deb/for-download/tools/nginx-templates/hosting-webp-smush.tpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - proxy_pass http://%ip%:%web_port%; - - # BEGIN SMUSH-WEBP - location ~* "wp-content\/(uploads\/)(.*.(?:png|jpe?g))" { - root %sdocroot%; - add_header Vary Accept; - expires max; - set $image_path $2; - if (-f "%sdocroot%/wp-content/smush-webp/disable_smush_webp") { - break; - } - if ($http_accept !~* "webp") { - break; - } - # add_header X_WebP_Try /wp-content/smush-webp/$image_path.webp; - try_files /wp-content/smush-webp/$image_path.webp $uri =404; - } - # END SMUSH-WEBP - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/nginx-templates/wp-super-cache.stpl b/src/deb/for-download/tools/nginx-templates/wp-super-cache.stpl deleted file mode 100644 index 3bed6ce3..00000000 --- a/src/deb/for-download/tools/nginx-templates/wp-super-cache.stpl +++ /dev/null @@ -1,87 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - http2 on; - server_name %domain_idn% %alias_idn%; - root %sdocroot%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - set $cache_uri $request_uri; - set $caching 'ON'; - - # POST requests and urls with a query string should always go to PHP - if ($request_method = POST) { - set $caching 'OFF'; - } - - if ($query_string ~* "(fb_action_ids=|fb_action_types=|fb_source=|fbclid=|utm_source=|utm_campaign=|utm_medium=|utm_expid=|utm_term=|utm_content=|utm_id=|utm_source_platform=|utm_creative_format=|utm_marketing_tactic=|_ga=|gclid=|campaignid=|adgroupid=|adid=|gbraid=|wbraid=|_gl=|gclsrc=|gdfms=|gdftrk=|gdffi=|_ke=|_kx=|trk_contact=|trk_msg=|trk_module=|trk_sid=|mc_cid=|mc_eid=|mkwid=|pcrid=|mtm_source=|mtm_medium=|mtm_campaign=|mtm_keyword=|mtm_cid=|mtm_content=|msclkid=|epik=|pp=|pk_source=|pk_medium=|pk_campaign=|pk_keyword=|pk_cid=|pk_content=|redirect_log_mongo_id=|redirect_mongo_id=|sb_referer_host=)") { - set $query_string_cachable 1; - } - - if ($query_string != "") { - set $query_string_cacheable 1$query_string_cacheable; - } - - if ($query_string_cacheable = 11) { - set $caching 'ON'; - } - - if ($query_string_cacheable = 1) { - set $caching 'OFF'; - } - - # Don't cache uris containing the following segments - if ($request_uri ~* "(/wp-admin/|/xmlrpc.php|/wp-(app|cron|login|register|mail).php|wp-.*.php|/feed/|index.php|wp-comments-popup.php|wp-links-opml.php|wp-locations.php|sitemap(_index)?.xml|[a-z0–9_-]+-sitemap([0–9]+)?.xml)") { - set $caching 'OFF'; - } - - # Don't use the cache for logged-in users or recent commenters - if ($http_cookie ~* "comment_author|wordpress_[a-f0–9]+|wp-postpass|wordpress_logged_in") { - set $caching 'OFF'; - } - - if ($caching = 'ON') { - set $cachefile "/wp-content/cache/supercache/$http_host/$cache_uri/index-https.html"; - set $cachestatus 'HIT'; - } - - if ($caching = 'OFF') { - set $cachestatus 'MISS'; - } - - add_header X-Cache-Status $cachestatus; - add_header X-Cache-File $cachefile; - - location / { - try_files $cachefile @fallback; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/nginx-templates/wp-super-cache.tpl b/src/deb/for-download/tools/nginx-templates/wp-super-cache.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/nginx-templates/wp-super-cache.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-no-https-force.stpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-no-https-force.stpl deleted file mode 100644 index f49e99dc..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-no-https-force.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - # ssl on; - # http2 on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - # test %port_num% - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - - root %sdocroot%/public; - index index.html; - - location / { - proxy_pass http://localhost:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - - # try_files $uri $uri/ @rewrites; - - location ~* ^.+\.(%proxy_extentions%)$ { - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - } - } - - location @rewrites { - rewrite ^(.+)$ /index.html last; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} \ No newline at end of file diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-no-https-force.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-no-https-force.tpl deleted file mode 100644 index 29aadf7b..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-no-https-force.tpl +++ /dev/null @@ -1,46 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - root %sdocroot%/public; - index index.html; - - location / { - proxy_pass http://localhost:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - - # try_files $uri $uri/ @rewrites; - - location ~* ^.+\.(%proxy_extentions%)$ { - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - } - } - - location @rewrites { - rewrite ^(.+)$ /index.html last; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.stpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.stpl deleted file mode 100644 index 1387a879..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - # ssl on; - # http2 on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - # test %port_num% - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - - root %sdocroot%/public; - index index.html; - - location / { - proxy_pass https://localhost:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - - # try_files $uri $uri/ @rewrites; - - location ~* ^.+\.(%proxy_extentions%)$ { - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - } - } - - location @rewrites { - rewrite ^(.+)$ /index.html last; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} \ No newline at end of file diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000-pass-to-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.stpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.stpl deleted file mode 100644 index f49e99dc..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - # ssl on; - # http2 on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - # test %port_num% - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - - root %sdocroot%/public; - index index.html; - - location / { - proxy_pass http://localhost:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - - # try_files $uri $uri/ @rewrites; - - location ~* ^.+\.(%proxy_extentions%)$ { - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - } - } - - location @rewrites { - rewrite ^(.+)$ /index.html last; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} \ No newline at end of file diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-3000.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.stpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.stpl deleted file mode 100644 index 70fa2866..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.stpl +++ /dev/null @@ -1,70 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - # ssl on; - # http2 on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - # test %port_num% - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - - root %sdocroot%/public; - index index.html; - - location / { - proxy_pass http://localhost:4000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - - # try_files $uri $uri/ @rewrites; - - location ~* ^.+\.(%proxy_extentions%)$ { - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - } - } - - - location /app { - proxy_pass http://127.0.0.1:6001; - proxy_set_header Host $host; - proxy_read_timeout 60; - proxy_connect_timeout 60; - proxy_redirect off; - - # Allow the use of websockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } - - location @rewrites { - rewrite ^(.+)$ /index.html last; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} \ No newline at end of file diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl deleted file mode 100644 index ee8db90e..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-4000-and-websocket-6001.tpl +++ /dev/null @@ -1,25 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } - - location /app { - proxy_pass http://127.0.0.1:6001; - proxy_set_header Host $host; - proxy_read_timeout 60; - proxy_connect_timeout 60; - proxy_redirect off; - - # Allow the use of websockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - } - - -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-also-handle-static-files-3000.stpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-also-handle-static-files-3000.stpl deleted file mode 100644 index 415b6f9c..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-also-handle-static-files-3000.stpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - # ssl on; - # http2 on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - # test %port_num% - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - - location / { - # reverse proxy for next server - proxy_pass http://localhost:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - # we need to remove this 404 handling - # because next's _next folder and own handling - # try_files $uri $uri/ =404; - } - - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-also-handle-static-files-3000.tpl b/src/deb/for-download/tools/nodejs-nginx-templates/node-app-also-handle-static-files-3000.tpl deleted file mode 100644 index a62f7275..00000000 --- a/src/deb/for-download/tools/nodejs-nginx-templates/node-app-also-handle-static-files-3000.tpl +++ /dev/null @@ -1,30 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - # reverse proxy for next server - proxy_pass http://localhost:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - # we need to remove this 404 handling - # because next's _next folder and own handling - # try_files $uri $uri/ =404; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/patches/exim_forwarding.patch b/src/deb/for-download/tools/patches/exim_forwarding.patch deleted file mode 100644 index dcefe327..00000000 --- a/src/deb/for-download/tools/patches/exim_forwarding.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- old 2023-03-23 14:17:42.536656160 +0100 -+++ new 2023-03-24 23:07:08.186018906 +0100 -@@ -140,6 +140,11 @@ - - warn set acl_m3 = no - -+ warn !authenticated = * -+ hosts = !+relay_from_hosts -+ condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{true}{false}} -+ set acl_m3 = yes -+ - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] diff --git a/src/deb/for-download/tools/patches/exim_helo_authenticated.patch b/src/deb/for-download/tools/patches/exim_helo_authenticated.patch deleted file mode 100644 index 9dd8dbad..00000000 --- a/src/deb/for-download/tools/patches/exim_helo_authenticated.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- /etc/exim4/exim4.conf.template.orig 2023-04-12 19:05:20.745847763 +0200 -+++ /etc/exim4/exim4.conf.template 2023-04-12 19:34:29.000000000 +0200 -@@ -94 +94,2 @@ -- drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid -+ drop !authenticated = * -+ message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid -@@ -100 +101,2 @@ -- drop condition = ${if isip{$sender_helo_name}} -+ drop !authenticated = * -+ condition = ${if isip{$sender_helo_name}} -@@ -103 +105,2 @@ -- drop condition = ${if eq{[$interface_address]}{$sender_helo_name}} -+ drop !authenticated = * -+ condition = ${if eq{[$interface_address]}{$sender_helo_name}} diff --git a/src/deb/for-download/tools/patches/fix-fpm-poold.sh b/src/deb/for-download/tools/patches/fix-fpm-poold.sh deleted file mode 100644 index 311ef9cd..00000000 --- a/src/deb/for-download/tools/patches/fix-fpm-poold.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -if [ -d "/etc/php" ]; then - OLDVAL='php_admin_value\[upload_max_filesize\] = 80M' - NEWVAL='php_admin_value\[upload_max_filesize\] = 800M' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - - OLDVAL='php_admin_value\[post_max_size\] = 80M' - NEWVAL='php_admin_value\[post_max_size\] = 800M' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - - OLDVAL='php_admin_value\[memory_limit\] = 256M' - NEWVAL='php_admin_value\[memory_limit\] = 512M' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - - OLDVAL='pm.max_children = ' - NEWVAL='pm.max_children = 3' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL.*|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL.*|$NEWVAL|g" - - OLDVAL='request_terminate_timeout = ' - NEWVAL='request_terminate_timeout = 360s' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL.*|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL.*|$NEWVAL|g" - - OLDVAL='php_admin_value\[max_execution_time\] = ' - NEWVAL='php_admin_value\[max_execution_time\] = 300' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL.*|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL.*|$NEWVAL|g" - - systemctl --full --type service --all | grep "php...-fpm" | awk '{print $1}' | xargs systemctl restart -fi - -if [ -f "/etc/apache2/mods-enabled/mpm_event.conf" ]; then - rm /etc/apache2/mods-enabled/mpm_event.conf - ln -s /etc/apache2/mods-available/mpm_event.conf /etc/apache2/mods-enabled/mpm_event.conf - sed -i "s#MaxRequestWorkers.*#MaxRequestWorkers 200#g" /etc/apache2/mods-available/mpm_event.conf - systemctl restart apache2 -fi diff --git a/src/deb/for-download/tools/patches/force-https.patch b/src/deb/for-download/tools/patches/force-https.patch deleted file mode 100644 index 05c2004d..00000000 --- a/src/deb/for-download/tools/patches/force-https.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- force-https.tpl.orig 2023-03-25 18:15:15.577555584 +0100 -+++ force-https.tpl 2023-03-25 16:51:48.044997322 +0100 -@@ -2,7 +2,7 @@ - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { -- rewrite ^(.*) https://%domain_idn%$1 permanent; -+ rewrite ^(.*) https://$host$1 permanent; - } - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - } diff --git a/src/deb/for-download/tools/patches/php5.6.patch b/src/deb/for-download/tools/patches/php5.6.patch deleted file mode 100644 index ab103618..00000000 --- a/src/deb/for-download/tools/patches/php5.6.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- origin/etc/php/5.6/fpm/php.ini 2016-10-03 13:42:37.000000000 +0200 -+++ vesta/etc/php/5.6/fpm/php.ini 2016-09-30 14:10:49.000000000 +0200 -@@ -295,12 +295,13 @@ - ; and below. This directive makes most sense if used in a per-directory - ; or per-virtualhost web server configuration file. - ; http://php.net/open-basedir --;open_basedir = -+;open_basedir = - - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes for security reasons. - ; It receives a comma-delimited list of class names. -@@ -386,7 +387,7 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --; max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume (128MB) - ; http://php.net/memory-limit -@@ -657,7 +658,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 60M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -802,11 +803,11 @@ - ; Temporary directory for HTTP uploaded files (will use system default if not - ; specified). - ; http://php.net/upload-tmp-dir --;upload_tmp_dir = -+upload_tmp_dir = - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -993,7 +994,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1903,20 +1903,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=0 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=64 -+opcache.memory_consumption=2048 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=4 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 100000 are allowed. --;opcache.max_accelerated_files=2000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/src/deb/for-download/tools/patches/php8.0.patch b/src/deb/for-download/tools/patches/php8.0.patch deleted file mode 100644 index 243f7f1f..00000000 --- a/src/deb/for-download/tools/patches/php8.0.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- /etc/php/8.0/fpm/php.ini.orig 2021-02-20 06:34:43.000000000 +0100 -+++ /etc/php/8.0/fpm/php.ini 2021-02-22 00:56:23.000000000 +0100 -@@ -320,7 +320,8 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; http://php.net/disable-functions --disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+; disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare, -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -423,11 +424,11 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; Maximum amount of memory a script may consume - ; http://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -700,7 +701,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; http://php.net/post-max-size --post_max_size = 8M -+post_max_size = 50M - - ; Automatically add files before PHP document. - ; http://php.net/auto-prepend-file -@@ -852,7 +853,7 @@ - - ; Maximum allowed size for uploaded files. - ; http://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1098,7 +1099,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1760,20 +1761,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/src/deb/for-download/tools/patches/php8.1.patch b/src/deb/for-download/tools/patches/php8.1.patch deleted file mode 100644 index 9e1648ab..00000000 --- a/src/deb/for-download/tools/patches/php8.1.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- /etc/php/8.1/fpm/php.ini.orig 2023-03-16 15:37:38.000000000 +0100 -+++ /etc/php/8.1/fpm/php.ini 2023-03-22 14:58:38.000000000 +0100 -@@ -320,7 +320,7 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; https://php.net/disable-functions --disable_functions = -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -423,7 +423,7 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; How many multipart body parts (combined input variable and file uploads) may - ; be accepted. -@@ -432,7 +432,7 @@ - - ; Maximum amount of memory a script may consume - ; https://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -700,7 +700,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; https://php.net/post-max-size --post_max_size = 8M -+post_max_size = 50M - - ; Automatically add files before PHP document. - ; https://php.net/auto-prepend-file -@@ -852,7 +852,7 @@ - - ; Maximum allowed size for uploaded files. - ; https://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 50M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1103,7 +1103,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1774,20 +1774,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/src/deb/for-download/tools/patches/php8.2.patch b/src/deb/for-download/tools/patches/php8.2.patch deleted file mode 100644 index ed127499..00000000 --- a/src/deb/for-download/tools/patches/php8.2.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- /etc/php/8.2/fpm/php.ini.orig 2023-03-21 14:35:10.000000000 +0100 -+++ /etc/php/8.2/fpm/php.ini 2023-03-21 14:43:42.000000000 +0100 -@@ -320,7 +320,7 @@ - ; This directive allows you to disable certain functions. - ; It receives a comma-delimited list of function names. - ; https://php.net/disable-functions --disable_functions = -+disable_functions = pcntl_alarm,pcntl_fork,pcntl_waitpid,pcntl_wait,pcntl_wifexited,pcntl_wifstopped,pcntl_wifsignaled,pcntl_wifcontinued,pcntl_wexitstatus,pcntl_wtermsig,pcntl_wstopsig,pcntl_signal,pcntl_signal_get_handler,pcntl_signal_dispatch,pcntl_get_last_error,pcntl_strerror,pcntl_sigprocmask,pcntl_sigwaitinfo,pcntl_sigtimedwait,pcntl_exec,pcntl_getpriority,pcntl_setpriority,pcntl_async_signals,pcntl_unshare,exec,system,passthru,shell_exec,proc_open,popen - - ; This directive allows you to disable certain classes. - ; It receives a comma-delimited list of class names. -@@ -423,7 +423,7 @@ - ;max_input_nesting_level = 64 - - ; How many GET/POST/COOKIE input variables may be accepted --;max_input_vars = 1000 -+max_input_vars = 6000 - - ; How many multipart body parts (combined input variable and file uploads) may - ; be accepted. -@@ -432,7 +432,7 @@ - - ; Maximum amount of memory a script may consume - ; https://php.net/memory-limit --memory_limit = 128M -+memory_limit = 256M - - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ; Error handling and logging ; -@@ -700,7 +700,7 @@ - ; Its value may be 0 to disable the limit. It is ignored if POST data reading - ; is disabled through enable_post_data_reading. - ; https://php.net/post-max-size --post_max_size = 8M -+post_max_size = 80M - - ; Automatically add files before PHP document. - ; https://php.net/auto-prepend-file -@@ -852,7 +852,7 @@ - - ; Maximum allowed size for uploaded files. - ; https://php.net/upload-max-filesize --upload_max_filesize = 2M -+upload_max_filesize = 80M - - ; Maximum number of files that can be uploaded via a single request - max_file_uploads = 20 -@@ -1108,7 +1108,7 @@ - - ; The path to a log file that will log all mail() calls. Log entries include - ; the full path of the script, line number, To address and headers. --;mail.log = -+mail.log = /var/log/php-mail.log - ; Log mail to syslog (Event Log on Windows). - ;mail.log = syslog - -@@ -1786,20 +1786,20 @@ - - [opcache] - ; Determines if Zend OPCache is enabled --;opcache.enable=1 -+opcache.enable=1 - - ; Determines if Zend OPCache is enabled for the CLI version of PHP --;opcache.enable_cli=0 -+opcache.enable_cli=0 - - ; The OPcache shared memory storage size. --;opcache.memory_consumption=128 -+opcache.memory_consumption=512 - - ; The amount of memory for interned strings in Mbytes. - ;opcache.interned_strings_buffer=8 - - ; The maximum number of keys (scripts) in the OPcache hash table. - ; Only numbers between 200 and 1000000 are allowed. --;opcache.max_accelerated_files=10000 -+opcache.max_accelerated_files=100000 - - ; The maximum percentage of "wasted" memory until a restart is scheduled. - ;opcache.max_wasted_percentage=5 diff --git a/src/deb/for-download/tools/patches/rcube_vcard.patch b/src/deb/for-download/tools/patches/rcube_vcard.patch deleted file mode 100644 index 0a6cea15..00000000 --- a/src/deb/for-download/tools/patches/rcube_vcard.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /usr/share/roundcube/program/lib/Roundcube/rcube_vcard.php 2018-10-23 13:12:54.000000000 +0200 -+++ /usr/share/roundcube/program/lib/Roundcube/rcube_vcard.php2 2020-02-06 01:03:34.000000000 +0100 -@@ -536,7 +536,7 @@ - '/^item\d*\.X-AB.*$/mi', // remove cruft like item1.X-AB* - '/^item\d*\./mi', // remove item1.ADR instead of ADR - '/\n+/', // remove empty lines -- '/^(N:[^;\R]*)$/m', // if N doesn't have any semicolons, add some -+ '/^(N:[^;\r\n]*)$/m', // if N doesn't have any semicolons, add some - ), - array( - '\2;type=\5\3:\4', diff --git a/src/deb/for-download/tools/patches/separate-mail-ip.patch b/src/deb/for-download/tools/patches/separate-mail-ip.patch deleted file mode 100644 index 882cdcb4..00000000 --- a/src/deb/for-download/tools/patches/separate-mail-ip.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- ./exim4.conf.template-normal 2020-07-12 00:56:40.000000000 +0200 -+++ ./exim4.conf.template-separate 2020-07-12 00:56:07.000000000 +0200 -@@ -12,6 +12,10 @@ - add_environment=<; PATH=/bin:/usr/bin - keep_environment= - -+local_interfaces = 0.0.0.0 -+smtp_active_hostname = ${lookup{$interface_address}lsearch{/etc/exim4/virtual/helo_data}{$value}} -+smtp_banner = "$smtp_active_hostname ESMTP $tod_full" -+ - domainlist local_domains = dsearch;/etc/exim4/domains/ - domainlist relay_to_domains = dsearch;/etc/exim4/domains/ - hostlist relay_from_hosts = 127.0.0.1 -@@ -38,8 +42,8 @@ - .endif - - tls_advertise_hosts = * --tls_certificate = /usr/local/vesta/ssl/certificate.crt --tls_privatekey = /usr/local/vesta/ssl/certificate.key -+tls_certificate = /usr/local/vesta/ssl/$received_ip_address.crt -+tls_privatekey = /usr/local/vesta/ssl/$received_ip_address.key - - daemon_smtp_ports = 25 : 465 : 587 : 2525 - tls_on_connect_ports = 465 -@@ -72,6 +76,8 @@ - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / account / $authenticated_id / $sender_rate / $sender_rate_period - -+ warn set acl_m3 = yes -+ - accept - - acl_check_spammers: -@@ -112,6 +118,8 @@ - warn ratelimit = 0 / 1h / strict / $authenticated_id - log_message = Sender rate [limitlog]: log / email / $authenticated_id / $sender_rate / $sender_rate_period - -+ warn set acl_m3 = no -+ - deny message = Restricted characters in address - domains = +local_domains - local_parts = ^[.] : ^.*[@%!/|] -@@ -308,6 +316,8 @@ - - remote_smtp: - driver = smtp -+ interface = ${if eq{$acl_m3}{yes}{IP1}{IP2}} -+ helo_data = "${if eq{$acl_m3}{yes}{HOST1}{HOST2}}" - #helo_data = $sender_address_domain - dkim_domain = DKIM_DOMAIN - dkim_selector = mail diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.stpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.stpl deleted file mode 100644 index 1f67154e..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 9; - limit_conn zone_site 25; - limit_req zone=two burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.stpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.stpl deleted file mode 100644 index dfd00270..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 7; - limit_conn zone_site 20; - limit_req zone=two burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.stpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.stpl deleted file mode 100644 index 6d632713..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 5; - limit_conn zone_site 15; - limit_req zone=one burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress-2.stpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress-2.stpl deleted file mode 100644 index 5c3f22ac..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress-2.stpl +++ /dev/null @@ -1,95 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - error_page 418 = @wordfence_lh; - error_page 419 = @wordfence_route; - error_page 420 = @wordfence_sync; - - if ($request_uri ~ "^/\?wordfence_lh") { return 418; } - if ($request_uri ~ "^/\?rest_route=%2Fwordfence") { return 419; } - if ($request_uri ~ "^/\?wordfence_syncAttackData") { return 420; } - - limit_conn addr 10; - limit_conn zone_site 30; - limit_req zone=one burst=28 delay=14; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-admin/ { - limit_conn addr 48; - limit_conn zone_site 60; - limit_req zone=one burst=80 delay=14; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/ { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=one burst=80 delay=14; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_lh { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_route { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_sync { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/wordfence/ { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /wp-config.php {return 404;} - location ~ /xmlrpc.php {return 404;} - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress-2.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress-2.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress.stpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress.stpl deleted file mode 100644 index b263d6b5..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress.stpl +++ /dev/null @@ -1,95 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - error_page 418 = @wordfence_lh; - error_page 419 = @wordfence_route; - error_page 420 = @wordfence_sync; - - if ($request_uri ~ "^/\?wordfence_lh") { return 418; } - if ($request_uri ~ "^/\?rest_route=%2Fwordfence") { return 419; } - if ($request_uri ~ "^/\?wordfence_syncAttackData") { return 420; } - - limit_conn addr 5; - limit_conn zone_site 15; - limit_req zone=one burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-admin/ { - limit_conn addr 24; - limit_conn zone_site 30; - limit_req zone=one burst=40 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/ { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=one burst=40 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_lh { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_route { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_sync { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/wordfence/ { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /wp-config.php {return 404;} - location ~ /xmlrpc.php {return 404;} - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall-wordpress.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.stpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.stpl deleted file mode 100644 index db6ab623..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 3; - limit_conn zone_site 10; - limit_req zone=one burst=7 delay=3; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl b/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/force-https-firewall.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.stpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.stpl deleted file mode 100644 index 8435a72b..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 9; - limit_conn zone_site 25; - limit_req zone=two burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.tpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.tpl deleted file mode 100644 index 2cc5c781..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.tpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 9; - limit_conn zone_site 25; - limit_req zone=two burst=14 delay=7; - proxy_pass http://%ip%:%web_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.stpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.stpl deleted file mode 100644 index 856ebd56..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 7; - limit_conn zone_site 20; - limit_req zone=two burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.tpl deleted file mode 100644 index 5bf3fbf8..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.tpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 7; - limit_conn zone_site 20; - limit_req zone=two burst=14 delay=7; - proxy_pass http://%ip%:%web_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2.stpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2.stpl deleted file mode 100644 index 5d42830f..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 5; - limit_conn zone_site 15; - limit_req zone=one burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2.tpl deleted file mode 100644 index e57dbd1a..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-burst-2.tpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 5; - limit_conn zone_site 15; - limit_req zone=one burst=14 delay=7; - proxy_pass http://%ip%:%web_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress-2.stpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress-2.stpl deleted file mode 100644 index 5c3f22ac..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress-2.stpl +++ /dev/null @@ -1,95 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - error_page 418 = @wordfence_lh; - error_page 419 = @wordfence_route; - error_page 420 = @wordfence_sync; - - if ($request_uri ~ "^/\?wordfence_lh") { return 418; } - if ($request_uri ~ "^/\?rest_route=%2Fwordfence") { return 419; } - if ($request_uri ~ "^/\?wordfence_syncAttackData") { return 420; } - - limit_conn addr 10; - limit_conn zone_site 30; - limit_req zone=one burst=28 delay=14; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-admin/ { - limit_conn addr 48; - limit_conn zone_site 60; - limit_req zone=one burst=80 delay=14; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/ { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=one burst=80 delay=14; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_lh { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_route { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_sync { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/wordfence/ { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /wp-config.php {return 404;} - location ~ /xmlrpc.php {return 404;} - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress-2.tpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress-2.tpl deleted file mode 100644 index 44f6162c..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress-2.tpl +++ /dev/null @@ -1,92 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - error_page 418 = @wordfence_lh; - error_page 419 = @wordfence_route; - error_page 420 = @wordfence_sync; - - if ($request_uri ~ "^/\?wordfence_lh") { return 418; } - if ($request_uri ~ "^/\?rest_route=%2Fwordfence") { return 419; } - if ($request_uri ~ "^/\?wordfence_syncAttackData") { return 420; } - - limit_conn addr 10; - limit_conn zone_site 30; - limit_req zone=one burst=28 delay=14; - proxy_pass http://%ip%:%web_port%; - } - - location /wp-admin/ { - limit_conn addr 48; - limit_conn zone_site 60; - limit_req zone=one burst=80 delay=14; - proxy_pass http://%ip%:%web_port%; - } - - location /wp-json/ { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=one burst=80 delay=14; - proxy_pass http://%ip%:%web_port%; - } - - location @wordfence_lh { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass http://%ip%:%web_port%; - } - - location @wordfence_route { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass http://%ip%:%web_port%; - } - - location @wordfence_sync { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass http://%ip%:%web_port%; - } - - location /wp-json/wordfence/ { - limit_conn addr 16; - limit_conn zone_site 30; - limit_req zone=wfone burst=240; - proxy_pass http://%ip%:%web_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /wp-config.php {return 404;} - location ~ /xmlrpc.php {return 404;} - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress.stpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress.stpl deleted file mode 100644 index b263d6b5..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress.stpl +++ /dev/null @@ -1,95 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - error_page 418 = @wordfence_lh; - error_page 419 = @wordfence_route; - error_page 420 = @wordfence_sync; - - if ($request_uri ~ "^/\?wordfence_lh") { return 418; } - if ($request_uri ~ "^/\?rest_route=%2Fwordfence") { return 419; } - if ($request_uri ~ "^/\?wordfence_syncAttackData") { return 420; } - - limit_conn addr 5; - limit_conn zone_site 15; - limit_req zone=one burst=14 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-admin/ { - limit_conn addr 24; - limit_conn zone_site 30; - limit_req zone=one burst=40 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/ { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=one burst=40 delay=7; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_lh { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_route { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location @wordfence_sync { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /wp-json/wordfence/ { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /wp-config.php {return 404;} - location ~ /xmlrpc.php {return 404;} - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress.tpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress.tpl deleted file mode 100644 index 7203b88c..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall-wordpress.tpl +++ /dev/null @@ -1,92 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - error_page 418 = @wordfence_lh; - error_page 419 = @wordfence_route; - error_page 420 = @wordfence_sync; - - if ($request_uri ~ "^/\?wordfence_lh") { return 418; } - if ($request_uri ~ "^/\?rest_route=%2Fwordfence") { return 419; } - if ($request_uri ~ "^/\?wordfence_syncAttackData") { return 420; } - - limit_conn addr 5; - limit_conn zone_site 15; - limit_req zone=one burst=14 delay=7; - proxy_pass http://%ip%:%web_port%; - } - - location /wp-admin/ { - limit_conn addr 24; - limit_conn zone_site 30; - limit_req zone=one burst=40 delay=7; - proxy_pass http://%ip%:%web_port%; - } - - location /wp-json/ { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=one burst=40 delay=7; - proxy_pass http://%ip%:%web_port%; - } - - location @wordfence_lh { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass http://%ip%:%web_port%; - } - - location @wordfence_route { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass http://%ip%:%web_port%; - } - - location @wordfence_sync { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass http://%ip%:%web_port%; - } - - location /wp-json/wordfence/ { - limit_conn addr 8; - limit_conn zone_site 15; - limit_req zone=wfone burst=120; - proxy_pass http://%ip%:%web_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /wp-config.php {return 404;} - location ~ /xmlrpc.php {return 404;} - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall.stpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall.stpl deleted file mode 100644 index 42bc195b..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - # ssl on; - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 3; - limit_conn zone_site 10; - limit_req zone=one burst=7 delay=3; - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall.tpl b/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall.tpl deleted file mode 100644 index 177a71c6..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/hosting-firewall.tpl +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - location / { - limit_conn addr 3; - limit_conn zone_site 10; - limit_req zone=one burst=7 delay=3; - proxy_pass http://%ip%:%web_port%; - } - - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} - diff --git a/src/deb/for-download/tools/rate-limit-tpl/install_rate_limit_tpl.sh b/src/deb/for-download/tools/rate-limit-tpl/install_rate_limit_tpl.sh deleted file mode 100644 index 8f4d4e88..00000000 --- a/src/deb/for-download/tools/rate-limit-tpl/install_rate_limit_tpl.sh +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/bash - -# This installer will install hosting-firewall.tpl (nginx template) that will: -# + allow 1 http request per second per IP address (sent to your server, more precisely to your PHP-FPM) -# + allow 2 parallel http connections per IP address (sent to your PHP-FPM) -# + allow burst for 7 additional http requests (they will enter queue), first 3 will be processed immediately, 4 others will processed each request each second (so this will handle natural peaks that CMS can generate to itself) -# + if client fills allowed queue, additional requests will be denied -# -# Generally, this nginx template will prevent bad bots to run hundreds parallel http requests against your site, which will probably cause denial-of-service on your server. -# -# There are also 3 additional templates, with larger limit values (for example: 2 req/sec, 14 allowed requests in queue, 7 burst, 8 parallel connections). - -grepc=$(grep -c 'limit_conn_zone' /etc/nginx/nginx.conf) -if [ "$grepc" -eq 0 ]; then - sed -i 's|server_names_hash_bucket_size 512;|server_names_hash_bucket_size 512;\n limit_conn_zone $binary_remote_addr zone=addr:1m;\n limit_conn_zone $server_name zone=zone_site:1m;\n limit_req_zone $scheme zone=wfone:1m rate=1r/s;\n limit_req_zone $binary_remote_addr zone=one:1m rate=1r/s;\n limit_req_zone $binary_remote_addr zone=two:1m rate=2r/s;\n limit_conn_log_level error;\n limit_req_log_level error;\n limit_conn_status 429;\n limit_req_status 429;|g' /etc/nginx/nginx.conf - echo "=== Added rate_limit to nginx.conf" -fi - -grepc=$(grep -c 'zone=addr:10m' /etc/nginx/nginx.conf) -if [ "$grepc" -eq 1 ]; then - sed -i 's|zone=addr:10m|zone=addr:1m|g' /etc/nginx/nginx.conf - echo "=== Decrease addr zone to 1mb to nginx.conf" -fi - -grepc=$(grep -c 'zone=zone_site:1m' /etc/nginx/nginx.conf) -if [ "$grepc" -eq 0 ]; then - sed -i 's| zone=addr:1m;| zone=addr:1m;\n limit_conn_zone $server_name zone=zone_site:1m;|g' /etc/nginx/nginx.conf - echo "=== Added rate_limit 'zone_site' to nginx.conf" -fi - -grepc=$(grep -c 'zone=wfone:1m' /etc/nginx/nginx.conf) -if [ "$grepc" -eq 0 ]; then - sed -i 's| zone=addr:1m;| zone=addr:1m;\n limit_req_zone $scheme zone=wfone:1m rate=1r/s;|g' /etc/nginx/nginx.conf - echo "=== Added rate_limit 'wfone' to nginx.conf" -fi - -grepc=$(grep -c 'zone=one:10m' /etc/nginx/nginx.conf) -if [ "$grepc" -eq 1 ]; then - sed -i 's|zone=one:10m|zone=one:1m|g' /etc/nginx/nginx.conf - echo "=== Decrease one zone to 1mb to nginx.conf" -fi - -grepc=$(grep -c 'zone=two' /etc/nginx/nginx.conf) -if [ "$grepc" -eq 0 ]; then - sed -i 's|zone=one:1m rate=1r/s;|zone=one:1m rate=1r/s;\n limit_req_zone $binary_remote_addr zone=two:1m rate=2r/s;|g' /etc/nginx/nginx.conf - echo "=== Added rate_limit for 2 req/sec to nginx.conf" -fi - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall.tpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall.stpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall.tpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall.stpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall.stpl - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-burst-2.tpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-burst-2.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-burst-2.stpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-burst-2.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-burst-2.tpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-burst-2.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-burst-2.stpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-burst-2.stpl - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-burst-2-speed-2.tpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-burst-2-speed-2.stpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-burst-2-speed-2.tpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-burst-2-speed-2.stpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2.stpl - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-burst-2-speed-2-conn-4.tpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-burst-2-speed-2-conn-4.stpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-burst-2-speed-2-conn-4.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-burst-2-speed-2-conn-4.tpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-burst-2-speed-2-conn-4.stpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-burst-2-speed-2-conn-4.stpl - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-wordpress.tpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-wordpress.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-wordpress.stpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-wordpress.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-wordpress.tpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-wordpress.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-wordpress.stpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-wordpress.stpl - -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-wordpress-2.tpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-wordpress-2.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/force-https-firewall-wordpress-2.stpl http://c.myvestacp.com/tools/rate-limit-tpl/force-https-firewall-wordpress-2.stpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-wordpress-2.tpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-wordpress-2.tpl -wget -nv -O /usr/local/vesta/data/templates/web/nginx/hosting-firewall-wordpress-2.stpl http://c.myvestacp.com/tools/rate-limit-tpl/hosting-firewall-wordpress-2.stpl - -systemctl restart nginx diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.stpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.stpl deleted file mode 100644 index 58f1e9fa..00000000 --- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.stpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - root %sdocroot%; - # Rocket-Nginx configuration - include rocket-nginx/conf.d/default.conf; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl deleted file mode 100644 index d4eaeed8..00000000 --- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.stpl +++ /dev/null @@ -1,42 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - root %sdocroot%; - # Rocket-Nginx configuration - include rocket-nginx/conf.d/default.conf; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/snginx.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl deleted file mode 100644 index 3b162038..00000000 --- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-hosting.tpl +++ /dev/null @@ -1,39 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - root %docroot%; - # Rocket-Nginx configuration - include rocket-nginx/conf.d/default.conf; - - location / { - proxy_pass http://%ip%:%web_port%; - location ~* ^.+\.(%proxy_extentions%)$ { - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - expires max; - # try_files $uri @fallback; - } - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/nginx.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-webp-express-force-https.stpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-webp-express-force-https.stpl deleted file mode 100644 index 2a6a7671..00000000 --- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-webp-express-force-https.stpl +++ /dev/null @@ -1,73 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl http2; - server_name %domain_idn% %alias_idn%; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - root %sdocroot%; - - # Serve WebP if browser supports it - location ~* ^/wp-content/.*\.(png|jpe?g)$ { - add_header Vary Accept; - expires 365d; - - if ($http_accept !~* "webp") { - break; - } - - try_files - /wp-content/webp-express/webp-images/doc-root/$uri.webp - $uri.webp - @webp_on_demand; - } - - # Route .webp requests to converter if not found - location @webp_on_demand { - proxy_pass https://%ip%:%web_ssl_port%; - } - - # Allow .webp passthrough (trigger php fallback if not found) - location ~* ^/wp-content/.*\.(png|jpe?g)\.webp$ { - try_files - $uri - @webp_realizer; - } - - location @webp_realizer { - proxy_pass https://%ip%:%web_ssl_port%; - } - - # Allow PHP access to WebP Express WOD handler - location ~ ^/wp-content/plugins/webp-express/wod/.*\.php$ { - proxy_pass https://%ip%:%web_ssl_port%; - } - - # Rocket-Nginx configuration - include rocket-nginx/conf.d/default.conf; - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location ~ /\.ht {return 404;} - location ~ /\.env {return 404;} - location ~ /\.svn/ {return 404;} - location ~ /\.git/ {return 404;} - location ~ /\.hg/ {return 404;} - location ~ /\.bzr/ {return 404;} - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; - include %home%/%user%/conf/web/s%proxy_system%.%domain%.conf*; -} diff --git a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-webp-express-force-https.tpl b/src/deb/for-download/tools/rocket-nginx-templates/wprocket-webp-express-force-https.tpl deleted file mode 100644 index 5a463370..00000000 --- a/src/deb/for-download/tools/rocket-nginx-templates/wprocket-webp-express-force-https.tpl +++ /dev/null @@ -1,8 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - location / { - rewrite ^(.*) https://$host$1 permanent; - } -include %home%/%user%/conf/web/*nginx.%domain_idn%.conf_letsencrypt; -} diff --git a/src/deb/for-download/tools/roundcube-filters.tgz b/src/deb/for-download/tools/roundcube-filters.tgz deleted file mode 100644 index c7c49690..00000000 Binary files a/src/deb/for-download/tools/roundcube-filters.tgz and /dev/null differ diff --git a/src/deb/for-download/tools/scanps/scanps.php b/src/deb/for-download/tools/scanps/scanps.php deleted file mode 100644 index d2dbd2b3..00000000 --- a/src/deb/for-download/tools/scanps/scanps.php +++ /dev/null @@ -1,60 +0,0 @@ - /dev/null 2>&1 - -function my_exec($command) { - $out=array(); - $ret_no=0; - if (strpos($command, " > ")!==FALSE) $command.=" 2> /dev/null"; - else { - if (strpos($command, " 2>&1")===FALSE) $command.=" 2>&1"; - } - $ret = exec($command, $out, $ret_no); - return implode("\n", $out); -} - -function is_there($list, $what) { - $arr=explode("\n", $list); - $c=count($arr); - for ($i=1; $i<$c; $i++) if (strpos($arr[$i], $what)!==false) return true; - return false; -} - -$list=my_exec("ps -Af"); -if (is_there($list, "apt")) exit; // the server is in upgrading proccess - -$search_for1="mysqld"; -$search_for2="mariadbd"; -$v1=is_there($list, $search_for1); -$v2=is_there($list, $search_for2); -$sufix=""; - -if ($v1==false && $v2==false) { - echo "- reboot\n"; - $buffer="- reboot\n".$list; - $sufix="_".time(); - $fp = fopen('/var/log/scanps_cron'.$sufix.'.log', 'w'); - fwrite($fp, $buffer); - fclose($fp); - $out=array(); - $ret_no=0; - $uname_arr=posix_uname(); - $hostname=$uname_arr['nodename']; - $email=my_exec("export VESTA=/usr/local/vesta && /usr/local/vesta/bin/v-list-user 'admin' | grep 'EMAIL' | awk '{print $2}'"); - mail($email, 'VPS reboot - '.$hostname, $buffer, "From: ".$hostname." "); - sleep(10); - $ret = exec("sudo reboot", $out, $ret_no); - exit; -} else { - echo "- mysql ok\n"; - $fp = fopen('/var/log/scanps_cron.log', 'w'); - fwrite($fp, "- mysql ok"); - fclose($fp); - exit; -} diff --git a/src/deb/for-download/tools/scanps/scanps.sh b/src/deb/for-download/tools/scanps/scanps.sh deleted file mode 100644 index b693d21a..00000000 --- a/src/deb/for-download/tools/scanps/scanps.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# run 'crontab -e' and add the following: -# */5 * * * * /home/scanps.sh > /dev/null 2>&1 - -cd /home -php scanps.php \ No newline at end of file diff --git a/src/deb/for-download/tools/spamassassin/barracuda.cf b/src/deb/for-download/tools/spamassassin/barracuda.cf deleted file mode 100644 index 4d5aa0c4..00000000 --- a/src/deb/for-download/tools/spamassassin/barracuda.cf +++ /dev/null @@ -1,9 +0,0 @@ -header IN_BCUDA_RBL rbleval:check_rbl('bcuda', 'b.barracudacentral.org') -describe IN_BCUDA_RBL Received via a relay listed by Barracuda BRBL -tflags IN_BCUDA_RBL net -score RCVD_IN_BCUDA_RBL 1.00 - -header RCVD_IN_BCUDA_RELAY rbleval:check_rbl_sub('bcuda', '127.0.0.2') -describe RCVD_IN_BCUDA_RELAY BCUDA: relay ip is convicted spammer -tflags RCVD_IN_BCUDA_RELAY net -score RCVD_IN_BCUDA_RELAY 4.00 diff --git a/src/deb/ioncube/control b/src/deb/ioncube/control index e8dcc311..34daf4aa 100644 --- a/src/deb/ioncube/control +++ b/src/deb/ioncube/control @@ -1,7 +1,7 @@ Source: vesta-ioncube Package: vesta-ioncube Priority: optional -Version: 0.9.8-26 +Version: 0.9.8-18 Section: admin Maintainer: Serghey Rodin Homepage: https://www.ioncube.com diff --git a/src/deb/ioncube/copyright b/src/deb/ioncube/copyright index c62257d2..bd92bd81 100644 --- a/src/deb/ioncube/copyright +++ b/src/deb/ioncube/copyright @@ -1,243 +1,243 @@ -LICENCE AGREEMENT FOR THE IONCUBE PHP LOADER, PROVIDED TO ENABLE THE USE -OF IONCUBE ENCODED FILES AND AS PART OF THE IONCUBE24 SERVICE (ioncube24.com) - -YOU SHOULD CAREFULLY READ THE FOLLOWING TERMS AND CONDITIONS BEFORE USING THE -LOADER SOFTWARE. THE INSTALLATION AND/OR USE OR COPYING OF THE IONCUBE PHP -LOADER SOFTWARE INDICATES YOUR ACCEPTANCE OF THIS LICENCE AGREEMENT. IF YOU -DO NOT ACCEPT THE TERMS OF THIS LICENCE AGREEMENT, DO NOT INSTALL, COPY -AND/OR USE THE LOADER SOFTWARE. - -DEFINITIONS - -The following definitions shall apply in this document: - -LOADER shall mean the ionCube PHP Loader software package or collection -of Loaders, including any modifications or upgrades to the software, used for -executing PHP scripts previously encoded with the ionCube PHP Encoder -software to render them non-humanly readable, and any associated -documentation or electronic or online materials relating to the software. - -ENCODER shall mean any ionCube PHP Encoder software or service used for the -purpose of producing non-humanly readable encoded files from PHP scripts. - -ENCODED FILE shall mean a non-humanly readable file produced by the -Encoder and being derived from humanly readable PHP script source. - -PROVIDER shall mean ionCube Ltd. - -USER/YOU shall mean any entity who has downloaded or obtained through any -other means a version of the Loader software. - - -1 LICENSE ENTITLEMENT - -1.1 The Loader is provided without charge. Title to the Loader does not pass -to the user in any circumstances. The Loader is supplied as object code. - -1.2 The provider grants a personal, non-transferable, non-exclusive licence to -use the Loader in accordance with the terms and conditions of this Licence -Agreement. - -1.3 The installation or downloading and use of the Loader entitles the user -to install and use the Loader for its own internal lawful purposes. - - -2 DISTRIBUTION - -2.1 The Loader may be freely distributed to third parties alone or as -part of a distribution containing other items provided that this license -is also included. - -2.2 The Loader may under no circumstances be branded as another product, -whether distributed or not. - -2.3 Distribution as part of a commercial product is permitted provided such -distribution is in accordance with clauses 2.1 and 2.2 with respect to the -Loader. - - -3 ANALYSIS / REVERSE ENGINEERING / MODIFICATION - -Except insofar as the user is permitted to do so in accordance with applicable -law: - -3.1 Any analysis of the Loader and embedded data by any means and by -any entity whether human or otherwise and including but without limitation to -discover details of internal operation, to reverse engineer, to de-compile -object code, or to modify for the purposes of modifying behaviour is -forbidden. - -3.2 Any analysis of encoded files by any means and by any entity whether human -or otherwise and including but without limitation to discover details of file -format or for the purposes of modifying behaviour or scope of their usage is -forbidden. - - -4 WARRANTY - -THE LOADER SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED -WARRANTIES INCLUDING BUT WITHOUT LIMITATION THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR ANY PARTICULAR PURPOSE ARE -DISCLAIMED. THE PROVIDER DOES NOT WARRANT THAT THE LOADER IS UNINTERRUPTED -OR ERROR FREE, NOR THAT THE OPERATION OF THE LOADER WILL FUNCTION IN -CONJUNCTION WITH ANY OTHER PRODUCT. - - -5 LIMITATION OF LIABILITY - -5.1 IN NO EVENT WILL THE PROVIDER OF THE LOADER BE LIABLE TO THE USER OR ANY -PARTY FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR OTHER -CONSEQUENTIAL DAMAGES ARISING DIRECTLY OR INDIRECTLY FROM THIS LICENCE -AGREEMENT OR ANY USE OF THE LOADER OR ENCODED FILES, EVEN IF THE PROVIDER IS -EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -5.2 THE LOADER IS PROVIDED ON AN "AS IS" BASIS. THE PROVIDER EXCLUDES ALL -WARRANTIES, CONDITIONS, TERMS, UNDERTAKINGS AND REPRESENTATIONS (EXCLUDING -FRAUDULENT MISREPRESENTATION) OF ANY KIND, EXPRESS OR IMPLIED, STATUTORY OR -OTHERWISE IN CONNECTION WITH THE LOADER TO THE FULLEST EXTENT PERMITTED BY -LAW. - -5.3 DOWNLOADING THE LOADER IS AT YOUR OWN RISK AND THE PROVIDER DOES NOT -ACCEPT LIABILITY FOR ANY DIRECT OR INDIRECT LOSS OR DAMAGE HOWSOEVER CAUSED AS -A RESULT OF ANY COMPUTER VIRUSES, BUGS, TROJAN HORSES, WORMS, SOFTWARE BOMBS -OR OTHER SIMILAR PROGRAMS ARISING FROM YOUR USE OF THE LOADER. WHILST THE -PROVIDER WILL DO ITS BEST TO ENSURE THAT THE LOADER IS FREE FROM SUCH -DESTRUCTIVE PROGRAMS, IT IS YOUR RESPONSIBILITY TO TAKE REASONABLE PRECAUTIONS -TO SCAN FOR SUCH DESTRUCTIVE PROGRAMS DOWNLOADED FROM THE INTERNET. - -5.4 THE PROVIDER'S MAXIMUM LIABILITY FOR ANY LOSS OR DAMAGE ARISING FROM THIS -LICENCE AGREEMENT SHALL IN ANY EVENT BE LIMITED IN THE SOLE DISCRETION OF THE -PROVIDER TO THE REPLACEMENT OF THE LOADER PRODUCT. - -5.5 DUE TO THE NATURE OF THE INTERNET, THE PROVIDER CANNOT GUARANTEE THAT ANY -E-MAILS OR OTHER ELECTRONIC TRANSMISSIONS WILL BE SENT TO YOU OR RECEIVED BY -THE PROVIDER OR THAT THE CONTENT OF SUCH TRANSMISSIONS WILL BE SECURE DURING -TRANSMISSION. - - -6 BUG FIXING AND PRODUCT SUPPORT - -6.1 The provider will use reasonable endeavours to provide support to users. -The provider will at their discretion only provide support for the latest -release. - -6.2 Support comprises of fault reporting via tickets and fault diagnosis, -recommendations on workarounds, and where reasonably possible a timely -resolution. - -6.3 The user accepts that on occasion the ability of the provider to meet -anticipated or published support schedules may be impaired due to, but without -limitation, Internet service provider failures or software failures that -affect the ability to communicate for an indeterminate period. - -6.4 The provider reserves the right to refuse to provide support at any time. - -6.5 The provider wishes to maintain and offer a product of the highest -possible quality, and accordingly may from time to time and at its discretion -make product changes for the purpose of correcting behaviour in variance to -the published specification or the user's reasonable expectations. - -6.6 The provider reserves the right to charge for support where the user does -not have a valid support plan in place, or where the support offered exceeds -the scope of the active support plan. - - -7 PRODUCT UPGRADES - -7.1 The provider may from time to time release product upgrades. These will -be provided free of charge and attempts made to provide a timely notification -to customers of the existence of any new release. - - -8 ERRORS AND OMISSIONS - -Whilst reasonable endeavours are made to ensure the accuracy of documentation -concerning the details of the Loader, the user accepts the possibility of -inaccuracies in information presented in any format, including email -communications and online services. The provider shall under no circumstances -be liable for any events that arise as a result of unintentional inaccuracies -or omissions. - - -9 USER INDEMNITY - -You agree to fully indemnify, defend and hold the provider harmless -immediately upon demand from and against all actions, liability, claims, -losses, damages, costs and expenses (including legal/attorney fees) incurred -by the provider arising directly or indirectly as a result of your breach of -this Licence Agreement. - - -10 INTELLECTUAL PROPERTY RIGHTS - -10.1 The user acknowledges that the Loader and associated documentation and -materials contain proprietary information of the provider and are and shall -remain the exclusive property of the provider and/or its licensors and all -title, copyright, trade marks, trade names, patents and other intellectual -property rights therein of whatever nature shall remain the sole property of -the provider and/or its licensors. - -10.2 No title to or rights of ownership, copyright or other intellectual -property in the Loader is transferred to the user (other than the licence -rights expressly granted in this Licence Agreement). - - -11 TERMINATION - -11.1 The provider reserves the right to terminate this Licence Agreement -immediately by notice in writing against the user if the user is in breach of -any terms and conditions of this Licence Agreement. - -11.2 Termination of this Licence Agreement for any reason shall be without -prejudice to any other rights or remedies of the provider which may have -arisen on or before the date of termination under this Licence Agreement or in -law. - -11.3 The provisions of the following clauses shall survive any termination of -this agreement; clause 3, 5, 10 and 13. - - -12 GENERAL - -12.1 The provider reserves the right to transfer or assign all or any of its -rights and duties and responsibilities set out in this Licence Agreement to -another party. - -12.2 Headings have been included for convenience only and will not be used in -construing any provision of this Licence Agreement. - -12.3 No delay or failure by the provider to exercise any powers, rights or -remedies under this Licence Agreement will operate as a waiver of them nor -will any single or partial exercise of any such powers, rights or remedies -include any other or further exercise of them. - -12.4 If any part of this Licence Agreement is found by a court of competent -jurisdiction or other competent authority to be invalid, unlawful or -unenforceable then such part shall be severed from the remainder of this -Licence Agreement which will continue to be valid and enforceable to the -fullest extent permitted by applicable law. - -12.5 This Licence Agreement including the documents or other sources referred -to herein supersede all prior representations, understandings and agreements -between the user and the provider relating to the Loader and sets forth the -entire agreement and understanding between the user and the provider relating -to the Loader. - -12.6 Nothing in this Licence Agreement shall be deemed to constitute a -partnership between you and the provider nor constitute either party being an -agent of the other party. - -12.7 This Agreement does not create any rights or benefits enforceable by any -person not a party to it (within the meaning of the U.K.Contracts (Rights of -Third Parties) Act 1999) except that a person who under clause 12.1 is a -permitted successor or assignee of the rights or benefits of the provider may -enforce such rights or benefits. - - -13 GOVERNING LAW AND JURISDICTION - -This License Agreement and any issues relating thereto shall be construed and -interpreted in accordance with the laws of England and subject to the -exclusive jurisdiction of the English courts. - -Copyright (c) 2002-2017 ionCube Ltd. Last revised 23-April-2015 +LICENCE AGREEMENT FOR THE IONCUBE PHP LOADER, PROVIDED TO ENABLE THE USE +OF IONCUBE ENCODED FILES AND AS PART OF THE IONCUBE24 SERVICE (ioncube24.com) + +YOU SHOULD CAREFULLY READ THE FOLLOWING TERMS AND CONDITIONS BEFORE USING THE +LOADER SOFTWARE. THE INSTALLATION AND/OR USE OR COPYING OF THE IONCUBE PHP +LOADER SOFTWARE INDICATES YOUR ACCEPTANCE OF THIS LICENCE AGREEMENT. IF YOU +DO NOT ACCEPT THE TERMS OF THIS LICENCE AGREEMENT, DO NOT INSTALL, COPY +AND/OR USE THE LOADER SOFTWARE. + +DEFINITIONS + +The following definitions shall apply in this document: + +LOADER shall mean the ionCube PHP Loader software package or collection +of Loaders, including any modifications or upgrades to the software, used for +executing PHP scripts previously encoded with the ionCube PHP Encoder +software to render them non-humanly readable, and any associated +documentation or electronic or online materials relating to the software. + +ENCODER shall mean any ionCube PHP Encoder software or service used for the +purpose of producing non-humanly readable encoded files from PHP scripts. + +ENCODED FILE shall mean a non-humanly readable file produced by the +Encoder and being derived from humanly readable PHP script source. + +PROVIDER shall mean ionCube Ltd. + +USER/YOU shall mean any entity who has downloaded or obtained through any +other means a version of the Loader software. + + +1 LICENSE ENTITLEMENT + +1.1 The Loader is provided without charge. Title to the Loader does not pass +to the user in any circumstances. The Loader is supplied as object code. + +1.2 The provider grants a personal, non-transferable, non-exclusive licence to +use the Loader in accordance with the terms and conditions of this Licence +Agreement. + +1.3 The installation or downloading and use of the Loader entitles the user +to install and use the Loader for its own internal lawful purposes. + + +2 DISTRIBUTION + +2.1 The Loader may be freely distributed to third parties alone or as +part of a distribution containing other items provided that this license +is also included. + +2.2 The Loader may under no circumstances be branded as another product, +whether distributed or not. + +2.3 Distribution as part of a commercial product is permitted provided such +distribution is in accordance with clauses 2.1 and 2.2 with respect to the +Loader. + + +3 ANALYSIS / REVERSE ENGINEERING / MODIFICATION + +Except insofar as the user is permitted to do so in accordance with applicable +law: + +3.1 Any analysis of the Loader and embedded data by any means and by +any entity whether human or otherwise and including but without limitation to +discover details of internal operation, to reverse engineer, to de-compile +object code, or to modify for the purposes of modifying behaviour is +forbidden. + +3.2 Any analysis of encoded files by any means and by any entity whether human +or otherwise and including but without limitation to discover details of file +format or for the purposes of modifying behaviour or scope of their usage is +forbidden. + + +4 WARRANTY + +THE LOADER SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED +WARRANTIES INCLUDING BUT WITHOUT LIMITATION THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR ANY PARTICULAR PURPOSE ARE +DISCLAIMED. THE PROVIDER DOES NOT WARRANT THAT THE LOADER IS UNINTERRUPTED +OR ERROR FREE, NOR THAT THE OPERATION OF THE LOADER WILL FUNCTION IN +CONJUNCTION WITH ANY OTHER PRODUCT. + + +5 LIMITATION OF LIABILITY + +5.1 IN NO EVENT WILL THE PROVIDER OF THE LOADER BE LIABLE TO THE USER OR ANY +PARTY FOR ANY DIRECT, INDIRECT, PUNITIVE, SPECIAL, INCIDENTAL OR OTHER +CONSEQUENTIAL DAMAGES ARISING DIRECTLY OR INDIRECTLY FROM THIS LICENCE +AGREEMENT OR ANY USE OF THE LOADER OR ENCODED FILES, EVEN IF THE PROVIDER IS +EXPRESSLY ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +5.2 THE LOADER IS PROVIDED ON AN "AS IS" BASIS. THE PROVIDER EXCLUDES ALL +WARRANTIES, CONDITIONS, TERMS, UNDERTAKINGS AND REPRESENTATIONS (EXCLUDING +FRAUDULENT MISREPRESENTATION) OF ANY KIND, EXPRESS OR IMPLIED, STATUTORY OR +OTHERWISE IN CONNECTION WITH THE LOADER TO THE FULLEST EXTENT PERMITTED BY +LAW. + +5.3 DOWNLOADING THE LOADER IS AT YOUR OWN RISK AND THE PROVIDER DOES NOT +ACCEPT LIABILITY FOR ANY DIRECT OR INDIRECT LOSS OR DAMAGE HOWSOEVER CAUSED AS +A RESULT OF ANY COMPUTER VIRUSES, BUGS, TROJAN HORSES, WORMS, SOFTWARE BOMBS +OR OTHER SIMILAR PROGRAMS ARISING FROM YOUR USE OF THE LOADER. WHILST THE +PROVIDER WILL DO ITS BEST TO ENSURE THAT THE LOADER IS FREE FROM SUCH +DESTRUCTIVE PROGRAMS, IT IS YOUR RESPONSIBILITY TO TAKE REASONABLE PRECAUTIONS +TO SCAN FOR SUCH DESTRUCTIVE PROGRAMS DOWNLOADED FROM THE INTERNET. + +5.4 THE PROVIDER'S MAXIMUM LIABILITY FOR ANY LOSS OR DAMAGE ARISING FROM THIS +LICENCE AGREEMENT SHALL IN ANY EVENT BE LIMITED IN THE SOLE DISCRETION OF THE +PROVIDER TO THE REPLACEMENT OF THE LOADER PRODUCT. + +5.5 DUE TO THE NATURE OF THE INTERNET, THE PROVIDER CANNOT GUARANTEE THAT ANY +E-MAILS OR OTHER ELECTRONIC TRANSMISSIONS WILL BE SENT TO YOU OR RECEIVED BY +THE PROVIDER OR THAT THE CONTENT OF SUCH TRANSMISSIONS WILL BE SECURE DURING +TRANSMISSION. + + +6 BUG FIXING AND PRODUCT SUPPORT + +6.1 The provider will use reasonable endeavours to provide support to users. +The provider will at their discretion only provide support for the latest +release. + +6.2 Support comprises of fault reporting via tickets and fault diagnosis, +recommendations on workarounds, and where reasonably possible a timely +resolution. + +6.3 The user accepts that on occasion the ability of the provider to meet +anticipated or published support schedules may be impaired due to, but without +limitation, Internet service provider failures or software failures that +affect the ability to communicate for an indeterminate period. + +6.4 The provider reserves the right to refuse to provide support at any time. + +6.5 The provider wishes to maintain and offer a product of the highest +possible quality, and accordingly may from time to time and at its discretion +make product changes for the purpose of correcting behaviour in variance to +the published specification or the user's reasonable expectations. + +6.6 The provider reserves the right to charge for support where the user does +not have a valid support plan in place, or where the support offered exceeds +the scope of the active support plan. + + +7 PRODUCT UPGRADES + +7.1 The provider may from time to time release product upgrades. These will +be provided free of charge and attempts made to provide a timely notification +to customers of the existence of any new release. + + +8 ERRORS AND OMISSIONS + +Whilst reasonable endeavours are made to ensure the accuracy of documentation +concerning the details of the Loader, the user accepts the possibility of +inaccuracies in information presented in any format, including email +communications and online services. The provider shall under no circumstances +be liable for any events that arise as a result of unintentional inaccuracies +or omissions. + + +9 USER INDEMNITY + +You agree to fully indemnify, defend and hold the provider harmless +immediately upon demand from and against all actions, liability, claims, +losses, damages, costs and expenses (including legal/attorney fees) incurred +by the provider arising directly or indirectly as a result of your breach of +this Licence Agreement. + + +10 INTELLECTUAL PROPERTY RIGHTS + +10.1 The user acknowledges that the Loader and associated documentation and +materials contain proprietary information of the provider and are and shall +remain the exclusive property of the provider and/or its licensors and all +title, copyright, trade marks, trade names, patents and other intellectual +property rights therein of whatever nature shall remain the sole property of +the provider and/or its licensors. + +10.2 No title to or rights of ownership, copyright or other intellectual +property in the Loader is transferred to the user (other than the licence +rights expressly granted in this Licence Agreement). + + +11 TERMINATION + +11.1 The provider reserves the right to terminate this Licence Agreement +immediately by notice in writing against the user if the user is in breach of +any terms and conditions of this Licence Agreement. + +11.2 Termination of this Licence Agreement for any reason shall be without +prejudice to any other rights or remedies of the provider which may have +arisen on or before the date of termination under this Licence Agreement or in +law. + +11.3 The provisions of the following clauses shall survive any termination of +this agreement; clause 3, 5, 10 and 13. + + +12 GENERAL + +12.1 The provider reserves the right to transfer or assign all or any of its +rights and duties and responsibilities set out in this Licence Agreement to +another party. + +12.2 Headings have been included for convenience only and will not be used in +construing any provision of this Licence Agreement. + +12.3 No delay or failure by the provider to exercise any powers, rights or +remedies under this Licence Agreement will operate as a waiver of them nor +will any single or partial exercise of any such powers, rights or remedies +include any other or further exercise of them. + +12.4 If any part of this Licence Agreement is found by a court of competent +jurisdiction or other competent authority to be invalid, unlawful or +unenforceable then such part shall be severed from the remainder of this +Licence Agreement which will continue to be valid and enforceable to the +fullest extent permitted by applicable law. + +12.5 This Licence Agreement including the documents or other sources referred +to herein supersede all prior representations, understandings and agreements +between the user and the provider relating to the Loader and sets forth the +entire agreement and understanding between the user and the provider relating +to the Loader. + +12.6 Nothing in this Licence Agreement shall be deemed to constitute a +partnership between you and the provider nor constitute either party being an +agent of the other party. + +12.7 This Agreement does not create any rights or benefits enforceable by any +person not a party to it (within the meaning of the U.K.Contracts (Rights of +Third Parties) Act 1999) except that a person who under clause 12.1 is a +permitted successor or assignee of the rights or benefits of the provider may +enforce such rights or benefits. + + +13 GOVERNING LAW AND JURISDICTION + +This License Agreement and any issues relating thereto shall be construed and +interpreted in accordance with the laws of England and subject to the +exclusive jurisdiction of the English courts. + +Copyright (c) 2002-2017 ionCube Ltd. Last revised 23-April-2015 diff --git a/src/deb/latest.txt b/src/deb/latest.txt deleted file mode 100644 index dcb1761c..00000000 --- a/src/deb/latest.txt +++ /dev/null @@ -1 +0,0 @@ -vesta-0.9.9-0-13 \ No newline at end of file diff --git a/src/deb/nginx/control b/src/deb/nginx/control index 86ae383a..841161e7 100644 --- a/src/deb/nginx/control +++ b/src/deb/nginx/control @@ -1,14 +1,14 @@ Source: vesta-nginx Package: vesta-nginx Priority: optional -Version: 0.9.8-26-44 +Version: 0.9.8-18 Section: admin -Maintainer: myVesta -Homepage: https://www.myvestacp.com +Maintainer: Serghey Rodin +Homepage: http://vestacp.com Architecture: amd64 Depends: vesta Description: Vesta Nginx Vesta is an open source hosting control panel. Vesta has a clean and focused interface without the clutter. Vesta has the latest of very innovative technologies. - MyVesta is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin + diff --git a/src/deb/nginx/copyright b/src/deb/nginx/copyright deleted file mode 100644 index d6604bdf..00000000 --- a/src/deb/nginx/copyright +++ /dev/null @@ -1,30 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: vesta-nginx -Source: https://www.myvestacp.com - -Files: * -Copyright: 2021 myVesta -License: GPL-3.0+ -Remarks: MyVesta is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin - -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in /usr/share/common-licenses/GPL-3. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/src/deb/nginx/postinst b/src/deb/nginx/postinst index a5733266..82b7c290 100755 --- a/src/deb/nginx/postinst +++ b/src/deb/nginx/postinst @@ -9,12 +9,3 @@ fi # Touch and set permisions on default log files on installation update-rc.d vesta defaults >/dev/null invoke-rc.d vesta start || true - -# Run triggers only on updates -if [ ! -e "/usr/local/vesta/data/users/admin" ]; then - exit -fi - -echo "=== Restarting vesta ===" -service vesta stop -service vesta start diff --git a/src/deb/for-download/nginx/vesta b/src/deb/nginx/vesta old mode 100644 new mode 100755 similarity index 100% rename from src/deb/for-download/nginx/vesta rename to src/deb/nginx/vesta diff --git a/src/deb/php/control b/src/deb/php/control index d4298780..fd5a660c 100644 --- a/src/deb/php/control +++ b/src/deb/php/control @@ -1,14 +1,14 @@ Source: vesta-php Package: vesta-php Priority: optional -Version: 0.9.8-26 +Version: 0.9.8-18 Section: admin -Maintainer: myVesta -Homepage: https://www.myvestacp.com +Maintainer: Serghey Rodin +Homepage: http://vestacp.com Architecture: amd64 Depends: vesta Description: Vesta php-fpm Vesta is an open source hosting control panel. Vesta has a clean and focused interface without the clutter. Vesta has the latest of very innovative technologies. - MyVesta is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin + diff --git a/src/deb/php/copyright b/src/deb/php/copyright deleted file mode 100644 index 65ee43e2..00000000 --- a/src/deb/php/copyright +++ /dev/null @@ -1,30 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: vesta-php -Source: https://www.myvestacp.com - -Files: * -Copyright: 2021 myVesta -License: GPL-3.0+ -Remarks: MyVesta is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin - -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in /usr/share/common-licenses/GPL-3. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid to pick license terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/src/deb/php/postinst b/src/deb/php/postinst index 212f2328..c9b3b1d2 100755 --- a/src/deb/php/postinst +++ b/src/deb/php/postinst @@ -1,8 +1,8 @@ #!/bin/bash # Run triggers only on updates -# if [ -e /usr/local/vesta/ioncube/ioncube.sh ]; then -# /usr/local/vesta/ioncube/ioncube.sh add -# fi +if [ -e /usr/local/vesta/ioncube/ioncube.sh ]; then + /usr/local/vesta/ioncube/ioncube.sh add +fi exit 0 diff --git a/src/deb/softaculous/control b/src/deb/softaculous/control index 121cebed..a51d87be 100644 --- a/src/deb/softaculous/control +++ b/src/deb/softaculous/control @@ -1,7 +1,7 @@ Source: vesta-softaculous Package: vesta-softaculous Priority: optional -Version: 0.9.8-26 +Version: 0.9.8-18 Section: admin Maintainer: Serghey Rodin Homepage: https://www.softaculous.com diff --git a/src/deb/vesta/conffiles b/src/deb/vesta/conffiles index 78913555..a4af675a 100644 --- a/src/deb/vesta/conffiles +++ b/src/deb/vesta/conffiles @@ -1 +1,9 @@ -/usr/local/vesta/conf/vesta.conf +/usr/local/vesta/web/images/sprite.png +/usr/local/vesta/web/images/favicon.ico +/usr/local/vesta/web/css/file_manager.css +/usr/local/vesta/web/css/file_manager_editor.css +/usr/local/vesta/web/css/jquery.arcticmodal.css +/usr/local/vesta/web/css/jquery-custom-dialogs.css +/usr/local/vesta/web/css/jquery.fileupload.css +/usr/local/vesta/web/css/styles.min.css +/usr/local/vesta/web/css/uploadify.css diff --git a/src/deb/vesta/control b/src/deb/vesta/control index 534e200a..7d395433 100644 --- a/src/deb/vesta/control +++ b/src/deb/vesta/control @@ -1,14 +1,13 @@ Source: vesta Package: vesta Priority: optional -Version: 0.9.8-26 +Version: 0.9.8-18 Section: admin -Maintainer: myVesta -Homepage: https://www.myvestacp.com +Maintainer: Serghey Rodin +Homepage: http://vestacp.com Architecture: amd64 Depends: bash, awk, sed Description: Vesta Vesta is an open source hosting control panel. Vesta has a clean and focused interface without the clutter. Vesta has the latest of very innovative technologies. - MyVesta is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin diff --git a/src/deb/vesta/copyright b/src/deb/vesta/copyright index 8930fb15..4adbe88e 100644 --- a/src/deb/vesta/copyright +++ b/src/deb/vesta/copyright @@ -1,11 +1,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: vesta -Source: https://www.myvestacp.com +Source: http://vestacp.com Files: * -Copyright: 2021 myVesta +Copyright: 2013 Serghey Rodin License: GPL-3.0+ -Remarks: MyVesta is a fork from VestaCP, special thanks to vestacp.com and Serghey Rodin License: GPL-3.0+ This program is free software: you can redistribute it and/or modify @@ -28,3 +27,4 @@ License: GPL-3.0+ # different copyright/license attached and list them here. # Please avoid to pick license terms that are more restrictive than the # packaged work, as it may make Debian's contributions unacceptable upstream. + diff --git a/src/deb/vesta/postinst b/src/deb/vesta/postinst index 186f54d5..2c539b1d 100755 --- a/src/deb/vesta/postinst +++ b/src/deb/vesta/postinst @@ -1,525 +1,27 @@ #!/bin/bash -build_date=$(curl -s http://c.myvestacp.com/build_date.txt) -echo "$build_date" > /usr/local/vesta/build_date.txt - -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - # Run triggers only on updates if [ ! -e "/usr/local/vesta/data/users/admin" ]; then - version=$(curl -s http://c.myvestacp.com/latest.txt?installed) - version=${version:6} - echo "=== myVesta $version installed ===" - echo "=== myVesta build date: $build_date" - echo "$version" > /usr/local/vesta/version.txt exit fi -/usr/local/vesta/bin/v-ensure-poold-folders-not-empty - -if [ ! -d "/usr/local/vesta/data/upgrades" ]; then - mkdir -p /usr/local/vesta/data/upgrades +# Run SUDO trigger +if [ -x "/usr/local/vesta/upd/add_sudo.sh" ]; then + /usr/local/vesta/upd/add_sudo.sh fi -VESTA="/usr/local/vesta" - -# show changelog after update -echo "1" > /usr/local/vesta/data/upgrades/show_changelog -chmod a=rw /usr/local/vesta/data/upgrades/show_changelog - -# SSL fix for Apache 2.4.65+ -if [ ! -f "/usr/local/vesta/data/upgrades/fixssl.conf" ]; then - if [ "$release" -ge 11 ]; then - if [ -f "/etc/apache2/apache2.conf" ] && [ -f "/etc/nginx/nginx.conf" ] && [ ! -f "/etc/nginx/conf.d/fixssl.conf" ]; then - echo "== Fixing SSL for Apache 2.4.65+" - echo -e "proxy_ssl_server_name on;\nproxy_ssl_name \$host;\nproxy_ssl_session_reuse off;" > /etc/nginx/conf.d/fixssl.conf - touch /usr/local/vesta/data/upgrades/fixssl.conf - nginx_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'nginx' | grep -c 'running') - if [ $nginx_running -eq 1 ]; then - echo "== Restarting Nginx" - systemctl restart nginx - fi - fi - fi +# Run Notification trigger +if [ -x "/usr/local/vesta/upd/add_notifications.sh" ]; then + /usr/local/vesta/upd/add_notifications.sh fi -# Adding cron job for disk usage snapshot -if [ ! -f "/usr/local/vesta/data/upgrades/v-df-snapshot-make" ]; then - if ! grep -q "v-df-snapshot-make" /usr/local/vesta/data/users/admin/cron.conf; then - echo "== Adding cron job for disk usage snapshot" - command="sudo $VESTA/bin/v-df-snapshot-make" - $VESTA/bin/v-add-cron-job 'admin' '05' '04' '*' '*' '*' "$command" - touch /usr/local/vesta/data/upgrades/v-df-snapshot-make - systemctl restart cron.service - fi - if ! grep -q "v-df-snapshot-logs-cleaner" /usr/local/vesta/data/users/admin/cron.conf; then - echo "== Adding cron job for disk usage snapshot logs cleaner" - command="sudo $VESTA/bin/v-df-snapshot-logs-cleaner" - $VESTA/bin/v-add-cron-job 'admin' '10' '04' '*' '*' '*' "$command" - touch /usr/local/vesta/data/upgrades/v-df-snapshot-make - systemctl restart cron.service - fi +# Run session save path trigger +if [ -x "/usr/local/vesta/upd/fix_sessions.sh" ]; then + /usr/local/vesta/upd/fix_sessions.sh fi -# Fixing PHP and .env permissions and ownership for all websites -if [ ! -f "/usr/local/vesta/data/upgrades/fix-website-permissions-for-all-websites-only-php" ]; then - # Renaming fix-website-permissions-for-all-websites to fix-website-permissions-for-all-websites-only-php" - if grep -q "fix-website-permissions-for-all-websites" /usr/local/vesta/data/users/admin/cron.conf; then - if ! grep -q "fix-website-permissions-for-all-websites-only-php" /usr/local/vesta/data/users/admin/cron.conf; then - echo "== Renaming fix-website-permissions-for-all-websites to fix-website-permissions-for-all-websites-only-php" - sed -i 's|v-fix-website-permissions-for-all-websites > /dev/null 2>&1|v-fix-website-permissions-for-all-websites-only-php|' /usr/local/vesta/data/users/admin/cron.conf - sed -i 's|v-fix-website-permissions-for-all-websites > /dev/null 2>&1|v-fix-website-permissions-for-all-websites-only-php|' /var/spool/cron/crontabs/admin - sed -i 's|v-fix-website-permissions-for-all-websites |v-fix-website-permissions-for-all-websites-only-php |' /usr/local/vesta/data/users/admin/cron.conf - sed -i 's|v-fix-website-permissions-for-all-websites |v-fix-website-permissions-for-all-websites-only-php |' /var/spool/cron/crontabs/admin - systemctl restart cron.service - fi - fi - echo "== Fixing PHP and .env permissions and ownership for all websites" - command="sudo $VESTA/bin/v-fix-website-permissions-for-all-websites-only-php" - $VESTA/bin/v-add-cron-job 'admin' '05' '03' '*' '*' '*' "$command" - touch /usr/local/vesta/data/upgrades/fix-website-permissions-for-all-websites-only-php - systemctl restart cron.service +if [ -e /usr/local/vesta/upd/fix_nginx_auth.sh ]; then + /usr/local/vesta/upd/fix_nginx_auth.sh fi -if ! grep -q "FILEMANAGER_KEY='FREEFM'" /usr/local/vesta/conf/vesta.conf; then - echo "== Adding FileManager license to vesta.conf" - echo "FILEMANAGER_KEY='FREEFM'" >> /usr/local/vesta/conf/vesta.conf -fi - -if [ -f "/root/.bash_profile" ]; then - if ! grep -q "v-cd-www" /root/.bash_profile; then - echo "== Adding v-cd-www alias to root bash profile" - echo "alias v-cd-www='source /usr/local/vesta/bin/v-change-dir-www'" >> /root/.bash_profile - fi -fi - -# Adding myVesta rules to SpamAssassin -if [ -d "/etc/spamassassin" ]; then - spamassassin_modified=0 - if [ ! -f "/etc/spamassassin/myvesta.cf" ]; then - touch /etc/spamassassin/myvesta.cf - fi - if ! grep -q 'RCVD_IN_RP_SAFE' /etc/spamassassin/myvesta.cf; then - echo "== Adding RCVD_IN_RP_ myVesta rules to SpamAssassin" - echo 'score RCVD_IN_RP_SAFE 0' >> /etc/spamassassin/myvesta.cf - echo 'score RCVD_IN_RP_CERTIFIED 0' >> /etc/spamassassin/myvesta.cf - spamassassin_modified=1 - fi - if ! grep -q 'SPF_FAIL' /etc/spamassassin/myvesta.cf; then - echo "== Adding SPF_FAIL myVesta rules to SpamAssassin" - cat <> /etc/spamassassin/myvesta.cf -score SPF_FAIL 3.0 -score SPF_SOFTFAIL 4.0 -score SPF_NONE 4.0 -EOF - spamassassin_modified=1 - fi - - if [ $spamassassin_modified -eq 1 ]; then - spamassassin_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'spamassassin\|spamd' | grep -c 'running') - if [ $spamassassin_running -eq 1 ]; then - echo "== Restarting SpamAssassin" - if [ "$release" -lt 12 ]; then - systemctl restart spamassassin.service - else - systemctl restart spamd.service - fi - fi - fi -fi - -# Adding ProFTPD to Fail2Ban -if [ -f "/etc/fail2ban/jail.local" ] && [ -f "/etc/proftpd/proftpd.conf" ]; then - if ! grep -q 'proftpd' /etc/fail2ban/jail.local; then - echo "== Adding ProFTPD to Fail2Ban" - cat <> /etc/fail2ban/jail.local - -[proftpd] -enabled = true -filter = proftpd -action = vesta[name=FTP] -port = ftp,ftp-data,ftps,ftps-data -logpath = %(proftpd_log)s -backend = %(proftpd_backend)s -maxretry = 5 -EOF - fail2ban_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'fail2ban' | grep -c 'running') - if [ $fail2ban_running -eq 1 ]; then - echo "== Restarting Fail2Ban" - systemctl restart fail2ban - fi - fi -fi - -# Removing SpamHaus DNSBL -if [ ! -f "/usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed" ]; then - sed -i '/zen.spamhaus.org/d' /etc/exim4/dnsbl.conf - touch /usr/local/vesta/data/upgrades/spamhaus_dnsbl_removed -fi - -# Fixing 'dh key too small' in dovecot -if [ -f "/var/log/dovecot.log.1" ] && [ -f "/etc/dovecot/conf.d/10-ssl.conf" ] && [ -f "/usr/share/dovecot/dh.pem" ]; then - if grep -q 'dh key too small' /var/log/dovecot.log.1; then - if ! grep -q 'dh.pem' /etc/dovecot/conf.d/10-ssl.conf; then - echo "== Fixing 'dh key too small' in dovecot" - echo "ssl_dh=> /etc/dovecot/conf.d/10-ssl.conf - systemctl restart dovecot - fi - fi -fi - -# Patching exim4.conf for: smtputf8_advertise_hosts -if [ "$release" -ge 11 ]; then - if [ -f "/etc/exim4/exim4.conf.template" ]; then - if ! grep -q 'smtputf8_advertise_hosts' /etc/exim4/exim4.conf.template; then - echo 'Patching exim4.conf for: smtputf8_advertise_hosts' - sed -i "/^domainlist local_domains/i smtputf8_advertise_hosts =" /etc/exim4/exim4.conf.template - systemctl restart exim4 - fi - fi -fi - -# Patching exim4.conf for: Helo name contains a ip address -if [ -f "/etc/exim4/exim4.conf.template" ]; then - if grep -q 'drop message = Helo name contains a ip address (HELO was $sender_helo_name) and not is valid' /etc/exim4/exim4.conf.template; then - echo 'Patching exim4.conf for: Helo name contains a ip address' - patch /etc/exim4/exim4.conf.template < /usr/local/vesta/src/deb/for-download/tools/patches/exim_helo_authenticated.patch - sed -i '/telenor\.rs/d' /etc/exim4/exim4.conf.template - systemctl restart exim4 - fi -fi - -# Making sure yescrypt is disabled -if [ "$release" -ge 11 ]; then - sed -i "s/yescrypt/sha512/g" /etc/pam.d/common-password -fi - -# Creating /etc/nginx/.htpasswd if it does not exist -if [ ! -f "/etc/nginx/.htpasswd" ]; then - echo 'private:$apr1$0MYnchM5$yVi/OTfp7o3lGNst/a8.90' > /etc/nginx/.htpasswd -fi - -# Fixing Gmail hosts_try_fastopen in Exim4 -if [ "$release" -eq 11 ]; then - if [ -f "/etc/exim4/exim4.conf.template" ]; then - check_grep=$(grep -c 'hosts_try_fastopen' /etc/exim4/exim4.conf.template) - if [ "$check_grep" -eq 0 ]; then - echo "=== Fixing Gmail hosts_try_fastopen in Exim4" - FIND="dkim_strict = 0" - ADD=" hosts_try_fastopen = \!\*.l.google.com" - sed -i "s#$FIND#$FIND\n$ADD#g" /etc/exim4/exim4.conf.template - systemctl restart exim4 - fi - fi -fi - -if [ "$release" -ge 11 ]; then - check_grep=$(grep -c '^net\.ipv4\.tcp_window_scaling' /etc/sysctl.conf) - if [ "$check_grep" -gt 0 ]; then - echo "=== Removing net.ipv4.tcp_window_scaling" - sed -i "s/net\.ipv4\.tcp_window_scaling/#net.ipv4.tcp_window_scaling/g" /etc/sysctl.conf - echo 1 > /proc/sys/net/ipv4/tcp_window_scaling - fi -fi - -# Adding Barracuda RBL to SpamAssassin -if [ ! -f "/usr/local/vesta/data/upgrades/barracuda_rbl" ]; then - spamassassin_installed=$(/usr/local/vesta/bin/v-list-sys-services | grep -c 'spamassassin') - spamassassin_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'spamassassin\|spamd' | grep -c 'running') - if [ $spamassassin_installed -eq 1 ]; then - echo "== Adding Barracuda RBL to SpamAssassin" - wget -nv -O /etc/spamassassin/barracuda.cf http://c.myvestacp.com/tools/spamassassin/barracuda.cf - fi - if [ $spamassassin_running -eq 1 ]; then - echo "== Restarting SpamAssassin" - if [ "$release" -lt 12 ]; then - systemctl restart spamassassin.service - else - systemctl restart spamd.service - fi - fi - touch /usr/local/vesta/data/upgrades/barracuda_rbl -fi - -# Checking if FreshClam is started after installation -if [ ! -f "/usr/local/vesta/data/upgrades/freshclam_start" ]; then - clamavup=$(/usr/local/vesta/bin/v-list-sys-services | grep 'clamav-daemon' | grep -c 'running') - freshclamdown=$(/usr/local/vesta/bin/v-list-sys-services | grep 'clamav-freshclam' | grep -c 'off') - if [ $clamavup -eq 1 ] && [ $freshclamdown -eq 1 ]; then - echo "== Starting FreshClam" - systemctl enable clamav-freshclam.service - systemctl start clamav-freshclam.service - fi - touch /usr/local/vesta/data/upgrades/freshclam_start -fi - -# Fix Autoreply issue with Exim 4.94+ -if [ ! -f "/usr/local/vesta/data/upgrades/fix_exim_494_autoreply" ]; then - if [ "$release" -eq 11 ]; then - touch /usr/local/vesta/data/upgrades/fix_exim_494_autoreply - if [ -f "/etc/exim4/exim4.conf.template" ]; then - echo "== Fix Autoreply issue with Exim 4.94+" - sed -i 's|file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}.msg|file = /etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/autoreply.${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}.msg|g' /etc/exim4/exim4.conf.template - sed -i 's| from = "${lookup{$local_part}dsearch{${extract{5}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/passwd}}}}/mail/${lookup{$domain}dsearch{/etc/exim4/domains/}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}"| from = "${extract{1}{:}{${lookup{$local_part}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/accounts}}}}@${lookup{$domain}dsearch{/etc/exim4/domains/}}"|g' /etc/exim4/exim4.conf.template - for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then - continue; - fi - /usr/local/vesta/bin/v-rebuild-mail-domains $user - done - systemctl restart exim4 - fi - fi -fi - -# Enabling session.cookie_httponly and session.cookie_secure in myvesta php-fpm -if [ ! -f "/usr/local/vesta/data/upgrades/enable_cookie_httponly" ]; then - touch /usr/local/vesta/data/upgrades/enable_cookie_httponly - check_grep=$(grep -c 'cookie_httponly' /usr/local/vesta/php/etc/php-fpm.conf) - if [ "$check_grep" -eq 0 ]; then - echo "== Enabling session.cookie_httponly and session.cookie_secure in myvesta php-fpm" - echo "php_admin_flag[session.cookie_httponly] = on" >> /usr/local/vesta/php/etc/php-fpm.conf - echo "php_admin_flag[session.cookie_secure] = on" >> /usr/local/vesta/php/etc/php-fpm.conf - systemctl restart vesta - fi -fi - -# Enabling TLS for ProFTPD FTPS -if [ ! -f "/usr/local/vesta/data/upgrades/enable-tls-in-proftpd" ]; then - if [ -f "/etc/proftpd/proftpd.conf" ]; then - touch /usr/local/vesta/data/upgrades/enable-tls-in-proftpd - check_grep=$(grep -c 'tls' /etc/proftpd/proftpd.conf) - if [ "$check_grep" -eq 0 ]; then - echo "== Enabling TLS for ProFTPD FTPS" - wget -nv https://c.myvestacp.com/debian/10/proftpd/tls.conf -O /etc/proftpd/tls.conf - sed -i "s|AuthPAMConfig|Include /etc/proftpd/tls.conf\n\nAuthPAMConfig|g" /etc/proftpd/proftpd.conf - proftpd_running=$(/usr/local/vesta/bin/v-list-sys-services | grep 'proftpd' | grep -c 'running') - if [ $proftpd_running -eq 1 ]; then - echo "== Restarting ProFTPD" - systemctl restart proftpd - fi - fi - fi -fi - -# Updating CloudFlare IP addresses -if [ ! -f "/usr/local/vesta/data/upgrades/update-cloudflare-ips" ]; then - if [ -f "/etc/nginx/nginx.conf" ]; then - touch /usr/local/vesta/data/upgrades/update-cloudflare-ips - echo "== Updating CloudFlare IP addresses" - sed -i "s| set_real_ip_from 104.16.0.0\/12;| set_real_ip_from 104.16.0.0/13;\n set_real_ip_from 104.24.0.0/14;|g" /etc/nginx/nginx.conf - systemctl restart nginx - fi -fi - -# Tuning of php-fpm pool.d config files (perfomances and limits) -if [ ! -f "/usr/local/vesta/data/upgrades/tune-fpm-config-files-v2" ]; then - touch /usr/local/vesta/data/upgrades/tune-fpm-config-files-v2 - - echo "== Tuning of php-fpm pool.d config files (perfomances and limits)" - - mkdir -p /root/etc-php-backup2 - cp -r /etc/php/ /root/etc-php-backup2/ - - OLDVAL='pm.max_children = 16' - NEWVAL='pm.max_children = 8' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - - OLDVAL='request_terminate_timeout = 30s' - NEWVAL='request_terminate_timeout = 90s' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - - OLDVAL='php_admin_value\[max_execution_time\] = 20' - NEWVAL='php_admin_value\[max_execution_time\] = 30' - find /etc/php/*/fpm/pool.d/ -name "*.conf" -type f -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - find /usr/local/vesta/data/templates/web/apache2/ -type f -name "*.sh" -exec grep -l "$OLDVAL" {} \; | xargs sed -i "s|$OLDVAL|$NEWVAL|g" - - # restart all php-fpm services - systemctl --full --type service --all | grep "php...-fpm" | awk '{print $1}' | xargs systemctl restart - echo "== Done" -fi - -if [ ! -f "/usr/local/vesta/data/upgrades/allow-backup-anytime" ]; then - touch /usr/local/vesta/data/upgrades/allow-backup-anytime - check_grep=$(grep -c 'ALLOW_BACKUP_ANYTIME' /usr/local/vesta/conf/vesta.conf) - if [ "$check_grep" -eq 0 ]; then - echo "" >> /usr/local/vesta/conf/vesta.conf - echo "ALLOW_BACKUP_ANYTIME='yes'" >> /usr/local/vesta/conf/vesta.conf - fi -fi - -if [ ! -f "/usr/local/vesta/data/upgrades/fix-sudoers" ]; then - touch /usr/local/vesta/data/upgrades/fix-sudoers - # sudoers fix - if [ -e "/etc/sudoers.d/admin" ]; then - sed -i "s/admin.*ALL=(ALL).*/# sudo is limited to vesta scripts/" \ - /etc/sudoers.d/admin - fi -fi - -check_grep=$(grep -c 'vesta.hostingpanel.dev' /etc/apt/sources.list.d/vesta.list) -if [ "$check_grep" -eq 1 ]; then - wget -O - http://apt.myvestacp.com/deb_signing.key | sudo apt-key add - - codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))" - echo "deb http://apt.myvestacp.com/$codename/ $codename vesta" > /etc/apt/sources.list.d/vesta.list -fi - -if [ -f "/var/spool/cron/crontabs/root" ]; then - check_cron=$(grep -c '6 sudo find /home/' /var/spool/cron/crontabs/root) -else - check_cron=0 -fi -if [ "$check_cron" -eq 0 ]; then - crontab -l | { cat; echo "10 2 * * 6 sudo find /home/*/tmp/ -type f -mtime +5 -exec rm {} \;"; } | crontab - -fi - -if [ $(systemctl list-unit-files | grep clamav-daemon | grep -c "disabled") -eq 0 ]; then - # Fixes only if ClamAV is enabled - - # make sure clamav-daemon.service has mkdir fix - if [ -f "/lib/systemd/system/clamav-daemon.service" ]; then - check_grep=$(grep -c 'mkdir' /lib/systemd/system/clamav-daemon.service) - if [ "$check_grep" -eq 0 ]; then - echo "=== patching clamav-daemon.service" - exec_pre1='ExecStartPre=-/bin/mkdir -p /var/run/clamav' - exec_pre2='ExecStartPre=-/bin/chown -R clamav:clamav /var/run/clamav' - sed -i "s|\[Service\]|[Service]\n$exec_pre1\n$exec_pre2|g" /lib/systemd/system/clamav-daemon.service - systemctl daemon-reload - systemctl restart clamav-daemon - systemctl restart clamav-freshclam - fi - fi - - # reverting to default clamd sock - if [ ! -f "/usr/local/vesta/data/upgrades/change-clamav-socket-v3" ]; then - touch /usr/local/vesta/data/upgrades/change-clamav-socket-v3 - if [ -f "/etc/clamav/clamd.conf" ]; then - sed -i "s#/var/lib/clamav/clamd.sock#/var/run/clamav/clamd.ctl#g" /etc/clamav/clamd.conf - if [ -f "/etc/exim4/exim4.conf.template" ]; then - sed -i "s#/var/lib/clamav/clamd.sock#/var/run/clamav/clamd.ctl#g" /etc/exim4/exim4.conf.template - fi - if [ -f "/lib/systemd/system/clamav-daemon.socket" ]; then - sed -i "s#/var/lib/clamav/clamd.sock#/run/clamav/clamd.ctl#g" /lib/systemd/system/clamav-daemon.socket - fi - systemctl daemon-reload - systemctl restart clamav-daemon - systemctl restart clamav-freshclam - if [ -f "/etc/exim4/exim4.conf.template" ]; then - systemctl restart exim4 - fi - fi - fi - - # reverting to default clamd sock - if [ ! -f "/usr/local/vesta/data/upgrades/change-clamav-socket-v4" ]; then - touch /usr/local/vesta/data/upgrades/change-clamav-socket-v4 - if [ -f "/etc/clamav/clamd.conf" ]; then - check_grep=$(grep -c '/var/lib/clamav/clamd.ctl' /etc/clamav/clamd.conf) - if [ "$check_grep" -eq 1 ]; then - sed -i "s#/var/lib/clamav/clamd.ctl#/var/run/clamav/clamd.ctl#g" /etc/clamav/clamd.conf - systemctl restart clamav-daemon - fi - fi - fi - - # Block executable files inside zip/rar/tar archives in ClamAV - if [ ! -f "/usr/local/vesta/data/upgrades/clamav_block_exe_in_archives" ]; then - touch /usr/local/vesta/data/upgrades/clamav_block_exe_in_archives - if [ -f "/etc/exim4/exim4.conf.template" ]; then - check_grep=$(grep -c '#CLAMD' /etc/exim4/exim4.conf.template) - if [ "$check_grep" -eq 0 ]; then - folder="/var/lib/clamav" - if [ -d "$folder" ]; then - echo "=== Blocking executable files inside zip/rar/tar archives in ClamAV" - wget -nv -O $folder/foxhole_all.cdb http://c.myvestacp.com/tools/clamav/foxhole_all.cdb - chown clamav:clamav $folder/foxhole_all.cdb - service clamav-daemon restart - fi - fi - fi - fi -fi - -# Making sure mpm_event will stay -if [ ! -f "/usr/local/vesta/data/upgrades/keeping-mpm-event-3" ]; then - touch /usr/local/vesta/data/upgrades/keeping-mpm-event-3 - echo "=== scheduling keeping-mpm-event check script" - echo "bash /usr/local/vesta/upd/keep_mpm_event.sh 'background' >> /usr/local/vesta/data/upgrades/keeping-mpm-event.log 2>&1" >> /usr/local/vesta/data/queue/restart.pipe - /usr/local/vesta/bin/v-add-cron-restart-job > /dev/null 2>&1 -fi - -# Fixing ssl directive in nginx templates -if [ "$release" -eq 9 ] || [ "$release" -eq 10 ]; then - if [ ! -f "/usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates" ]; then - touch /usr/local/vesta/data/upgrades/fix_ssl_directive_in_templates - echo "=== Fixing ssl directive in nginx templates" - bash /usr/local/vesta/upd/fix_ssl_directive_in_templates.sh - fi -fi - -# Clearing letsencrypt pipe -if [ ! -f "/usr/local/vesta/data/upgrades/clearing-letsencrypt-pipe" ]; then - touch /usr/local/vesta/data/upgrades/clearing-letsencrypt-pipe - if [ -f "/usr/local/vesta/data/queue/letsencrypt.pipe" ]; then - truncate -s 0 /usr/local/vesta/data/queue/letsencrypt.pipe - fi -fi - -# Deleting accidentally created W3TC.json in root folder of project -if [ -f "/usr/local/vesta/W3TC.json" ]; then - rm /usr/local/vesta/W3TC.json -fi -# Deleting renamed command -if [ -f "/usr/local/vesta/bin/v-replace-in-file" ]; then - rm /usr/local/vesta/bin/v-replace-in-file -fi - -# Limit max recipients per email to 15, in order to prevent mass spamming -if [ ! -f "/usr/local/vesta/data/upgrades/limit_max_recipients" ]; then - touch /usr/local/vesta/data/upgrades/limit_max_recipients - if [ -f "/etc/exim4/exim4.conf.template" ]; then - check_grep=$(grep -c 'recipients_max' /etc/exim4/exim4.conf.template) - if [ "$check_grep" -eq 0 ]; then - echo "=== Limit max recipients per email to 15, in order to prevent mass spamming" - FIND="acl_smtp_mime = acl_check_mime" - REPLACE="recipients_max = 15\nrecipients_max_reject = true" - sed -i "s#$FIND#$FIND\n\n$REPLACE#g" /etc/exim4/exim4.conf.template - systemctl restart exim4 - fi - fi -fi - -# Fixing Roundcube to send via authenticated SMTP user instead via php -if [ ! -f "/usr/local/vesta/data/upgrades/roundcube_smtp_auth" ]; then - touch /usr/local/vesta/data/upgrades/roundcube_smtp_auth - if [ -f "/etc/roundcube/defaults.inc.php" ]; then - echo "=== Fixing Roundcube to send via authenticated SMTP user instead via php" - sed -i "s#^\$config\['smtp_user'\].*#\$config\['smtp_user'\] = '%u';#g" /etc/roundcube/defaults.inc.php - sed -i "s#^\$config\['smtp_pass'\].*#\$config\['smtp_pass'\] = '%p';#g" /etc/roundcube/defaults.inc.php - fi -fi - -# Fixing Apache status public access -if [ ! -f "/usr/local/vesta/data/upgrades/apache_status_public_access" ]; then - touch /usr/local/vesta/data/upgrades/apache_status_public_access - if [ -f "/etc/apache2/mods-available/status.conf" ]; then - echo "=== Fixing Apache status public access" - sed -i "s|Allow from all|# Allow from all|g" /etc/apache2/mods-available/status.conf - service apache2 restart - fi -fi - -# Run custom triggers -if [ -x "/root/vesta-patch.sh" ]; then - /root/vesta-patch.sh -fi - -version=$(curl -s http://c.myvestacp.com/latest.txt?updated) -version=${version:6} -echo "=== myVesta $version updated ===" -echo "=== myVesta build date: $build_date" -echo "$version" > /usr/local/vesta/version.txt - exit 0 diff --git a/src/deb/vesta_compile.sh b/src/deb/vesta_compile.sh deleted file mode 100644 index 2d0e4874..00000000 --- a/src/deb/vesta_compile.sh +++ /dev/null @@ -1,748 +0,0 @@ -#!/bin/bash - -# Autocompile Script for VestaCP deb files - ver 1.0 -# Made for MyVesta fork. -# Autocompile script borrowed from HestiaCP, special thanks to Raphael Schneeberger - -build_deb_package=1 -add_deb_to_apt_repo=0 - -TARGET_DEB_NAME='trixie' -TARGET_DEB_VER='13' - -run_apt_update_and_install=1 -wait_to_press_enter=1 - -############### -# Note: first run --apt before turning add_deb_to_apt_repo=1 - -if [ $# -gt 1 ]; then - TARGET_DEB_NAME=$2 -fi -if [ $# -gt 2 ]; then - TARGET_DEB_VER=$3 -fi -if [ $# -gt 3 ]; then - build_deb_package=$4 -fi -if [ $# -gt 4 ]; then - add_deb_to_apt_repo=$5 -fi - -MAINTAINER_EMAIL='info@myvestacp.com' - -TARGET_DEB_NAME_MAIN='trixie' -TARGET_DEB_VER_MAIN='13' - -# Set compiling directory -BUILD_DIR="/usr/src/$TARGET_DEB_NAME" -BUILD_DIR_MAIN="/usr/src/$TARGET_DEB_NAME_MAIN" -INSTALL_DIR="/usr/local/vesta" - -# Set git repository raw path -GIT_SRC='https://raw.githubusercontent.com/myvesta/vesta/master/src' -GIT_REP="$GIT_REP/deb" - -C_WEB_ADDRESS="c.myvestacp.com" -WWW_FOLDER="/var/www" -PATH_OF_C_WEB_FOLDER_ROOT="$WWW_FOLDER/$C_WEB_ADDRESS/html" -PATH_OF_C_WEB_FOLDER="$PATH_OF_C_WEB_FOLDER_ROOT/debian/$TARGET_DEB_VER" -APT_WEB_ADDRESS="apt.myvestacp.com" -PATH_OF_APT_REPO_ROOT="$WWW_FOLDER/$APT_WEB_ADDRESS/html" -PATH_OF_APT_REPO="$PATH_OF_APT_REPO_ROOT/$TARGET_DEB_NAME" - -VESTA_VER=$(curl -s https://raw.githubusercontent.com/myvesta/vesta/master/src/deb/latest.txt) -VESTA_VER=${VESTA_VER:6} - -BUILD_DATE=$(date +"%d-%b-%Y") - -# Set Version for compiling -VESTA_V=$VESTA_VER"_amd64" - -NGINX_V='1.29.1' -PHP_V='8.4.11' -OPENSSL_V='1.1.1w' -PCRE_V='8.45' -ZLIB_V='1.3.1' - -# Generate Links for sourcecode -NGINX='https://nginx.org/download/nginx-'$NGINX_V'.tar.gz' -OPENSSL='https://www.openssl.org/source/openssl-'$OPENSSL_V'.tar.gz' -# PRCE got moved to sourceforce.net -# PRCE2 in the feature use -# PCRE='https://github.com/PCRE2Project/pcre2/releases/download/pcre2-'$PCRE_V'/pcre2-'$PCRE_V'.tar.gz' -PCRE='https://sourceforge.net/projects/pcre/files/pcre/'$PCRE_V'/pcre-'$PCRE_V'.tar.gz/download' -# Zlib moved archives to Github -ZLIB='https://github.com/madler/zlib/archive/refs/tags/v'$ZLIB_V'.tar.gz' -PHP='https://www.php.net/distributions/php-'$PHP_V'.tar.gz' - -# Set package dependencies for compiling -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - -if [ "$release" -lt 12 ]; then - SOFTWARE='build-essential libxml2-dev libz-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config reprepro dpkg-sig git rsync' -else - SOFTWARE='build-essential libxml2-dev libz-dev libcurl4-gnutls-dev unzip openssl libssl-dev pkg-config reprepro git rsync libsqlite3-dev libonig-dev' -fi - -function press_enter { - if [ $wait_to_press_enter -eq 1 ]; then - read -p "$1" - else - echo $1 - fi -} - -function make_deb_package { - press_enter "=== Press enter to build the package" - cd $BUILD_DIR - if [ -f "$1_$VESTA_V.deb" ]; then - rm $1_$VESTA_V.deb - fi - dpkg-deb --build $1_$VESTA_V - echo "=== Building done." - echo "=== Your .deb package is here: $BUILD_DIR/$1_$VESTA_V.deb" -} - -function add_to_repo { - press_enter "=== Press enter to sign the package ===============================================================================" - cd $BUILD_DIR - export GPG_TTY=$(tty) - dpkg-sig --sign builder $1_$VESTA_V.deb - - press_enter "=== Press enter to add to repo ===============================================================================" - - mkdir -p $PATH_OF_APT_REPO - cd $PATH_OF_APT_REPO - echo "=== cd $PATH_OF_APT_REPO" - reprepro --ask-passphrase -Vb . remove $TARGET_DEB_NAME $1 - reprepro --ask-passphrase -Vb . includedeb $TARGET_DEB_NAME $BUILD_DIR/$1_$VESTA_V.deb -} - -# Install needed software -if [ $run_apt_update_and_install -eq 1 ]; then - echo "Update system repository..." - - apt-get -qq update - echo "Installing dependencies for compilation..." - apt-get -qq install -y $SOFTWARE - - # Fix for Debian PHP Envroiment - if [ ! -e /usr/local/include/curl ] && [ "$release" -lt 12 ]; then - ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl - fi - if [ ! -e /usr/local/include/curl ] && [ "$release" -eq 13 ]; then - ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl - fi - press_enter "=== Press enter to continue ===============================================================================" -fi - - -# Set packages to compile -for arg; do - case "$1" in - --all) - NGINX_B='true' - PHP_B='true' - VESTA_B='true' - VESTAGIT_B='true' - CWEB_B='true' - APTWEB_B='true' - ;; - --nginx) - NGINX_B='true' - ;; - --php) - PHP_B='true' - ;; - --vesta) - VESTA_B='true' - ;; - --git) - VESTAGIT_B='true' - ;; - --git) - VESTAGIT_B='true' - ;; - --c) - CWEB_B='true' - ;; - --apt) - APTWEB_B='true' - ;; - *) - NOARGUMENT='true' - ;; - esac -done - -if [ $# -eq 0 ]; then - echo "!!! Please run with argument --vesta, --nginx, --php, --git, --c, --apt or --all" - exit 1 -fi - -if [ ! -d "/root/backup-www" ]; then - mkdir /root/backup-www -fi -echo "=== Making backup of $WWW_FOLDER" -rsync -a --delete $WWW_FOLDER/ /root/backup-www/ - -if [ $build_deb_package -eq 1 ]; then - if [ "$APTWEB_B" = true ]; then - VESTAGIT_B='true' - fi - if [ "$CWEB_B" = true ]; then - VESTAGIT_B='true' - fi - if [ "$VESTA_B" = true ]; then - VESTAGIT_B='true' - fi - if [ "$PHP_B" = true ]; then - VESTAGIT_B='true' - fi - if [ "$NGINX_B" = true ]; then - VESTAGIT_B='true' - fi - - if [ "$CWEB_B" = true ]; then - if [ $# -gt 1 ]; then - if [ $2 = "--nogit" ]; then - VESTAGIT_B='false' - fi - fi - fi - -fi - -if [ ! -d "$BUILD_DIR" ]; then - mkdir -p $BUILD_DIR -fi - -################################################################################# -# -# Get latest vesta from git -# -################################################################################# - -if [ "$VESTAGIT_B" = true ]; then - echo "======= Get latest vesta from git =======" - cd /root - rm -rf vesta/ - git clone https://github.com/myvesta/vesta.git - echo "=== Git cloning done" -fi - -################################################################################# -# -# Building c subdomain web folder -# -################################################################################# - -if [ "$APTWEB_B" = true ]; then - echo "======= Building apt subdomain web folder =======" - - mkdir -p $PATH_OF_APT_REPO - cd $PATH_OF_APT_REPO - - mkdir conf && cd conf - cat <distributions -Origin: $APT_WEB_ADDRESS -Label: myvesta apt repository -Codename: $TARGET_DEB_NAME -Architectures: amd64 source -Components: vesta -Description: myvesta debian package repo -SignWith: yes -Pull: $TARGET_DEB_NAME -EOF - - if [ ! -d "/root/.gnupg" ]; then - gpg --full-gen-key - gpg --armor --export $MAINTAINER_EMAIL --output $MAINTAINER_EMAIL.gpg.key - press_enter "*** please copy above generated key to your clipboard and then paste it after pressing enter now ***" - vi $PATH_OF_APT_REPO_ROOT/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/13/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/12/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/11/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/10/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/9/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/8/deb_signing.key - cp $PATH_OF_APT_REPO_ROOT/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/debian/7/deb_signing.key - fi - - echo "=== All done" -fi - -################################################################################# -# -# Building c subdomain web folder -# -################################################################################# - -if [ "$CWEB_B" = true ]; then - echo "======= Building c subdomain web folder =======" - - echo "Removing: $PATH_OF_C_WEB_FOLDER_ROOT" - rm -rf $PATH_OF_C_WEB_FOLDER_ROOT - echo "=== Whole C folder removed" - - echo "=== Making folder $PATH_OF_C_WEB_FOLDER_ROOT" - mkdir -p $PATH_OF_C_WEB_FOLDER_ROOT - cd $PATH_OF_C_WEB_FOLDER_ROOT - - echo "=== Copying and extracting static files" - - cp /root/vesta/src/static.tar.gz $PATH_OF_C_WEB_FOLDER_ROOT/static.tar.gz - tar -xzf static.tar.gz - rm static.tar.gz - - echo "=== Copying files" - mkdir -p $PATH_OF_C_WEB_FOLDER - cp -rf /root/vesta/install/debian/* $PATH_OF_C_WEB_FOLDER_ROOT/debian - if [ ! -f "$PATH_OF_C_WEB_FOLDER_ROOT/deb_signing.key" ]; then - cp /root/vesta/install/debian/$TARGET_DEB_VER_MAIN/deb_signing.key $PATH_OF_C_WEB_FOLDER_ROOT/deb_signing.key - fi - cp /root/vesta/src/deb/latest.txt $PATH_OF_C_WEB_FOLDER_ROOT/latest.txt - echo "$BUILD_DATE" > $PATH_OF_C_WEB_FOLDER_ROOT/build_date.txt - - if [ -f "/root/custom_callback.sh" ]; then - BUILD_RELEASE=$(= 2.5.44) +; - kqueue (FreeBSD >= 4.1, OpenBSD >= 2.9, NetBSD >= 2.0) +; - /dev/poll (Solaris >= 7) +; - port (Solaris >= 10) +; Default Value: not set (auto detection) +; events.mechanism = epoll + +;;;;;;;;;;;;;;;;;;;; +; Pool Definitions ; +;;;;;;;;;;;;;;;;;;;; + +; Multiple pools of child processes may be started with different listening +; ports and different management options. The name of the pool will be +; used in logs and stats. There is no limitation on the number of pools which +; FPM can handle. Your system will tell you anyway :) + +; Start a new pool named 'www'. +; the variable $pool can we used in any directive and will be replaced by the +; pool name ('www' here) [www] + +; Per pool prefix +; It only applies on the following directives: +; - 'slowlog' +; - 'listen' (unixsocket) +; - 'chroot' +; - 'chdir' +; - 'php_values' +; - 'php_admin_values' +; When not set, the global prefix (or /usr/local/vesta/php) applies instead. +; Note: This directive can also be relative to the global prefix. +; Default Value: none +;prefix = /path/to/pools/$pool + +; Unix user/group of processes +; Note: The user is mandatory. If the group is not set, the default user's group +; will be used. user = admin group = admin + +; The address on which to accept FastCGI requests. +; Valid syntaxes are: +; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific address on +; a specific port; +; 'port' - to listen on a TCP socket to all addresses on a +; specific port; +; '/path/to/unix/socket' - to listen on a unix socket. +; Note: This value is mandatory. +;listen = 127.0.0.1:9000 listen = /var/run/vesta-php.sock + +; Set listen(2) backlog. +; Default Value: 128 (-1 on FreeBSD and OpenBSD) +;listen.backlog = 128 + +; Set permissions for unix socket, if one is used. In Linux, read/write +; permissions must be set in order to allow connections from a web server. Many +; BSD-derived systems allow connections regardless of permissions. +; Default Values: user and group are set as the running user +; mode is set to 0666 listen.owner = admin listen.group = admin listen.mode = 0660 + +; List of ipv4 addresses of FastCGI clients which are allowed to connect. +; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address +; must be separated by a comma. If this value is left blank, connections will be +; accepted from any ip address. +; Default Value: any +;listen.allowed_clients = 127.0.0.1 +; Choose how the process manager will control the number of child processes. +; Possible Values: +; static - a fixed number (pm.max_children) of child processes; +; dynamic - the number of child processes are set dynamically based on the +; following directives. With this process management, there will be +; always at least 1 children. +; pm.max_children - the maximum number of children that can +; be alive at the same time. +; pm.start_servers - the number of children created on startup. +; pm.min_spare_servers - the minimum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is less than this +; number then some children will be created. +; pm.max_spare_servers - the maximum number of children in 'idle' +; state (waiting to process). If the number +; of 'idle' processes is greater than this +; number then some children will be killed. +; ondemand - no children are created at startup. Children will be forked when +; new requests will connect. The following parameter are used: +; pm.max_children - the maximum number of children that +; can be alive at the same time. +; pm.process_idle_timeout - The number of seconds after which +; an idle process will be killed. +; Note: This value is mandatory. pm = dynamic + +; The number of child processes to be created when pm is set to 'static' and the +; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'. +; This value sets the limit on the number of simultaneous requests that will be +; served. Equivalent to the ApacheMaxClients directive with mpm_prefork. +; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP +; CGI. The below defaults are based on a server without much resources. Don't +; forget to tweak pm.* to fit your needs. +; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand' +; Note: This value is mandatory. pm.max_children = 5 + +; The number of child processes created on startup. +; Note: Used only when pm is set to 'dynamic' +; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 pm.start_servers = 2 + +; The desired minimum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' pm.min_spare_servers = 1 + +; The desired maximum number of idle server processes. +; Note: Used only when pm is set to 'dynamic' +; Note: Mandatory when pm is set to 'dynamic' pm.max_spare_servers = 3 +; The number of seconds after which an idle process will be killed. +; Note: Used only when pm is set to 'ondemand' +; Default Value: 10s +;pm.process_idle_timeout = 10s; + +; The number of requests each child process should execute before respawning. +; This can be useful to work around memory leaks in 3rd party libraries. For +; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. +; Default Value: 0 +;pm.max_requests = 500 + +; The URI to view the FPM status page. If this value is not set, no URI will be +; recognized as a status page. It shows the following informations: +; pool - the name of the pool; +; process manager - static, dynamic or ondemand; +; start time - the date and time FPM has started; +; start since - number of seconds since FPM has started; +; accepted conn - the number of request accepted by the pool; +; listen queue - the number of request in the queue of pending +; connections (see backlog in listen(2)); +; max listen queue - the maximum number of requests in the queue +; of pending connections since FPM has started; +; listen queue len - the size of the socket queue of pending connections; +; idle processes - the number of idle processes; +; active processes - the number of active processes; +; total processes - the number of idle + active processes; +; max active processes - the maximum number of active processes since FPM +; has started; +; max children reached - number of times, the process limit has been reached, +; when pm tries to start more children (works only for +; pm 'dynamic' and 'ondemand'); +; Value are updated in real time. +; Example output: +; pool: www +; process manager: static +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 62636 +; accepted conn: 190460 +; listen queue: 0 +; max listen queue: 1 +; listen queue len: 42 +; idle processes: 4 +; active processes: 11 +; total processes: 15 +; max active processes: 12 +; max children reached: 0 +; +; By default the status page output is formatted as text/plain. Passing either +; 'html', 'xml' or 'json' in the query string will return the corresponding +; output syntax. Example: +; http://www.foo.bar/status +; http://www.foo.bar/status?json +; http://www.foo.bar/status?html +; http://www.foo.bar/status?xml +; +; By default the status page only outputs short status. Passing 'full' in the +; query string will also return status for each pool process. +; Example: +; http://www.foo.bar/status?full +; http://www.foo.bar/status?json&full +; http://www.foo.bar/status?html&full +; http://www.foo.bar/status?xml&full +; The Full status returns for each process: +; pid - the PID of the process; +; state - the state of the process (Idle, Running, ...); +; start time - the date and time the process has started; +; start since - the number of seconds since the process has started; +; requests - the number of requests the process has served; +; request duration - the duration in µs of the requests; +; request method - the request method (GET, POST, ...); +; request URI - the request URI with the query string; +; content length - the content length of the request (only with POST); +; user - the user (PHP_AUTH_USER) (or '-' if not set); +; script - the main script called (or '-' if not set); +; last request cpu - the %cpu the last request consumed +; it's always 0 if the process is not in Idle state +; because CPU calculation is done when the request +; processing has terminated; +; last request memory - the max amount of memory the last request consumed +; it's always 0 if the process is not in Idle state +; because memory calculation is done when the request +; processing has terminated; +; If the process is in Idle state, then informations are related to the +; last request the process has served. Otherwise informations are related to +; the current request being served. +; Example output: +; ************************ +; pid: 31330 +; state: Running +; start time: 01/Jul/2011:17:53:49 +0200 +; start since: 63087 +; requests: 12808 +; request duration: 1250261 +; request method: GET +; request URI: /test_mem.php?N=10000 +; content length: 0 +; user: - +; script: /home/fat/web/docs/php/test_mem.php +; last request cpu: 0.00 +; last request memory: 0 +; +; Note: There is a real-time FPM status monitoring sample web page available +; It's available in: ${prefix}/share/fpm/status.html +; +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;pm.status_path = /status + +; The ping URI to call the monitoring page of FPM. If this value is not set, no +; URI will be recognized as a ping page. This could be used to test from outside +; that FPM is alive and responding, or to +; - create a graph of FPM availability (rrd or such); +; - remove a server from a group if it is not responding (load balancing); +; - trigger alerts for the operating team (24/7). +; Note: The value must start with a leading slash (/). The value can be +; anything, but it may not be a good idea to use the .php extension or it +; may conflict with a real PHP file. +; Default Value: not set +;ping.path = /ping + +; This directive may be used to customize the response of a ping request. The +; response is formatted as text/plain with a 200 response code. +; Default Value: pong +;ping.response = pong + +; The access log file +; Default: not set +;access.log = log/$pool.access.log + +; The access log format. +; The following syntax is allowed +; %%: the '%' character +; %C: %CPU used by the request +; it can accept the following format: +; - %{user}C for user CPU only +; - %{system}C for system CPU only +; - %{total}C for user + system CPU (default) +; %d: time taken to serve the request +; it can accept the following format: +; - %{seconds}d (default) +; - %{miliseconds}d +; - %{mili}d +; - %{microseconds}d +; - %{micro}d +; %e: an environment variable (same as $_ENV or $_SERVER) +; it must be associated with embraces to specify the name of the env +; variable. Some exemples: +; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e +; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e +; %f: script filename +; %l: content-length of the request (for POST request only) +; %m: request method +; %M: peak of memory allocated by PHP +; it can accept the following format: +; - %{bytes}M (default) +; - %{kilobytes}M +; - %{kilo}M +; - %{megabytes}M +; - %{mega}M +; %n: pool name +; %o: ouput header +; it must be associated with embraces to specify the name of the header: +; - %{Content-Type}o +; - %{X-Powered-By}o +; - %{Transfert-Encoding}o +; - .... +; %p: PID of the child that serviced the request +; %P: PID of the parent of the child that serviced the request +; %q: the query string +; %Q: the '?' character if query string exists +; %r: the request URI (without the query string, see %q and %Q) +; %R: remote IP address +; %s: status (response code) +; %t: server time the request was received +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %T: time the log has been written (the request has finished) +; it can accept a strftime(3) format: +; %d/%b/%Y:%H:%M:%S %z (default) +; %u: remote user +; +; Default: "%R - %u %t \"%m %r\" %s" +;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%" + +; The log file for slow requests +; Default Value: not set +; Note: slowlog is mandatory if request_slowlog_timeout is set +;slowlog = log/$pool.log.slow + +; The timeout for serving a single request after which a PHP backtrace will be +; dumped to the 'slowlog' file. A value of '0s' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_slowlog_timeout = 0 + +; The timeout for serving a single request after which the worker process will +; be killed. This option should be used when the 'max_execution_time' ini option +; does not stop script execution for some reason. A value of '0' means 'off'. +; Available units: s(econds)(default), m(inutes), h(ours), or d(ays) +; Default Value: 0 +;request_terminate_timeout = 0 + +; Set open file descriptor rlimit. +; Default Value: system defined value +;rlimit_files = 1024 + +; Set max core size rlimit. +; Possible Values: 'unlimited' or an integer greater or equal to 0 +; Default Value: system defined value +;rlimit_core = 0 + +; Chroot to this directory at the start. This value must be defined as an +; absolute path. When this value is not set, chroot is not used. +; Note: you can prefix with '$prefix' to chroot to the pool prefix or one +; of its subdirectories. If the pool prefix is not set, the global prefix +; will be used instead. +; Note: chrooting is a great security feature and should be used whenever +; possible. However, all PHP paths will be relative to the chroot +; (error_log, sessions.save_path, ...). +; Default Value: not set +;chroot = + +; Chdir to this directory at the start. +; Note: relative path can be used. +; Default Value: current directory or / when chroot +;chdir = /var/www + +; Redirect worker stdout and stderr into main error log. If not set, stdout and +; stderr will be redirected to /dev/null according to FastCGI specs. +; Note: on highloaded environement, this can cause some delay in the page +; process time (several ms). +; Default Value: no +;catch_workers_output = yes + +; Limits the extensions of the main script FPM will allow to parse. This can +; prevent configuration mistakes on the web server side. You should only limit +; FPM to .php extensions to prevent malicious users to use other extensions to +; exectute php code. +; Note: set an empty value to allow all extensions. +; Default Value: .php +;security.limit_extensions = .php .php3 .php4 .php5 + +; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from +; the current environment. +; Default Value: clean env env[HOSTNAME] = $HOSTNAME env[PATH] = /usr/local/bin:/usr/bin:/bin env[TMP] = /tmp @@ -23,6 +470,26 @@ env[TMPDIR] = /tmp env[TEMP] = /tmp env[VESTA] = $VESTA env[LANG] = en_US.UTF-8 + +; Additional php.ini defines, specific to this pool of workers. These settings +; overwrite the values previously defined in the php.ini. The directives are the +; same as the PHP SAPI: +; php_value/php_flag - you can set classic ini defines which can +; be overwritten from PHP call 'ini_set'. +; php_admin_value/php_admin_flag - these directives won't be overwritten by +; PHP call 'ini_set' +; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no. + +; Defining 'extension' will load the corresponding shared extension from +; extension_dir. Defining 'disable_functions' or 'disable_classes' will not +; overwrite previously defined php.ini values, but will append the new value +; instead. + +; Note: path INI options can be relative and will be expanded with the prefix +; (pool, global or /usr/local/vesta/php) + +; Default Value: nothing is defined by default except the values in php.ini and +; specified at startup with the -d argument php_flag[display_errors] = off php_admin_value[error_log] = /usr/local/vesta/log/fpm-php.log php_admin_flag[log_errors] = on diff --git a/src/rpm/conf/php.ini b/src/rpm/conf/php.ini index 28dc539a..1d76b783 100644 --- a/src/rpm/conf/php.ini +++ b/src/rpm/conf/php.ini @@ -290,7 +290,7 @@ disable_classes = ; (e.g. by adding its signature to the Web server header). It is no security ; threat in any way, but it makes it possible to determine whether you use PHP ; on your server or not. -expose_php = Off +expose_php = On ;;;;;;;;;;;;;;;;;;; diff --git a/src/rpm/specs/vesta-ioncube.spec b/src/rpm/specs/vesta-ioncube.spec index c3ac1187..ed079abe 100644 --- a/src/rpm/specs/vesta-ioncube.spec +++ b/src/rpm/specs/vesta-ioncube.spec @@ -1,6 +1,6 @@ Name: vesta-ioncube Version: 0.9.8 -Release: 26 +Release: 18 Summary: ionCube Loader Group: System Environment/Base License: "Freely redistributable without restriction" diff --git a/src/rpm/specs/vesta-nginx.spec b/src/rpm/specs/vesta-nginx.spec index f3250c9e..d562df15 100644 --- a/src/rpm/specs/vesta-nginx.spec +++ b/src/rpm/specs/vesta-nginx.spec @@ -1,6 +1,6 @@ Name: vesta-nginx Version: 0.9.8 -Release: 26 +Release: 18 Summary: Vesta Control Panel Group: System Environment/Base License: BSD-like diff --git a/src/rpm/specs/vesta-php.spec b/src/rpm/specs/vesta-php.spec index 4272db6a..aa99a59b 100644 --- a/src/rpm/specs/vesta-php.spec +++ b/src/rpm/specs/vesta-php.spec @@ -1,6 +1,6 @@ Name: vesta-php Version: 0.9.8 -Release: 26 +Release: 18 Summary: Vesta Control Panel Group: System Environment/Base License: GPL diff --git a/src/rpm/specs/vesta-softaculous.spec b/src/rpm/specs/vesta-softaculous.spec index c094ae78..428d352b 100644 --- a/src/rpm/specs/vesta-softaculous.spec +++ b/src/rpm/specs/vesta-softaculous.spec @@ -1,6 +1,6 @@ Name: vesta-softaculous Version: 0.9.8 -Release: 26 +Release: 18 Summary: Vesta Control Panel Group: System Environment/Base License: Softaculous License @@ -35,8 +35,5 @@ rm -rf %{buildroot} %config(noreplace) %{_vestadir}/conf %changelog -* Tue Nov 27 2018 Serghey Rodin - 0.9.8-24 -- New version 5.1.2 - * Mon Jul 21 2017 Serghey Rodin - 0.9.8-18 - Initial build for Softaculous 4.9.2 diff --git a/src/rpm/specs/vesta.spec b/src/rpm/specs/vesta.spec index 904bdc4e..6be72e16 100644 --- a/src/rpm/specs/vesta.spec +++ b/src/rpm/specs/vesta.spec @@ -1,6 +1,6 @@ Name: vesta Version: 0.9.8 -Release: 26 +Release: 18 Summary: Vesta Control Panel Group: System Environment/Base License: GPL @@ -30,30 +30,18 @@ rm -rf %{buildroot} %post if [ $1 -ge 2 ]; then - if [ -x /usr/local/vesta/upd/add_sudo.sh ]; then + if [ -e /usr/local/vesta/upd/add_sudo.sh ]; then /usr/local/vesta/upd/add_sudo.sh fi - if [ -x /usr/local/vesta/upd/add_notifications.sh ]; then + if [ -e /usr/local/vesta/upd/add_notifications.sh ]; then /usr/local/vesta/upd/add_notifications.sh fi - if [ -x /usr/local/vesta/upd/fix_sessions.sh ]; then + if [ -e /usr/local/vesta/upd/fix_sessions.sh ]; then /usr/local/vesta/upd/fix_sessions.sh fi - if [ -x /usr/local/vesta/upd/fix_nginx_auth.sh ]; then + if [ -e /usr/local/vesta/upd/fix_nginx_auth.sh ]; then /usr/local/vesta/upd/fix_nginx_auth.sh fi - if [ -x /usr/local/vesta/upd/fix_roundcube.sh ]; then - /usr/local/vesta/upd/fix_roundcube.sh - fi - - if [ -x /usr/local/vesta/upd/limit_sudo.sh ]; then - /usr/local/vesta/upd/limit_sudo.sh - fi - - if [ -x /usr/local/vesta/upd/fix_dhcprenew.sh ]; then - /usr/local/vesta/upd/fix_dhcprenew.sh - fi - fi %files %{_vestadir} @@ -68,44 +56,6 @@ fi %config(noreplace) %{_vestadir}/web/css/uploadify.css %changelog -* Sat Sep 29 2019 Serghey Rodin - 0.9.8-26 -- Let's Encrypt HTTP/2 support - -* Thu Aug 15 2019 Serghey Rodin - 0.9.8-25 -- Security bugfixes -- LEv2 idn fix - -* Mon Apr 18 2019 Serghey Rodin - 0.9.8-24 -- Bugfixes -- Security patches -- LEv2 -- Server LE -- i18n updates - -* Thu Oct 18 2018 Serghey Rodin - 0.9.8-23 -- Security fixes - -* Wed Jun 27 2018 Serghey Rodin - 0.9.8-22 -- Security fixes - -* Fri May 11 2018 Serghey Rodin - 0.9.8-21 -- Additional security fixes - -* Sun Apr 08 2018 Serghey Rodin - 0.9.8-20 -- Hardening password checks - -* Wed Jan 10 2018 Serghey Rodin - 0.9.8-19 -- Fixed backup restore function - -* Fri Dec 29 2017 Serghey Rodin - 0.9.8-18 -- Let's Encrypt for internationalized domains (IDN) -- Softaculous Application Installer -- Debian 9 support sponsored by isicore.com -- Ubuntu 16.10 and 17.04 support -- Korean, Urdu, Thai, Brazilian Portuguese, Serbian and Bulgarian language support -- We've made 1478 commits -- 29 bugs closed / 141 pull requests merged - * Mon Nov 14 2016 Serghey Rodin - 0.9.8-17 - System Config Editor - Let's Encrypt GUI diff --git a/src/static.tar.gz b/src/static.tar.gz deleted file mode 100644 index fe082fd6..00000000 Binary files a/src/static.tar.gz and /dev/null differ diff --git a/upd/add_notifications.sh b/upd/add_notifications.sh index 46974585..5c98c950 100755 --- a/upd/add_notifications.sh +++ b/upd/add_notifications.sh @@ -5,4 +5,5 @@ rm -f /usr/local/vesta/data/users/admin/notifications.conf /usr/local/vesta/bin/v-add-user-notification admin "File Manager" "Browse, copy, edit, view, and retrieve all your web domain files using a fully featured File Manager. Plugin is available for purchase." 'filemanager' /usr/local/vesta/bin/v-add-user-notification admin "Chroot SFTP" "If you want to have SFTP accounts that will be used only to transfer files (and not to SSH), you can purchase and enable SFTP Chroot" /usr/local/vesta/bin/v-add-user-notification admin "Softaculous" "Softaculous is one of the best Auto Installers and it is finally available" -/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-26" "This release adds support for Lets Encrypt HTTP/2. For more information please read release notes" +/usr/local/vesta/bin/v-add-user-notification admin "Release 0.9.8-18" "We've made 1478 commits, fixed 29 bugs and merged 141 pull request. As always for more information please read release notes" + diff --git a/upd/add_sudo.sh b/upd/add_sudo.sh index 439e3515..d65ee9d7 100755 --- a/upd/add_sudo.sh +++ b/upd/add_sudo.sh @@ -3,7 +3,7 @@ if [ ! -e '/etc/sudoers.d/admin' ]; then if [ ! -d '/etc/sudoers.d' ]; then - mkdir /etc/sudoers.d + mkidr /etc/sudoers.d chmod 750 /etc/sudoers.d fi echo '# Created by vesta update-trigger' > /etc/sudoers.d/admin diff --git a/upd/fix_dhcprenew.sh b/upd/fix_dhcprenew.sh deleted file mode 100755 index 08e76f69..00000000 --- a/upd/fix_dhcprenew.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if [ -e "/usr/bin/dhcprenew" ]; then - mv /usr/bin/dhcprenew /usr/bin/dhcprenew.disabled - - # Notify admin via control panel - rm /usr/local/vesta/data/users/admin/notifications.conf - touch /usr/local/vesta/data/users/admin/notifications.conf - /usr/local/vesta/bin/v-add-user-notification admin \ - "Security Check" "Your server was compromised please contact us at info@vestacp.com to get help." - - # Send email notification - send_mail="/usr/local/vesta/web/inc/mail-wrapper.php" - email=$(grep CONTACT /usr/local/vesta/data/users/admin/user.conf |cut -f2 -d \') - if [ ! -z "$email" ]; then - echo "Your server $(hostname) was compromised please contact us at info@vestacp.com to get help." |\ - $send_mail -s "SECURITY CHECK: Vesta Control Panel" $email - fi -fi - diff --git a/upd/fix_nginx_auth.sh b/upd/fix_nginx_auth.sh index 2579e693..5bed5790 100755 --- a/upd/fix_nginx_auth.sh +++ b/upd/fix_nginx_auth.sh @@ -3,7 +3,7 @@ source /etc/profile.d/vesta.sh source /usr/local/vesta/conf/vesta.conf -sed -i "s|web/%domain%/stats/auth.*|conf/web/%domain%.auth;|" \ +sed -i "s|web/%domain%/stats/auth.*|conf/web/%domain%.auth|" \ $VESTA/data/templates/web/nginx/*/*tpl >/dev/null 2>&1 if [ "$WEB_SYSTEM" != 'nginx' ]; then diff --git a/upd/fix_roundcube.sh b/upd/fix_roundcube.sh deleted file mode 100755 index 621ffd2f..00000000 --- a/upd/fix_roundcube.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -# Locate roundcube directory -if [ -d '/etc/roundcube' ]; then - rc_dir='/etc/roundcube' -fi -if [ -d '/etc/roundcubemail' ]; then - rc_dir='/etc/roundcubemail' -fi - -if [ -z "$rc_dir" ]; then - exit -fi - -# Check for eval -cd $rc_dir -for config in $(grep eval *.php |cut -f1 -d:); do - sed -i '/eval/d' $config -done diff --git a/upd/fix_ssl_directive_in_templates.sh b/upd/fix_ssl_directive_in_templates.sh deleted file mode 100644 index 9c61f120..00000000 --- a/upd/fix_ssl_directive_in_templates.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - -if [ "$release" -eq 9 ] || [ "$release" -eq 10 ]; then - for FILE in /usr/local/vesta/data/templates/web/nginx/*.stpl; do - check_grep=$(grep -c 'http2' $FILE) - if [ "$check_grep" -eq 0 ]; then - echo "=== Fixing http2 directive in $FILE" - sed -i "s|:%proxy_ssl_port%;|:%proxy_ssl_port% ssl http2;|g" $FILE - fi - check_grep=$(grep -c 'ssl *on;' $FILE) - if [ "$check_grep" -gt 0 ]; then - echo "=== Fixing ssl directive in $FILE" - sed -i "s|ssl *on;|#ssl_on;|g" $FILE - fi - done - - source /etc/profile - PATH=$PATH:/usr/local/vesta/bin && export PATH - - echo "=== Rebuilding web config files (this can take a while)" - - for user in $(grep '@' /etc/passwd |cut -f1 -d:); do - if [ ! -f "/usr/local/vesta/data/users/$user/user.conf" ]; then - continue; - fi - /usr/local/vesta/bin/v-rebuild-web-domains $user 'no' - done - -fi diff --git a/upd/keep_mpm_event.sh b/upd/keep_mpm_event.sh deleted file mode 100644 index 9095a601..00000000 --- a/upd/keep_mpm_event.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -########### -# Script that will ensure that Apache2 will always stay in mpm_event mode -########### - -switch_to_mpm_event=1 - -if [ "$1" = 'background' ]; then - switch_to_mpm_event=0 - check_grep=$(ps -A | grep -c "apt") - if [ "$check_grep" -eq 0 ]; then - echo "=== OK, apt is not running" - echo "=== Cleaning restart.pipe" - sed -i "/keep_mpm_event/d" /usr/local/vesta/data/queue/restart.pipe - /usr/local/vesta/bin/v-delete-cron-restart-job - if [ ! -f "/usr/local/vesta/data/upgrades/keeping-mpm-event-checked-2" ]; then - touch /usr/local/vesta/data/upgrades/keeping-mpm-event-checked-2 - echo "=== OK, mpm_event is not checked" - check_grep=$(grep -c "WEB_SYSTEM='apache2'" /usr/local/vesta/conf/vesta.conf) - if [ "$check_grep" -eq 1 ]; then - echo "=== OK, we have Apache2" - release=$(cat /etc/debian_version | tr "." "\n" | head -n1) - if [ "$release" -ge 10 ]; then - echo "=== OK, it's Debian 10 or 11" - switch_to_mpm_event=1 - else - check_grep=$(/usr/local/vesta/bin/v-list-sys-web-status | grep -c "Server MPM: event") - if [ "$check_grep" -eq 1 ]; then - echo "=== OK, it's already mpm_event" - switch_to_mpm_event=1 - fi - fi - fi - fi - fi -else - echo "=== Script is called by the user" -fi - -if [ "$switch_to_mpm_event" -eq 1 ]; then - echo "=== OK, let's ensure mpm_event" - - a2dismod ruid2 > /dev/null 2>&1 - a2dismod suexec > /dev/null 2>&1 - a2dismod php5.6 > /dev/null 2>&1 - a2dismod php7.0 > /dev/null 2>&1 - a2dismod php7.1 > /dev/null 2>&1 - a2dismod php7.2 > /dev/null 2>&1 - a2dismod php7.3 > /dev/null 2>&1 - a2dismod php7.4 > /dev/null 2>&1 - a2dismod php8.0 > /dev/null 2>&1 - a2dismod php8.1 > /dev/null 2>&1 - a2dismod mpm_prefork > /dev/null 2>&1 - a2enmod mpm_event > /dev/null 2>&1 - apt-get -y remove libapache2-mod-php* > /dev/null 2>&1 - service apache2 restart - echo "=== Done!" -fi diff --git a/upd/limit_sudo.sh b/upd/limit_sudo.sh deleted file mode 100755 index 22572151..00000000 --- a/upd/limit_sudo.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -e "/etc/sudoers.d/admin" ]; then - sed -i "s/admin.*ALL=(ALL).*/# sudo is limited to vesta scripts/" \ - /etc/sudoers.d/admin -fi - -sed -i "s/%admin.*ALL=(ALL).*/# sudo is limited to vesta scripts/" /etc/sudoers diff --git a/web/add/cron/autoupdate/index.php b/web/add/cron/autoupdate/index.php index 90854d9b..53d50c05 100644 --- a/web/add/cron/autoupdate/index.php +++ b/web/add/cron/autoupdate/index.php @@ -5,12 +5,6 @@ ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -// Check token -if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { - header('location: /login/'); - exit(); -} - if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-add-cron-vesta-autoupdate", $output, $return_var); $_SESSION['error_msg'] = __('Autoupdate has been successfully enabled'); diff --git a/web/add/cron/reports/index.php b/web/add/cron/reports/index.php index 197c5760..4b0424e3 100644 --- a/web/add/cron/reports/index.php +++ b/web/add/cron/reports/index.php @@ -5,12 +5,6 @@ ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -// Check token -if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { - header('location: /login/'); - exit(); -} - exec (VESTA_CMD."v-add-cron-reports ".$user, $output, $return_var); $_SESSION['error_msg'] = __('Cronjob email reporting has been successfully enabled'); unset($output); diff --git a/web/add/db/index.php b/web/add/db/index.php index e0529b32..68f66b4a 100644 --- a/web/add/db/index.php +++ b/web/add/db/index.php @@ -98,7 +98,7 @@ if (!empty($_POST['ok'])) { // Flush field values on success if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('DATABASE_CREATED_OK',htmlentities($user)."_".htmlentities($_POST['v_database']),htmlentities($user)."_".htmlentities($_POST['v_database'])); - $_SESSION['ok_msg'] .= " / " . __('open %s',$db_admin) . ""; + $_SESSION['ok_msg'] .= " / " . __('open %s',$db_admin) . ""; unset($v_database); unset($v_dbuser); unset($v_password); diff --git a/web/add/dns/index.php b/web/add/dns/index.php index b9e47abe..7c18faab 100644 --- a/web/add/dns/index.php +++ b/web/add/dns/index.php @@ -80,7 +80,7 @@ if (!empty($_POST['ok'])) { // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain'])); + $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',htmlentities($_POST[v_domain]),htmlentities($_POST[v_domain])); unset($v_domain); } } @@ -128,7 +128,7 @@ if (!empty($_POST['ok_rec'])) { // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('DNS_RECORD_CREATED_OK',htmlentities($_POST['v_rec']),htmlentities($_POST['v_domain'])); + $_SESSION['ok_msg'] = __('DNS_RECORD_CREATED_OK',htmlentities($_POST[v_rec]),htmlentities($_POST[v_domain])); unset($v_domain); unset($v_rec); unset($v_val); diff --git a/web/add/favorite/index.php b/web/add/favorite/index.php index a3054d99..e9f2e828 100644 --- a/web/add/favorite/index.php +++ b/web/add/favorite/index.php @@ -7,9 +7,10 @@ session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Check token -if ((!isset($_REQUEST['token'])) || ($_SESSION['token'] != $_REQUEST['token'])) { - die("Wrong token"); -} +// if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { +// header('location: /login/'); +// exit(); +// } // Protect input $v_section = escapeshellarg($_REQUEST['v_section']); diff --git a/web/add/firewall/banlist/index.php b/web/add/firewall/banlist/index.php index a9f616a2..774421e6 100644 --- a/web/add/firewall/banlist/index.php +++ b/web/add/firewall/banlist/index.php @@ -15,12 +15,6 @@ if ($_SESSION['user'] != 'admin') { // Check POST request if (!empty($_POST['ok'])) { - // Check token - if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { - header('location: /login/'); - exit(); - } - // Check empty fields if (empty($_POST['v_chain'])) $errors[] = __('banlist'); if (empty($_POST['v_ip'])) $errors[] = __('ip address'); diff --git a/web/add/ip/index.php b/web/add/ip/index.php index 73f56b38..8746ed08 100644 --- a/web/add/ip/index.php +++ b/web/add/ip/index.php @@ -57,7 +57,7 @@ if (!empty($_POST['ok'])) { // Add IP if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface." ".$v_owner." ".$ip_status." ".$v_name." ".$v_nat, $output, $return_var); + exec (VESTA_CMD."v-add-sys-ip ".$v_ip." ".$v_netmask." ".$v_interface." ".$v_owner." '".$ip_status."' ".$v_name." ".$v_nat, $output, $return_var); check_return_code($return_var,$output); unset($output); $v_owner = $_POST['v_owner']; @@ -75,12 +75,12 @@ if (!empty($_POST['ok'])) { } // List network interfaces -exec (VESTA_CMD."v-list-sys-interfaces json", $output, $return_var); +exec (VESTA_CMD."v-list-sys-interfaces 'json'", $output, $return_var); $interfaces = json_decode(implode('', $output), true); unset($output); // List users -exec (VESTA_CMD."v-list-sys-users json", $output, $return_var); +exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); $users = json_decode(implode('', $output), true); unset($output); diff --git a/web/add/mail/index.php b/web/add/mail/index.php index 6a8b6e9f..b260b465 100644 --- a/web/add/mail/index.php +++ b/web/add/mail/index.php @@ -186,8 +186,8 @@ if (!empty($_POST['ok_acc'])) { // Flush field values on success if (empty($_SESSION['error_msg'])) { - $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST['v_domain']),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST['v_domain'])); - $_SESSION['ok_msg'] .= " / " . __('open webmail') . ""; + $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain]),htmlentities(strtolower($_POST['v_account'])),htmlentities($_POST[v_domain])); + $_SESSION['ok_msg'] .= " / " . __('open webmail') . ""; unset($v_account); unset($v_password); unset($v_password); diff --git a/web/add/user/index.php b/web/add/user/index.php index b51f587d..2cc79287 100644 --- a/web/add/user/index.php +++ b/web/add/user/index.php @@ -93,14 +93,13 @@ if (!empty($_POST['ok'])) { $mailtext = _translate($_POST['v_language'],'GREETINGS'); } $mailtext .= _translate($_POST['v_language'],'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']); - if (isset($login_url)) $mailtext=str_replace('/login/', '/?'.$login_url, $mailtext); send_email($to, $subject, $mailtext, $from); } // Flush field values on success if (empty($_SESSION['error_msg'])) { $_SESSION['ok_msg'] = __('USER_CREATED_OK',htmlentities($_POST['v_username']),htmlentities($_POST['v_username'])); - $_SESSION['ok_msg'] .= " / " . __('login as') ." ".htmlentities($_POST['v_username']). ""; + $_SESSION['ok_msg'] .= " / " . __('login as') ." ".htmlentities($_POST['v_username']). ""; unset($v_username); unset($v_password); unset($v_email); diff --git a/web/add/web/index.php b/web/add/web/index.php index e11cff23..e6448c91 100644 --- a/web/add/web/index.php +++ b/web/add/web/index.php @@ -118,7 +118,7 @@ if (!empty($_POST['ok'])) { // Add web domain if (empty($_SESSION['error_msg'])) { - exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." no ".$aliases." ".$proxy_ext, $output, $return_var); + exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." 'no' ".$aliases." ".$proxy_ext, $output, $return_var); check_return_code($return_var,$output); unset($output); $domain_added = empty($_SESSION['error_msg']); @@ -126,7 +126,7 @@ if (!empty($_POST['ok'])) { // Add DNS domain if (($_POST['v_dns'] == 'on') && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_public_ip." '' '' '' '' '' '' '' '' no", $output, $return_var); + exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_public_ip." '' '' '' '' '' '' '' '' 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -136,7 +136,7 @@ if (!empty($_POST['ok'])) { foreach ($aliases_arr as $alias) { if ($alias != "www.".$_POST['v_domain']) { $alias = escapeshellarg($alias); - exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$alias." ".$v_ip." no", $output, $return_var); + exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$alias." ".$v_ip." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -153,7 +153,7 @@ if (!empty($_POST['ok'])) { // Delete proxy support if ((!empty($_SESSION['PROXY_SYSTEM'])) && ($_POST['v_proxy'] == 'off') && (empty($_SESSION['error_msg']))) { $ext = escapeshellarg($ext); - exec (VESTA_CMD."v-delete-web-domain-proxy ".$user." ".$v_domain." no", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-proxy ".$user." ".$v_domain." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -195,7 +195,7 @@ if (!empty($_POST['ok'])) { } $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); - exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." no", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -323,7 +323,7 @@ if (!empty($_POST['ok'])) { } if (!empty($_SESSION['error_msg']) && $domain_added) { - $_SESSION['ok_msg'] = __('WEB_DOMAIN_CREATED_OK',htmlentities($_POST['v_domain']),htmlentities($_POST['v_domain'])); + $_SESSION['ok_msg'] = __('WEB_DOMAIN_CREATED_OK',htmlentities($_POST[v_domain]),htmlentities($_POST[v_domain])); $_SESSION['flash_error_msg'] = $_SESSION['error_msg']; $url = '/edit/web/?domain='.strtolower(preg_replace("/^www\./i", "", $_POST['v_domain'])); header('Location: ' . $url); diff --git a/web/api/index.php b/web/api/index.php index 949ac689..97f08259 100644 --- a/web/api/index.php +++ b/web/api/index.php @@ -1,81 +1,33 @@ 0 ) { - echo 'Error: authentication failed'; - exit; - } + $v_ip_addr = escapeshellarg($_SERVER["REMOTE_ADDR"]); + exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$v_ip_addr."'", $output, $auth_code); + unlink($v_password); } else { $key = '/usr/local/vesta/data/keys/' . basename($_POST['hash']); if (file_exists($key) && is_file($key)) { - exec(VESTA_CMD ."v-check-api-key ".escapeshellarg($key)." ".$v_ip, $output, $return_var); - unset($output); - - // Check API answer - if ( $return_var > 0 ) { - echo 'Error: authentication failed'; - exit; - } - } else { - $return_var = 1; + $auth_code = '0'; } } - if ( $return_var > 0 ) { + if ($auth_code != 0 ) { echo 'Error: authentication failed'; exit; } @@ -116,7 +68,7 @@ if (isset($_POST['user']) || isset($_POST['hash'])) { // Check command if ($cmd == "'v-make-tmp-file'") { // Used in DNS Cluster - $fp = fopen('/tmp/'.basename($_POST['arg2']), 'w'); + $fp = fopen($_POST['arg2'], 'w'); fwrite($fp, $_POST['arg1']."\n"); fclose($fp); $return_var = 0; diff --git a/web/css/fonts/awesome5/fa-brands-400.svg b/web/css/fonts/awesome5/fa-brands-400.svg deleted file mode 100644 index 46ad237a..00000000 --- a/web/css/fonts/awesome5/fa-brands-400.svg +++ /dev/null @@ -1,3570 +0,0 @@ - - - - - -Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 - By Robert Madole -Copyright (c) Font Awesome - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/css/fonts/awesome5/fa-brands-400.ttf b/web/css/fonts/awesome5/fa-brands-400.ttf deleted file mode 100644 index 948a2a6c..00000000 Binary files a/web/css/fonts/awesome5/fa-brands-400.ttf and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-brands-400.woff b/web/css/fonts/awesome5/fa-brands-400.woff deleted file mode 100644 index 2a89d521..00000000 Binary files a/web/css/fonts/awesome5/fa-brands-400.woff and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-brands-400.woff2 b/web/css/fonts/awesome5/fa-brands-400.woff2 deleted file mode 100644 index 141a90a9..00000000 Binary files a/web/css/fonts/awesome5/fa-brands-400.woff2 and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-regular-400.eot b/web/css/fonts/awesome5/fa-regular-400.eot deleted file mode 100644 index 38cf2517..00000000 Binary files a/web/css/fonts/awesome5/fa-regular-400.eot and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-regular-400.svg b/web/css/fonts/awesome5/fa-regular-400.svg deleted file mode 100644 index 48634a9a..00000000 --- a/web/css/fonts/awesome5/fa-regular-400.svg +++ /dev/null @@ -1,803 +0,0 @@ - - - - - -Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 - By Robert Madole -Copyright (c) Font Awesome - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web/css/fonts/awesome5/fa-regular-400.ttf b/web/css/fonts/awesome5/fa-regular-400.ttf deleted file mode 100644 index abe99e20..00000000 Binary files a/web/css/fonts/awesome5/fa-regular-400.ttf and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-regular-400.woff b/web/css/fonts/awesome5/fa-regular-400.woff deleted file mode 100644 index 24de566a..00000000 Binary files a/web/css/fonts/awesome5/fa-regular-400.woff and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-regular-400.woff2 b/web/css/fonts/awesome5/fa-regular-400.woff2 deleted file mode 100644 index 7e0118e5..00000000 Binary files a/web/css/fonts/awesome5/fa-regular-400.woff2 and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-solid-900.eot b/web/css/fonts/awesome5/fa-solid-900.eot deleted file mode 100644 index d3b77c22..00000000 Binary files a/web/css/fonts/awesome5/fa-solid-900.eot and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-solid-900.ttf b/web/css/fonts/awesome5/fa-solid-900.ttf deleted file mode 100644 index 5b979039..00000000 Binary files a/web/css/fonts/awesome5/fa-solid-900.ttf and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-solid-900.woff b/web/css/fonts/awesome5/fa-solid-900.woff deleted file mode 100644 index beec7917..00000000 Binary files a/web/css/fonts/awesome5/fa-solid-900.woff and /dev/null differ diff --git a/web/css/fonts/awesome5/fa-solid-900.woff2 b/web/css/fonts/awesome5/fa-solid-900.woff2 deleted file mode 100644 index 978a681a..00000000 Binary files a/web/css/fonts/awesome5/fa-solid-900.woff2 and /dev/null differ diff --git a/web/css/fonts/font_awesome5.css b/web/css/fonts/font_awesome5.css deleted file mode 100644 index d299e20b..00000000 --- a/web/css/fonts/font_awesome5.css +++ /dev/null @@ -1,5 +0,0 @@ -/*! - * Font Awesome Free 5.13.0 by @fontawesome - https://fontawesome.com - * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License) - */ -.fa,.fab,.fad,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-webkit-transform:scaleY(-1);transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1);transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-acquisitions-incorporated:before{content:"\f6af"}.fa-ad:before{content:"\f641"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adobe:before{content:"\f778"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-air-freshener:before{content:"\f5d0"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-alipay:before{content:"\f642"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-ankh:before{content:"\f644"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-alt:before{content:"\f5d1"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-artstation:before{content:"\f77a"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-atlassian:before{content:"\f77b"}.fa-atom:before{content:"\f5d2"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before{content:"\f77d"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-bacon:before{content:"\f7e5"}.fa-bahai:before{content:"\f666"}.fa-balance-scale:before{content:"\f24e"}.fa-balance-scale-left:before{content:"\f515"}.fa-balance-scale-right:before{content:"\f516"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-battle-net:before{content:"\f835"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bible:before{content:"\f647"}.fa-bicycle:before{content:"\f206"}.fa-biking:before{content:"\f84a"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blind:before{content:"\f29d"}.fa-blog:before{content:"\f781"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-reader:before{content:"\f5da"}.fa-bookmark:before{content:"\f02e"}.fa-bootstrap:before{content:"\f836"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before{content:"\f853"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-box-tissue:before{content:"\f95b"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-bread-slice:before{content:"\f7ec"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-business-time:before{content:"\f64a"}.fa-buy-n-large:before{content:"\f8a6"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-calendar-week:before{content:"\f784"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-campground:before{content:"\f6bb"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-car-alt:before{content:"\f5de"}.fa-car-battery:before{content:"\f5df"}.fa-car-crash:before{content:"\f5e1"}.fa-car-side:before{content:"\f5e4"}.fa-caravan:before{content:"\f8ff"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-charging-station:before{content:"\f5e7"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-city:before{content:"\f64f"}.fa-clinic-medical:before{content:"\f7f2"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-compress-alt:before{content:"\f422"}.fa-compress-arrows-alt:before{content:"\f78c"}.fa-concierge-bell:before{content:"\f562"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-cotton-bureau:before{content:"\f89e"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-credit-card:before{content:"\f09d"}.fa-critical-role:before{content:"\f6c9"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dailymotion:before{content:"\f952"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-democrat:before{content:"\f747"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dharmachakra:before{content:"\f655"}.fa-dhl:before{content:"\f790"}.fa-diagnoses:before{content:"\f470"}.fa-diaspora:before{content:"\f791"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-directions:before{content:"\f5eb"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-disease:before{content:"\f7fa"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-ethernet:before{content:"\f796"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-evernote:before{content:"\f839"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-alt:before{content:"\f424"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fan:before{content:"\f863"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-faucet:before{content:"\f905"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-figma:before{content:"\f799"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-alt:before{content:"\f7e4"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-firefox-browser:before{content:"\f907"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-fist-raised:before{content:"\f6de"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-funnel-dollar:before{content:"\f662"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-cheers:before{content:"\f79f"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glass-whiskey:before{content:"\f7a0"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-globe-europe:before{content:"\f7a2"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guitar:before{content:"\f7a6"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hackerrank:before{content:"\f5f7"}.fa-hamburger:before{content:"\f805"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-medical:before{content:"\f95c"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-holding-water:before{content:"\f4c1"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-sparkles:before{content:"\f95d"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-hands-wash:before{content:"\f95e"}.fa-handshake:before{content:"\f2b5"}.fa-handshake-alt-slash:before{content:"\f95f"}.fa-handshake-slash:before{content:"\f960"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-hat:before{content:"\f807"}.fa-hashtag:before{content:"\f292"}.fa-hat-cowboy:before{content:"\f8c0"}.fa-hat-cowboy-side:before{content:"\f8c1"}.fa-hat-wizard:before{content:"\f6e8"}.fa-hdd:before{content:"\f0a0"}.fa-head-side-cough:before{content:"\f961"}.fa-head-side-cough-slash:before{content:"\f962"}.fa-head-side-mask:before{content:"\f963"}.fa-head-side-virus:before{content:"\f964"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-broken:before{content:"\f7a9"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hiking:before{content:"\f6ec"}.fa-hippo:before{content:"\f6ed"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hospital-user:before{content:"\f80d"}.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-house-damage:before{content:"\f6f1"}.fa-house-user:before{content:"\f965"}.fa-houzz:before{content:"\f27c"}.fa-hryvnia:before{content:"\f6f2"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-ideal:before{content:"\f913"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-instagram-square:before{content:"\f955"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi:before{content:"\f669"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-journal-whills:before{content:"\f66a"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaaba:before{content:"\f66b"}.fa-kaggle:before{content:"\f5fa"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-khanda:before{content:"\f66d"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-landmark:before{content:"\f66f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-house:before{content:"\f966"}.fa-laptop-medical:before{content:"\f812"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lungs:before{content:"\f604"}.fa-lungs-virus:before{content:"\f967"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mail-bulk:before{content:"\f674"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-markdown:before{content:"\f60f"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mask:before{content:"\f6fa"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-mdb:before{content:"\f8ca"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mendeley:before{content:"\f7b3"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-meteor:before{content:"\f753"}.fa-microblog:before{content:"\f91a"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mitten:before{content:"\f7b5"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mixer:before{content:"\f956"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-motorcycle:before{content:"\f21c"}.fa-mountain:before{content:"\f6fc"}.fa-mouse:before{content:"\f8cc"}.fa-mouse-pointer:before{content:"\f245"}.fa-mug-hot:before{content:"\f7b6"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-oil-can:before{content:"\f613"}.fa-old-republic:before{content:"\f510"}.fa-om:before{content:"\f679"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-orcid:before{content:"\f8d2"}.fa-osi:before{content:"\f41a"}.fa-otter:before{content:"\f700"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-pager:before{content:"\f815"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-pastafarianism:before{content:"\f67b"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-penny-arcade:before{content:"\f704"}.fa-people-arrows:before{content:"\f968"}.fa-people-carry:before{content:"\f4ce"}.fa-pepper-hot:before{content:"\f816"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-person-booth:before{content:"\f756"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-square-alt:before{content:"\f87b"}.fa-phone-volume:before{content:"\f2a0"}.fa-photo-video:before{content:"\f87c"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-square:before{content:"\f91e"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-plane-slash:before{content:"\f969"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poll:before{content:"\f681"}.fa-poll-h:before{content:"\f682"}.fa-poo:before{content:"\f2fe"}.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-pray:before{content:"\f683"}.fa-praying-hands:before{content:"\f684"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pump-medical:before{content:"\f96a"}.fa-pump-soap:before{content:"\f96b"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-quran:before{content:"\f687"}.fa-r-project:before{content:"\f4f7"}.fa-radiation:before{content:"\f7b9"}.fa-radiation-alt:before{content:"\f7ba"}.fa-rainbow:before{content:"\f75b"}.fa-random:before{content:"\f074"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-record-vinyl:before{content:"\f8d9"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redhat:before{content:"\f7bc"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-remove-format:before{content:"\f87d"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-republican:before{content:"\f75e"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-rev:before{content:"\f5b2"}.fa-ribbon:before{content:"\f4d6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-route:before{content:"\f4d7"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-running:before{content:"\f70c"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-scroll:before{content:"\f70e"}.fa-sd-card:before{content:"\f7c2"}.fa-search:before{content:"\f002"}.fa-search-dollar:before{content:"\f688"}.fa-search-location:before{content:"\f689"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-shapes:before{content:"\f61f"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-shield-virus:before{content:"\f96c"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopify:before{content:"\f957"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-sim-card:before{content:"\f7c4"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skating:before{content:"\f7c5"}.fa-sketch:before{content:"\f7c6"}.fa-skiing:before{content:"\f7c9"}.fa-skiing-nordic:before{content:"\f7ca"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-sms:before{content:"\f7cd"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowboarding:before{content:"\f7ce"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-soap:before{content:"\f96e"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-down-alt:before{content:"\f884"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-amount-up-alt:before{content:"\f885"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-square-root-alt:before{content:"\f698"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-stopwatch-20:before{content:"\f96f"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-store-alt-slash:before{content:"\f970"}.fa-store-slash:before{content:"\f971"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-suse:before{content:"\f7d6"}.fa-swatchbook:before{content:"\f5c3"}.fa-swift:before{content:"\f8e1"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-symfony:before{content:"\f83d"}.fa-synagogue:before{content:"\f69b"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-tenge:before{content:"\f7d7"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-the-red-yeti:before{content:"\f69d"}.fa-theater-masks:before{content:"\f630"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-think-peaks:before{content:"\f731"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toilet-paper-slash:before{content:"\f972"}.fa-toolbox:before{content:"\f552"}.fa-tools:before{content:"\f7d9"}.fa-tooth:before{content:"\f5c9"}.fa-torah:before{content:"\f6a0"}.fa-torii-gate:before{content:"\f6a1"}.fa-tractor:before{content:"\f722"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-trailer:before{content:"\f941"}.fa-train:before{content:"\f238"}.fa-tram:before{content:"\f7da"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-trash-restore:before{content:"\f829"}.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbraco:before{content:"\f8e8"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-unity:before{content:"\f949"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-injured:before{content:"\f728"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-virus:before{content:"\f974"}.fa-virus-slash:before{content:"\f975"}.fa-viruses:before{content:"\f976"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-voicemail:before{content:"\f897"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-mute:before{content:"\f6a9"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vote-yea:before{content:"\f772"}.fa-vr-cardboard:before{content:"\f729"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-water:before{content:"\f773"}.fa-wave-square:before{content:"\f83e"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-wind:before{content:"\f72e"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wpressr:before{content:"\f3e4"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.fa-zhihu:before{content:"\f63f"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:400;font-display:block;src:url(/css/fonts/awesome5/fa-brands-400.eot);src:url(/css/fonts/awesome5/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(/css/fonts/awesome5/fa-brands-400.woff2) format("woff2"),url(/css/fonts/awesome5/fa-brands-400.woff) format("woff"),url(/css/fonts/awesome5/fa-brands-400.ttf) format("truetype"),url(/css/fonts/awesome5/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands"}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:block;src:url(/css/fonts/awesome5/fa-regular-400.eot);src:url(/css/fonts/awesome5/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(/css/fonts/awesome5/fa-regular-400.woff2) format("woff2"),url(/css/fonts/awesome5/fa-regular-400.woff) format("woff"),url(/css/fonts/awesome5/fa-regular-400.ttf) format("truetype"),url(/css/fonts/awesome5/fa-regular-400.svg#fontawesome) format("svg")}.fab,.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:block;src:url(/css/fonts/awesome5/fa-solid-900.eot);src:url(/css/fonts/awesome5/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(/css/fonts/awesome5/fa-solid-900.woff2) format("woff2"),url(/css/fonts/awesome5/fa-solid-900.woff) format("woff"),url(/css/fonts/awesome5/fa-solid-900.ttf) format("truetype"),url(/css/fonts/awesome5/fa-solid-900.svg#fontawesome) format("svg")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900} \ No newline at end of file diff --git a/web/css/fonts/font_lobster.css b/web/css/fonts/font_lobster.css deleted file mode 100644 index 29ef5db3..00000000 --- a/web/css/fonts/font_lobster.css +++ /dev/null @@ -1,7 +0,0 @@ -@font-face { - font-family: 'Lobster'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/css/fonts/lobster/neILzCirqoswsqX9_oU.ttf) format('truetype'); -} diff --git a/web/css/fonts/font_sans_pro.css b/web/css/fonts/font_sans_pro.css deleted file mode 100644 index 6562e076..00000000 --- a/web/css/fonts/font_sans_pro.css +++ /dev/null @@ -1,84 +0,0 @@ -@font-face { - font-family: 'Source Sans Pro'; - font-style: italic; - font-weight: 200; - font-display: swap; - src: url(/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZYokRdr.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: italic; - font-weight: 300; - font-display: swap; - src: url(/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZMkhdr.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: italic; - font-weight: 400; - font-display: swap; - src: url(/css/fonts/sanspro/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPa7g.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: italic; - font-weight: 600; - font-display: swap; - src: url(/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lBdr.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: italic; - font-weight: 700; - font-display: swap; - src: url(/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZclRdr.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: italic; - font-weight: 900; - font-display: swap; - src: url(/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZklxdr.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 200; - font-display: swap; - src: url(/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i94_AkA.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 300; - font-display: swap; - src: url(/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zAkA.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url(/css/fonts/sanspro/6xK3dSBYKcSV-LCoeQqfX1RYOo3aPw.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 600; - font-display: swap; - src: url(/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rAkA.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: url(/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vAkA.ttf) format('truetype'); -} -@font-face { - font-family: 'Source Sans Pro'; - font-style: normal; - font-weight: 900; - font-display: swap; - src: url(/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nAkA.ttf) format('truetype'); -} diff --git a/web/css/fonts/lobster/neILzCirqoswsqX9_oU.ttf b/web/css/fonts/lobster/neILzCirqoswsqX9_oU.ttf deleted file mode 100644 index a7f729d3..00000000 Binary files a/web/css/fonts/lobster/neILzCirqoswsqX9_oU.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPa7g.ttf b/web/css/fonts/sanspro/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPa7g.ttf deleted file mode 100644 index 01223b86..00000000 Binary files a/web/css/fonts/sanspro/6xK1dSBYKcSV-LCoeQqfX1RYOo3qPa7g.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xK3dSBYKcSV-LCoeQqfX1RYOo3aPw.ttf b/web/css/fonts/sanspro/6xK3dSBYKcSV-LCoeQqfX1RYOo3aPw.ttf deleted file mode 100644 index 5447a5ff..00000000 Binary files a/web/css/fonts/sanspro/6xK3dSBYKcSV-LCoeQqfX1RYOo3aPw.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lBdr.ttf b/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lBdr.ttf deleted file mode 100644 index 65a76bfd..00000000 Binary files a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZY4lBdr.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZYokRdr.ttf b/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZYokRdr.ttf deleted file mode 100644 index b814440f..00000000 Binary files a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZYokRdr.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZMkhdr.ttf b/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZMkhdr.ttf deleted file mode 100644 index a9a32e42..00000000 Binary files a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZMkhdr.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZclRdr.ttf b/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZclRdr.ttf deleted file mode 100644 index 2e10a398..00000000 Binary files a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZclRdr.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZklxdr.ttf b/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZklxdr.ttf deleted file mode 100644 index 4bd30ff9..00000000 Binary files a/web/css/fonts/sanspro/6xKwdSBYKcSV-LCoeQqfX1RYOo3qPZZklxdr.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rAkA.ttf b/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rAkA.ttf deleted file mode 100644 index 9f8a3453..00000000 Binary files a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i54rAkA.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i94_AkA.ttf b/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i94_AkA.ttf deleted file mode 100644 index 3ba2f35b..00000000 Binary files a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3i94_AkA.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vAkA.ttf b/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vAkA.ttf deleted file mode 100644 index 388869cd..00000000 Binary files a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ig4vAkA.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zAkA.ttf b/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zAkA.ttf deleted file mode 100644 index e9008d32..00000000 Binary files a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3ik4zAkA.ttf and /dev/null differ diff --git a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nAkA.ttf b/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nAkA.ttf deleted file mode 100644 index 9acf5854..00000000 Binary files a/web/css/fonts/sanspro/6xKydSBYKcSV-LCoeQqfX1RYOo3iu4nAkA.ttf and /dev/null differ diff --git a/web/css/styles.fix.css.map b/web/css/styles.fix.css.map deleted file mode 100644 index c6718a78..00000000 --- a/web/css/styles.fix.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sourceRoot":"","sources":["styles.fix.scss"],"names":[],"mappings":";AAAA;EACI;EACA;EACA;;;AAMJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;EACA;EACA;EACA;;AAOJ;EACI;EACA;EACA;EACA;;AAOJ;EACI;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;;AAEA;EACI;EACA;;AAEA;EACI;;AAMR;EACI;;AAEA;EACI;AACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;;AAII;EACI;EACA;EACA;;AAEA;EACI;;AAEJ;EACI;;AAMJ;EACI;EACA;EACA;EACA;EACA;;AAQZ;EACI;;AAEA;EACI;;AAIR;EACI;;AAGJ;EACI;;AAKZ;EACI;;;AAQR;EACI;EACA;;AAEA;EACI;;AAEA;EACI;EACA;EAGA;EACA;EACA;EACA;EACA;EACA;EACA;EAyCA;EAEA;AAAwB;EACxB;AAAgC;AAEhC;AAMA;AAKA;;AAVA;EACI;EACA;;AAIJ;EACI;;AAIJ;EACI;;AAIJ;AACI;;AACA;EACI;;AAKR;EAEI;EAKA;EACA;EACA;EACA;EACA;EAGA;EACA;;AAIJ;EACI;;AAEA;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAQZ;EACI;EACA;;AAII;EACI;;AAEA;EACI;;AAMZ;EACI;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAIR;EACI;;AAEA;EAEI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAIA;EAEA;EACA;EACA;EAEA;;AA8BA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAIA;EAEA;EACA;EACA;EAEA;;AAIR;EACI;EACA;EACA;EACA;;AASR;EACI;;AAKA;EACI;;AAEJ;EAEI;;AAEJ;EACI;;AAQR;EACI;;AAKA;EACI;;AAEJ;EACI;;AAEJ;EACI;;AAQR;EACI;;AAKA;EACI;;AAEJ;EACI;;AAEJ;EACI;;AAQR;EACI;;AAKA;EACI;;AAEJ;EACI;;AAEJ;EACI;;AAQR;EACI;;AAKA;EACI;;AAEJ;EACI;;AAEJ;EACI;;AAQR;EACI;;AAKA;EACI;;AAEJ;EACI;;AAEJ;EACI;;AAQR;EACI;;AAKA;EACI;;AAEJ;EACI;;AAEJ;EACI;;AAWxB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAcJ;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;;AAiBgB;EACI;EACA;;AAGJ;EACI;;AAqCZ;EACI;;AAmBxB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAEI;;AAOI;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAUR;EACI;;AAQZ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAOJ;EACI;;AAYZ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAQR;EACI;;AAEA;EACI;;AAGR;EACI;EAEA;;AAEA;EACI;;AAGR;EACI;EACA;;AAEA;EACI;;AAGR;EACI;;AAEA;EACI;;AAGR;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EAEA;EACA;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EAII;EACA;EACA;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKZ;EACI;EACA;EACA;;AAEJ;EACI;EACA;;AAEA;EACI;;AAUJ;EACI;EACA;EACA;EACA;;AA0BR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;EAQA;EAEA;AAAwB;AAExB;AAKA;AAKA;AAMA;;AAfA;EACI;;AAIJ;EACI;;AAIJ;EACI;EACA;;AAIJ;EACI;EACA;;AAGJ;EACI;;AAIJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAKR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIA;EACI;;AAKJ;EACI;;AAKJ;EACI;;AAKJ;EACI;;;AA8CxB;EACI;;;AAGJ;EACI;;;AAEJ;EACI;;;AAGJ;EACI;;;AAIJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAQwB;EACI;EACA;EACA;;AAEA;EACI;EACA;AACA;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;;AAEA;EACI;;AAIZ;EACI;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAKR;EACI;EACA;EACA;EACA;;AAUhC;EACI;;;AAMJ;EACI","file":"styles.fix.css"} \ No newline at end of file diff --git a/web/css/styles.min.css b/web/css/styles.min.css index d84a6a85..302f9c01 100644 --- a/web/css/styles.min.css +++ b/web/css/styles.min.css @@ -1,18 +1,168 @@ +/* Syntax Quick Reference + -------------------------- + column($ratios: 1, $offset: 0, $cycle: 0, $uncycle: 0, $gutter: $jeet-gutter) + span($ratio: 1, $offset: 0) + shift($ratios: 0, $col_or_span: column, $gutter: $jeet-gutter) + unshift() + edit() + center($max_width: 1410px, $pad: 0) + stack($pad: 0, $align: false) + unstack() + align($direction: both) + cf() +*/ +/** + * Grid settings. + * All values are defaults and can therefore be easily overidden. + */ +/** + * List functions courtesy of the wonderful folks at Team Sass. + * Check out their awesome grid: Singularity. + */ +/** + * Get percentage from a given ratio. + * @param {number} [$ratio=1] - The column ratio of the element. + * @returns {number} - The percentage value. + */ +/** + * Work out the column widths based on the ratio and gutter sizes. + * @param {number} [$ratios=1] - The column ratio of the element. + * @param {number} [$gutter=$jeet-gutter] - The gutter for the column. + * @returns {list} $width $gutter - A list containing the with and gutter for the element. + */ +/** + * Get the set layout direction for the project. + * @returns {string} $direction - The layout direction. + */ +/** + * Replace a specified list value with a new value (uses built in set-nth() if available) + * @param {list} $list - The list of values you want to alter. + * @param {number} $index - The index of the list item you want to replace. + * @param {*} $value - The value you want to replace $index with. + * @returns {list} $list - The list with the value replaced or removed. + * @warn if an invalid index is supplied. + */ +/** + * Reverse a list (progressively enhanced for Sass 3.3) + * @param {list} $list - The list of values you want to reverse. + * @returns {list} $result - The reversed list. + */ +/** + * Get the opposite direction to a given value. + * @param {string} $dir - The direction you want the opposite of. + * @returns {string} - The opposite direction to $dir. + * @warn if an incorrect string is provided. + */ +/** + * Style an element as a column with a gutter. + * @param {number} [$ratios=1] - A width relative to its container as a fraction. + * @param {number} [$offset=0] - A offset specified as a fraction (see $ratios). + * @param {number} [$cycle=0] - Easily create an nth column grid where $cycle equals the number of columns. + * @param {number} [$uncycle=0] - Undo a previous cycle value to allow for a new one. + * @param {number} [$gutter=$jeet-gutter] - Specify the gutter width as a percentage of the containers width. + */ +/** + * An alias for the column mixin. + * @param [$args...] - All arguments get passed through to column(). + */ +/** + * Get the width of a column and nothing else. + * @param {number} [$ratios=1] - A width relative to its container as a fraction. + * @param {number} [$gutter=$jeet-gutter] - Specify the gutter width as a percentage of the containers width. + */ +/** + * Get the gutter size of a column and nothing else. + * @param {number} [ratios=1] - A width relative to its container as a fraction. + * @param {number} [gutter=jeet.gutter] - Specify the gutter width as a percentage of the containers width. + */ +/** + * An alias for the column-width function. + * @param [$args...] - All arguments get passed through to column(). + */ +/** + * An alias for the column-gutter function. + * @param [$args...] - All arguments get passed through to column(). + */ +/** + * Style an element as a column without any gutters for a seamless row. + * @param {number} [$ratios=1] - A width relative to its container as a fraction. + * @param {number} [$offset=0] - A offset specified as a fraction (see $ratios). + * @param {number} [cycle=0] - Easily create an nth column grid where cycle equals the number of columns. + * @param {number} [uncycle=0] - Undo a previous cycle value to allow for a new one. + */ +/** + * Reorder columns without altering the HTML. + * @param {number} [$ratios=0] - Specify how far along you want the element to move. + * @param {string} [$col-or-span=column] - Specify whether the element has a gutter or not. + * @param {number} [$gutter=$jeet-gutter] - Specify the gutter width as a percentage of the containers width. + */ +/** + * Reset an element that has had shift() applied to it. + */ +/** + * View the grid and its layers for easy debugging. + * @param {string} [$color=black] - The background tint applied. + * @param {boolean} [$important=false] - Whether to apply the style as !important. + */ +/** + * Alias for edit(). + */ +/** + * Horizontally center an element. + * @param {number} [$max-width=1410px] - The max width the element can be. + * @param {number} [$pad=0] - Specify the element's left and right padding. + */ +/** + * Uncenter an element. + */ +/** + * Stack an element so that nothing is either side of it. + * @param {number} [$pad=0] - Specify the element's left and right padding. + * @param {boolean/string} [$align=false] - Specify the text align for the element. + */ +/** + * Unstack an element. + */ +/** + * Center an element on either or both axes. + * @requires A parent container with relative positioning. + * @param {string} [$direction=both] - Specify which axes to center the element on. + */ +/** + * Apply a clearfix to an element. + */ +/* ========================================================================== + Normalize.scss settings + ========================================================================== */ +/** + * Includes legacy browser support IE6/7 + * + * Set to false if you want to drop support for IE6 and IE7 + */ +/* Base + ========================================================================== */ +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + * 3. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using + * `em` units. + */ html { - font-family: sans-serif; - /* 1 */ - -ms-text-size-adjust: 100%; - /* 2 */ - -webkit-text-size-adjust: 100%; - /* 2 */ + font-family: sans-serif; + /* 1 */ + -ms-text-size-adjust: 100%; + /* 2 */ + -webkit-text-size-adjust: 100%; + /* 2 */ } /** * Remove default margin. */ body { - margin: 0; - background-color: #fff; + margin: 0; + background-color: #fff; } /* HTML5 display definitions @@ -23,19 +173,34 @@ body { * and Firefox. * Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { - display: block; +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; } /** * 1. Correct `inline-block` display not defined in IE 6/7/8/9 and Firefox 3. * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { - display: inline-block; - /* 1 */ - vertical-align: baseline; - /* 2 */ +audio, +canvas, +progress, +video { + display: inline-block; + /* 1 */ + vertical-align: baseline; + /* 2 */ } /** @@ -43,55 +208,61 @@ audio, canvas, progress, video { * Remove excess height in iOS 5 devices. */ audio:not([controls]) { - display: none; - height: 0; + display: none; + height: 0; } /** * Address `[hidden]` styling not present in IE 8/9/10. * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template, .hidden { - display: none; +[hidden], +template { + display: none; } +.hidden { + display: none; +} /* Links ========================================================================== */ /** * Remove the gray background color from active links in IE 10. */ a { - background-color: transparent; -} -a:active, a:hover { - outline: 0; + background-color: transparent; } /** * Improve readability when focused and also mouse hovered in all browsers. */ +a:active, a:hover { + outline: 0; +} + /* Text-level semantics ========================================================================== */ /** * Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ abbr[title] { - border-bottom: 1px dotted; + border-bottom: 1px dotted; } /** * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { - font-weight: bold; - color: #5f5f5f; +b, +strong { + font-weight: bold; + color: #5f5f5f; } /** * Address styling not present in Safari and Chrome. */ dfn { - font-style: italic; + font-style: italic; } /** @@ -99,45 +270,42 @@ dfn { * contexts in Firefox 4+, Safari, and Chrome. */ h1 { - font-size: 2em; - margin: 0.67em 0; + font-size: 2em; + margin: 0.67em 0; } /** * Addresses styling not present in IE 8/9. */ mark { - background: #ff0; - color: #000; + background: #ff0; + color: #000; } /** * Address inconsistent and variable font size in all browsers. */ small { - font-size: 80%; + font-size: 80%; } /** * Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; } sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; - top: -0.5em; + top: -0.5em; } sub { - bottom: -0.25em; + bottom: -0.25em; } /* Embedded content @@ -147,14 +315,14 @@ sub { * 2. Improves image quality when scaled in IE 7. */ img { - border: 0; + border: 0; } /** * Correct overflow not hidden in IE 9/10/11. */ svg:not(:root) { - overflow: hidden; + overflow: hidden; } /* Grouping content @@ -163,31 +331,34 @@ svg:not(:root) { * Address margin not present in IE 8/9 and Safari. */ figure { - margin: 1em 40px; + margin: 1em 40px; } /** * Address differences between Firefox and other browsers. */ hr { - box-sizing: content-box; - height: 0; + box-sizing: content-box; + height: 0; } /** * Contain overflow in all browsers. */ pre { - overflow: auto; + overflow: auto; } /** * Address odd `em`-unit font size rendering in all browsers. * Correct font family set oddly in IE 6, Safari 4/5, and Chrome. */ -code, kbd, pre, samp { - font-family: monospace, monospace; - font-size: 1em; +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; } /* Forms @@ -203,23 +374,24 @@ code, kbd, pre, samp { * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. * 4. Improves appearance and consistency in all browsers. */ -button, input, optgroup, select, textarea { - color: inherit; - /* 1 */ - font: inherit; - /* 2 */ - margin: 0; - /* 3 */ +button, +input, +optgroup, +select, +textarea { + color: inherit; + /* 1 */ + font: inherit; + /* 2 */ + margin: 0; + /* 3 */ } /** * Address `overflow` set to `hidden` in IE 8/9/10/11. */ button { - overflow: visible; - text-transform: none; - /*color: transparent !important;*/ - text-shadow: 0 0 0 #555 !important; + overflow: visible; } /** @@ -228,10 +400,11 @@ button { * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. * Correct `select` style inheritance in Firefox. */ +button, select { - text-transform: none; - /*color: transparent !important;*/ - text-shadow: 0 0 0 #555 !important; + text-transform: none; + /*color: transparent !important;*/ + text-shadow: 0 0 0 #555 !important; } /** @@ -243,92 +416,93 @@ select { * 4. Removes inner spacing in IE 7 without affecting normal text inputs. * Known issue: inner spacing remains in IE 6. */ -button, html input[type=button] { - -webkit-appearance: button; - /* 2 */ - cursor: pointer; - /* 3 */ -} - -input[type=reset], input[type=submit] { - -webkit-appearance: button; - /* 2 */ - cursor: pointer; - /* 3 */ +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + /* 2 */ + cursor: pointer; + /* 3 */ } /** * Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { - cursor: default; +button[disabled], +html input[disabled] { + cursor: default; } /** * Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner { - border: 0; - padding: 0; -} - -input { - line-height: normal; -} +button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; - padding: 0; -} -input[type=checkbox], input[type=radio] { - box-sizing: border-box; - /* 1 */ - padding: 0; - /* 2 */ -} -input[type=number]::-webkit-inner-spin-button, input[type=number]::-webkit-outer-spin-button { - height: auto; -} -input[type=search] { - -webkit-appearance: textfield; - /* 1 */ - /* 2 */ - box-sizing: content-box; -} -input[type=search]::-webkit-search-cancel-button, input[type=search]::-webkit-search-decoration { - -webkit-appearance: none; + border: 0; + padding: 0; } /** * Address Firefox 4+ setting `line-height` on `input` using `!important` in * the UA stylesheet. */ +input { + line-height: normal; +} + /** * 1. Address box sizing set to `content-box` in IE 8/9/10. * 2. Remove excess padding in IE 8/9/10. * Known issue: excess padding remains in IE 6. */ +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ +} + /** * Fix the cursor style for Chrome's increment/decrement buttons. For certain * `font-size` values of the `input`, it causes the cursor style of the * decrement button to change from `default` to `text`. */ +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + /** * 1. Address `appearance` set to `searchfield` in Safari and Chrome. * 2. Address `box-sizing` set to `border-box` in Safari and Chrome * (include `-moz` to future-proof). */ +input[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + /* 2 */ + box-sizing: content-box; +} + /** * Remove inner padding and search cancel button in Safari and Chrome on OS X. * Safari (but not Chrome) clips the cancel button when the search input has * padding (and `textfield` appearance). */ +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + /** * Define consistent border, margin, and padding. */ fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: 0.35em 0.625em 0.75em; + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; } /** @@ -338,17 +512,17 @@ fieldset { * 4. Corrects alignment displayed oddly in IE 6/7. */ legend { - border: 0; - /* 1 */ - padding: 0; - /* 2 */ + border: 0; + /* 1 */ + padding: 0; + /* 2 */ } /** * Remove default vertical scrollbar in IE 8/9/10/11. */ textarea { - overflow: auto; + overflow: auto; } /** @@ -356,7 +530,7 @@ textarea { * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ optgroup { - font-weight: bold; + font-weight: bold; } /* Tables @@ -365,2248 +539,2249 @@ optgroup { * Remove most spacing between table cells. */ table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } -td, th { - padding: 0; +td, +th { + padding: 0; } * { - -webkit-tap-highlight-color: transparent; + -webkit-tap-highlight-color: transparent; } body { - /* -webkit-touch-callout: none; - -webkit-text-size-adjust: none; - -webkit-user-select: none; */ +/* -webkit-touch-callout: none; + -webkit-text-size-adjust: none; + -webkit-user-select: none; */ } -html, input, textarea, select, button { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; +html, +input, +textarea, +select, +button { + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } html { - height: 100%; + height: 100%; } body { - font-family: arial; - overflow-x: hidden; - font-size: 14px; - height: 100%; - color: #929292; + font-family: arial; + overflow-x: hidden; + font-size: 14px; + height: 100%; + color: #929292; } .body-login, .body-reset { - height: auto; - padding-top: 10%; - /*background: url(/images/edit_bg.png);*/ - background-color: #eee; + height: auto; + padding-top: 10%; + /*background: url(/images/edit_bg.png);*/ + background-color: #eee; } a { - text-decoration: none; - color: #929292; + text-decoration: none; + color: #929292; } .disabled { - text-decoration: line-through; + text-decoration: line-through; } -.clearfix:before { - content: ""; - display: table; -} +.clearfix:before, .clearfix:after { - content: ""; - display: table; - clear: both; + content: ''; + display: table; +} + +.clearfix:after { + clear: both; } .text-right { - text-align: right; + text-align: right; } .text-center { - text-align: center; + text-align: center; } .check-label { - display: inline-block; - cursor: pointer; - position: relative; - line-height: 16px; - padding-left: 26px; + display: inline-block; + cursor: pointer; + position: relative; + line-height: 16px; + padding-left: 26px; } + .check-label:before { - content: ""; - width: 16px; - height: 16px; - position: absolute; - left: 0; - top: 0; - display: inline-block; - background-image: url("/images/sprite.png?1446554104"); - background-size: 450px auto; - background-repeat: no-repeat; - background-position: -232px -9px; - z-index: 99; + content: ''; + width: 16px; + height: 16px; + position: absolute; + left: 0; + top: 0; + display: inline-block; + background-image: url("/images/sprite.png?1446554103"); + background-size: 450px auto; + background-repeat: no-repeat; + background-position: -232px -9px; + z-index: 99; } -input[type=checkbox] { - display: none; +input[type="checkbox"] { + display: none; } - -.clicked-on.check-label:before, .selected .check-label:before { - content: ""; - display: inline-block; - width: 27px; - height: 27px; - background-position: -225px -42px; - left: -6px; - top: -6px; +.clicked-on.check-label:before, +.selected .check-label:before { + content: ''; + display: inline-block; + width: 27px; + height: 27px; + background-position: -225px -42px; + left: -6px; + top: -6px; } .l-center { - margin: 0 auto; - max-width: 998px; + margin: 0 auto; + max-width: 998px; } .l-logo { - background-image: url("/images/sprite.png?1446554104"); - background-position: -117px -7px; - /* background-position: -125px -478px; */ - background-repeat: no-repeat; - display: inline-block; - float: left; - height: 22px; - margin-top: 4px; - width: 73px; - /* width: 42px; */ - margin-left: -2px; + background-image: url("/images/sprite.png?1446554103"); + background-position: -117px -7px; +/* background-position: -125px -478px; */ + background-repeat: no-repeat; + display: inline-block; + float: left; + height: 22px; + margin-top: 4px; + width: 73px; +/* width: 42px; */ + margin-left: -2px; } .l-header { - background-color: #5d5d5d; - overflow: hidden; - margin-bottom: 28px; - position: fixed; - width: 100%; - z-index: 100; - height: 34px; + background-color: #5d5d5d; + overflow: hidden; + margin-bottom: 28px; + position: fixed; + width: 100%; + z-index: 100; + height: 34px } .l-header a { - font-size: 12px; + font-size: 12px; +} + +.l-menu__item--active { + //background-color: #fff; } .l-menu__item.l-menu__item--active a { - color: #9c8cff; - font-size: 10px; - font-weight: bold; - text-transform: uppercase; - background-color: #fff; + color: #ff6701; + font-size: 10px; + font-weight: bold; + text-transform: uppercase; + background-color: #fff; } .l-menu { - float: left; - position: fixed; - margin-left: 70px; + float: left; + position: fixed; + margin-left: 70px; } - .l-menu__item { - float: left; + float: left; } .l-menu__item a { - color: #f7f7f7; - position: relative; - line-height: 34px; - padding: 11px 18px; + color: #f7f7f7; + position: relative; + line-height: 34px; + padding: 11px 18px; } .l-menu__item a:hover { - background-color: #f79b44; - color: #fff; + background-color: #f79b44; + color: #fff; } .l-menu__item a:active { - color: #fff; - background-color: #9c8cff; + color: #fff; + background-color: #ff6701; } .l-menu.active .l-menu__item.focus a { - text-decoration: underline; - color: #5edad0; + text-decoration: underline; + color: #5edad0; } .l-menu.active .l-menu__item.focus a:hover { - background-color: #f79b44; - color: #fff; + background-color: #f79b44; + color: #fff; } -.lang-ua .l-menu__item a, .lang-nl .l-menu__item a, .lang-fr .l-menu__item a, .lang-ru .l-menu__item a { - padding: 11px 18px; -} -.lang-el .l-menu__item a, .lang-tr .l-menu__item a { - padding: 11px 15px; +.lang-ua .l-menu__item a, +.lang-nl .l-menu__item a, +.lang-fr .l-menu__item a, +.lang-ru .l-menu__item a { + padding: 11px 18px; +} +.lang-el .l-menu__item a, +.lang-tr .l-menu__item a { + padding: 11px 15px; } - .lang-ar .l-menu__item a { - padding: 11px 11px; - line-height: 35px; + padding: 11px 11px; +} +.lang-ar .l-menu__item a { + line-height: 35px; } .lang-de .l-menu__item a { - padding: 11px 12px; + padding: 11px 12px; } .lang-tw .l-menu__item a { - padding: 13px 18px; + padding: 13px 18px; } .l-profile { - overflow: hidden; - float: right; + overflow: hidden; + float: right; } - .l-profile__username { - float: left; - color: #a4abad; - font-weight: 700; - padding: 10px 0 0 10px; - margin-right: 12px; + float: left; + color: #a4abad; + font-weight: 700; + padding: 10px 0 0 10px; + margin-right: 12px; } .l-profile__username:hover { - color: #ffd62e; + color: #ffd62e; } .l-profile__username:active { - color: #f79b44; + color: #f79b44; } + .l-profile__logout { - float: left; - color: #fff; - /* margin-left: 40px; */ - padding: 10px 0 0 10px; + float: left; + color: #fff; +/* margin-left: 40px; */ + padding: 10px 0 0 10px; } .l-profile__logout:hover { - color: #C0E60E; + color: #C0E60E; } .l-profile__logout:active { - color: #ffd62e; + color: #ffd62e; } - -.lang-cn .l-profile__logout, .lang-tw .l-profile__logout { - padding: 8px 5px; +.lang-cn .l-profile__logout { + padding: 8px 5px; +} +.lang-tw .l-profile__logout { + padding: 8px 5px; } .l-profile__notifications { - background: url("/images/sprite.png?1446554104") no-repeat scroll -129px -135px; - border-radius: 30px; - color: #fff; - cursor: pointer; - float: left; - font-weight: bold; - height: 15px; - margin-right: 4px; - margin-top: 5px; - padding: 10px 5px 0; - width: 15px; + background: url("/images/sprite.png?1446554103") no-repeat scroll -129px -135px; + border-radius: 30px; + color: #fff; + cursor: pointer; + float: left; + font-weight: bold; + height: 15px; + margin-right: 4px; + margin-top: 5px; + padding: 10px 5px 0; + width: 15px; } .l-profile__notifications.active { - background-color: #454545; + background-color: #454545; } .l-profile__notifications:hover { - background-color: #333; + background-color: #333; } .l-profile__notifications:active { - background-color: #c4da5e; + background-color: #c4da5e; } .l-profile__notifications.updates { - background-position: -202px -135px; + background-position: -202px -135px; } .notification-container { - background-color: #454545; - box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.3); - list-style-type: none; - margin: 0; - overflow: hidden; - padding-left: 0; - position: fixed; - top: 34px; - width: 351px; - z-index: 200; - font-size: 12px; - padding: 0; - color: #7f7f7f; + background-color: #454545; + box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.3); + list-style-type: none; + margin: 0; + overflow: hidden; + padding-left: 0; + position: fixed; + top: 34px; + width: 351px; + z-index: 200; + font-size: 12px; + padding: 0; + color: #7f7f7f; } .notification-container .unseen { - color: #ABABAB; + color: #ABABAB; } + + .notification-container li { - border-bottom: 1px solid #555; - padding: 10px 15px 24px; + border-bottom: 1px solid #555; + padding: 10px 15px 24px; } .notification-container .mark-seen { - background-color: #abc04b; - border: 2px solid #454545; - border-radius: 10px; - cursor: pointer; - display: none; - float: right; - height: 7px; - margin-right: -5px; - margin-top: 0; - width: 7px; + background-color: #abc04b; + border: 2px solid #454545; + border-radius: 10px; + cursor: pointer; + display: none; + float: right; + height: 7px; + margin-right: -5px; + margin-top: 0; + width: 7px; } .notification-container .mark-seen:hover { - background-color: #333; - border-color: #abc04b; + background-color: #333; + border-color: #abc04b; } .notification-container .mark-seen:active { - background-color: #777; - border-color: #777; + background-color: #777; + border-color: #777; } -.notification-container .unseen .mark-seen { - display: inline-block; +.notification-container .unseen .mark-seen{ + display: inline-block; } .notification-container .title { - color: #9e9e9e; - font-weight: bold; - line-height: 30px; - padding: 0; - text-transform: none; - float: none; - display: block; + color: #9e9e9e; + font-weight: bold; + line-height: 30px; + padding: 0; + text-transform: none; + float: none; + display: block; } .notification-container .title a { - color: #9e9e9e; + color: #9e9e9e; } + +.notification-container .unseen .title a, .notification-container .unseen .title { - color: #C4DA5E; -} -.notification-container .unseen .title a { - color: #C4DA5E; + color: #C4DA5E; } .notification-container .unseen .title a:hover { - color: #ffcc00; + color: #ffcc00; } .notification-container .unseen .title a:active { - color: #dacf2e; + color: #dacf2e; } + .notification-container a { - color: #5ABDB5; - /* #eee;*/ + color: #5ABDB5;/* #eee;*/ } .notification-container a:hover { - color: #2CA99B; + color: #2CA99B; } .notification-container a:active { - color: #00C0C0; + color: #00C0C0; } + .notification-container .icon { - display: inline-block; - width: 0; + display: inline-block; + width: 0; } .notification-container .icon.filemanager { - display: inline-block; - width: 22px; - background: url("/images/flat_icons.png") repeat scroll -31px -100px; + display: inline-block; + width: 22px; + background: url("/images/flat_icons.png") repeat scroll -31px -100px; } .notification-container .icon.starred { - display: inline-block; - width: 21px; - background: url("/images/sprite.png?1446554104") repeat scroll -184px 556px; + display: inline-block; + width: 21px; + background: url("/images/sprite.png?1446554103") repeat scroll -184px 556px; } + + .l-stat { - margin: 0 auto; - margin: 34px auto; - position: fixed; - background-color: #fff; - z-index: 100; - padding-top: 30px; - width: 100%; - overflow: hidden; + margin: 0 auto; + margin: 34px auto; + position: fixed; + background-color: #fff; + z-index: 100; + padding-top: 30px; + width: 100%; + overflow: hidden; } - .l-stat__col { - display: block; - vertical-align: top; - float: left; + display: block; + vertical-align: top; + float: left; } .l-stat__col a { - display: inline-block; - padding-bottom: 36px; - min-height: 111px; - width: 138px; - border-bottom: 3px solid #fff; - overflow: hidden; - background-color: #fff; - padding-top: 3px; - margin-top: -3px; - padding-left: 5px; + display: inline-block; + padding-bottom: 36px; + min-height: 111px; + width: 138px; + border-bottom: 3px solid #fff; + overflow: hidden; + background-color: #fff; + padding-top: 3px; + margin-top: -3px; + padding-left: 5px; } .l-stat__col a:hover { - border-bottom: 3px solid #ff8e61; + border-bottom: 3px solid #ff8e61; } .l-stat__col a:active { - border-bottom: 3px solid #796cc7; + border-bottom: 3px solid #f72b44; } - .l-stat__col--active a { - border-bottom: 3px solid #ff6e42; + border-bottom: 3px solid #ff6e42; } .l-stat.active .l-stat__col.focus a { - border-bottom: 3px solid #5edad0; + border-bottom: 3px solid #5edad0; } .l-stat.active .l-stat__col.focus a .l-stat__col-title { - color: #36B3A9; + color: #36B3A9; } + + .l-stat__col a:hover .l-stat__col-title { - color: #9c8cff; + color: #ff6701; } .l-stat__col a:active .l-stat__col-title { - color: #796cc7; + color: #f72b44; } + + .l-stat__col ul { - list-style-type: none; - font-size: 12px; - padding-left: 0; + list-style-type: none; + font-size: 12px; + padding-left: 0; } .l-stat__col li { - color: #a0a0a0; - margin-bottom: 8px; - text-transform: lowercase; + color: #a0a0a0; + margin-bottom: 8px; + text-transform: lowercase; } .l-stat__col span { - padding-left: 15px; + padding-left: 15px; } - .l-stat__col-title { - text-transform: uppercase; - font-weight: 700; - color: #212134; - min-height: 21px; + text-transform: uppercase; + font-weight: 700; + color: #212134; + min-height: 21px; } - .l-stat__col--active .l-stat__col-title { - color: #9c8cff; - font-size: 24px; - margin-top: -7px; - letter-spacing: -1px; - margin-right: -8px; + color: #ff6701; + font-size: 24px; + margin-top: -7px; + letter-spacing: -1px; + margin-right: -8px; } +.l-separator.selected, .l-separator { - height: 1px; - background-color: #ddd; -} -.l-separator.selected { - height: 1px; - background-color: #ddd; + height: 1px; + background-color: #ddd; } div.l-content > div.l-separator:nth-of-type(2) { - margin-top: 214px; - width: 100%; - position: fixed; - z-index: 120; + margin-top: 214px; + width: 100%; + position: fixed; + z-index: 120; } + div.l-content > div.l-separator:nth-of-type(4) { - margin-top: 259px; - width: 100%; - position: fixed; - z-index: 100; + margin-top: 259px; + width: 100%; + position: fixed; + z-index: 100; } .l-sort { - position: fixed; - width: 998px; - background-color: #fff; - z-index: 110; - margin-top: 215px; + position: fixed; + width: 998px; + background-color: #fff; + z-index: 110; + margin-top: 215px; } - .l-sort__create-btn { - background-image: url("/images/sprite.png?1446554104"); - background-position: -331px -107px; - background-repeat: no-repeat; - bottom: -23px; - display: inline-block; - height: 45px; - left: 30px; - position: absolute; - width: 45px; - z-index: 3; + background-image: url("/images/sprite.png?1446554103"); + background-position: -331px -107px; + background-repeat: no-repeat; + bottom: -23px; + display: inline-block; + height: 45px; + left: 30px; + position: absolute; + width: 45px; + z-index: 3; } .l-sort__create-btn:hover { - background-position: -378px -107px; + background-position: -378px -107px; } .l-sort__create-btn:active { - background-position: -425px -107px; + background-position: -425px -107px; } - .l-sort__create-btn--active { - background-position: -425px -107px; + background-position: -425px -107px; } .l-sort__create-btn.restore { - background-position: -331px -250px; - bottom: -22px; + background-position: -331px -250px; + bottom: -22px; } -.l-sort__create-btn.restore:hover, .l-sort__create-btn.restore:active { - background-position: -331px -250px; +.l-sort__create-btn.restore:hover { + background-position: -331px -250px; } +.l-sort__create-btn.restore:active { + background-position: -331px -250px; +} + .l-sort__create-btn.edit { - background-position: -331px -154px; - bottom: -22px; + background-position: -331px -154px; + bottom: -22px; } .l-sort__create-btn.edit:hover { - background-position: -378px -154px; + background-position: -378px -154px; } .l-sort__create-btn.edit:active { - background-position: -425px -154px; + background-position: -425px -154px; } .context-menu.sort-order { - display: inline-block; - position: absolute; - z-index: 3; - left: 397px; - margin: 0; - overflow: hidden; - top: 42px; - width: 201px; - background-color: #5c5c5c; - list-style-type: none; - padding-left: 0; - box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.3); + display: inline-block; + position: absolute; + z-index: 3; + left: 397px; + margin: 0; + overflow: hidden; + top: 42px; + width: 201px; + background-color: #5c5c5c; + list-style-type: none; + padding-left: 0; + box-shadow: 0 2px 7px 0 rgba(0, 0, 0, 0.3); } .context-menu.sort-order li { - padding: 0; + padding: 0; } .context-menu li { - border-bottom: 1px solid #777; - color: #fff; - cursor: pointer; - font-size: 12px; - padding: 12px; + border-bottom: 1px solid #777; + color: #fff; + cursor: pointer; + font-size: 12px; + padding: 12px; } .context-menu.sort-order span.name { - background: url("/images/sprite.png?1446554104") no-repeat scroll -292px -361px rgba(0, 0, 0, 0); - display: inline-block; - padding: 12px 28px 12px 12px; - width: 117px; - text-transform: uppercase; - font-weight: bold; + background: url("/images/sprite.png?1446554103") no-repeat scroll -292px -361px rgba(0, 0, 0, 0); + display: inline-block; + padding: 12px 28px 12px 12px; + width: 117px; + text-transform: uppercase; + font-weight: bold; } .context-menu.sort-order span.up { - background: url("/images/sprite.png?1446554104") no-repeat scroll -434px -417px rgba(0, 0, 0, 0); - display: inline-block; - padding: 12px 14px; - width: 16px; + background: url("/images/sprite.png?1446554103") no-repeat scroll -434px -417px rgba(0, 0, 0, 0); + display: inline-block; + padding: 12px 14px; + width: 16px; } .context-menu.sort-order span.active { - background-color: #FFD437; - color: #555; + background-color: #FFD437; + color: #555; } .context-menu.sort-order span:hover { - background-color: #777; - color: #fff; + background-color: #777; + color: #fff; } .context-menu.sort-order span:active { - background-color: #ffcc00; + background-color: #ffcc00; } + + + .l-sort-toolbar { - float: right; - padding: 7px 0 7px 0; - width: 100%; + float: right; + padding: 7px 0 7px 0; + width: 100%; } -.l-sort-toolbar table { - float: right; +.l-sort-toolbar table{ + float: right; } + .l-sort-toolbar td.toggle-all { - padding-top: 7px; - padding-right: 20px; + padding-top: 7px; + padding-right: 20px; } + .l-sort-toolbar .sort-by { - cursor: pointer; - padding-top: 7px; - padding-left: 40px; + cursor: pointer; + padding-top: 7px; + padding-left: 40px; } .l-sort-toolbar .sort-by:hover { - color: #555; + color: #555; } .l-sort-toolbar .sort-by:hover b { - color: #555; + color: #555; } .l-sort-toolbar .sort-by:active { - color: #23b7e5; + color: #55c9c0; } .l-sort-toolbar .sort-by:active b { - color: #23b7e5; + color: #55c9c0; } + .l-sort-toolbar .sort-by b { - text-transform: uppercase; - padding-left: 3px; - font-size: 12px; + text-transform: uppercase; + padding-left: 3px; + font-size: 12px; } + .l-sort-toolbar .toggle-all:hover { - color: #555; + color: #555; } .l-sort-toolbar .toggle-all:active { - color: #23b7e5; + color: #55c9c0; } + .l-sort-toolbar .l-select { - float: left; + float: left; } .l-sort-toolbar td { - vertical-align: middle; + vertical-align: middle; } -.l-sort-toolbar.subtitle { - padding-left: 96px; + +.l-sort-toolbar.subtitle { + padding-left: 96px; } + + .l-sort-toolbar td:first-of-type { - padding-left: 40px; + padding-left: 40px; } + + .l-sort-toolbar td.step-right:first-of-type { - padding-right: 20px; + padding-right: 20px; } + .l-sort-toolbar td:nth-of-type(2) { - /* /// padding-right: 60px;*/ - padding-right: 20px; +/* /// padding-right: 60px;*/ + padding-right: 20px; } .l-sort-toolbar td:last-of-type { - /* /// padding-left: 40px; */ +/* /// padding-left: 40px; */ } - .l-sort-toolbar__filter-apply { - float: left; - width: 30px; - height: 30px; - background-image: url("/images/sprite.png?1446554104"); - background-position: -333px -1px; - border: none; + float: left; + width: 30px; + height: 30px; + background-image: url("/images/sprite.png?1446554103"); + background-position: -333px -1px; + border: none; } .l-sort-toolbar__filter-apply:hover { - background-position: -368px -1px; - border-color: #afafac; + background-position: -368px -1px; + border-color: #afafac; } .l-sort-toolbar__filter-apply:active { - background-position: -404px -1px; - border-color: #afafac; + background-position: -404px -1px; + border-color: #afafac; } - .l-sort-toolbar__filter-apply--active { - background-position: -404px -1px; - border-color: #50bdb5; + background-position: -404px -1px; + border-color: #50bdb5; } .l-sort-toolbar__search { - float: left; - width: 25px; - height: 25px; - background-image: url("/images/sprite.png?1446554104"); - background-position: -333px -37px; - border: none; + float: left; + width: 25px; + height: 25px; + background-image: url("/images/sprite.png?1446554103"); + background-position: -333px -37px; + border: none; } .l-sort-toolbar__search:hover { - background-position: -368px -37px; - border-color: #afafac; + background-position: -368px -37px; + border-color: #afafac; } .l-sort-toolbar__search:active { - background-position: -404px -37px; - border-color: #50bdb5; + background-position: -404px -37px; + border-color: #50bdb5; } - .l-sort-toolbar__search--active { - background-position: -404px -37px; - border-color: #50bdb5; + background-position: -404px -37px; + border-color: #50bdb5; } - .l-sort-toolbar .vst { - padding: 0 12px; - color: #777; - text-transform: uppercase; - font-size: 11px; - font-weight: bold; - line-height: 30px; + padding: 0 12px; + color: #777; + text-transform: uppercase; + font-size: 11px; + font-weight: bold; + line-height: 30px; } .l-sort-toolbar .vst:hover { - color: #9c8cff; + color: #ff6701; } .l-sort-toolbar .vst:active { - color: #23b7e5; + color: #55C9C0; } .l-sort-toolbar .vst.selected { - color: #9c8cff; + color: #ff6701; +// color: #92af0b; } + + .l-select { - width: 178px; - height: 28px; - border: 1px solid #ddd; - border-radius: 0; - overflow-x: hidden; - position: relative; - display: inline-block; - border-style: solid none solid solid; + width: 178px; + height: 28px; + border: 1px solid #ddd; + border-radius: 0; + overflow-x: hidden; + position: relative; + display: inline-block; + border-style: solid none solid solid; } - .lang-ru .l-select { - width: 199px; + width: 199px; } .l-select:after { - pointer-events: none; - background-image: url("/images/sprite.png?1446554104"); - background-position: -245px -175px; - width: 7px; - height: 4px; - margin-top: -2px; - content: ""; - position: absolute; - right: 10px; - top: 50%; + pointer-events: none; + background-image: url("/images/sprite.png?1446554103"); + background-position: -245px -175px; + width: 7px; + height: 4px; + margin-top: -2px; + content: ''; + position: absolute; + right: 10px; + top: 50%; } .l-select select { - border: 0; - background-color: transparent; - line-height: 28px; - height: 28px; - min-width: 208px; - padding-left: 4px; - appearance: none; - -moz-appearance: none; - -webkit-appearance: none; - padding-left: 10px; + border: 0; + background-color: transparent; + line-height: 28px; + height: 28px; + min-width: 208px; + padding-left: 4px; + appearance:none; + -moz-appearance:none; + -webkit-appearance:none; + padding-left: 10px; } .l-select select:focus { - border: 0; - outline: 0; + border: 0; + outline: 0; } - .lang-ru .l-select select { - min-width: 215px; + min-width: 215px; } - .l-select select option { - padding: 7px; + padding: 7px; } .l-unit { - color: #888; - padding: 0 0 0 15px; - overflow: hidden; - font-size: 13px; + color: #888; + padding: 0 0 0 15px; + overflow: hidden; + font-size: 13px; } - .units .l-unit { - border-bottom: 1px solid #ddd; - border-left: 2px solid #fff; + border-bottom: 1px solid #ddd; + border-left: 2px solid #fff; } .units .l-unit.l-unit--starred { - border-left: 2px solid #9c8cff; + border-left: 2px solid #ff6701; } .units.active .l-unit.focus { - border-left: 2px solid #5edad0; - background: #f4faff; + border-left: 2px solid #5edad0; } .units.active .l-unit.focus .l-unit__name { - color: #36b3a9; + color: #36b3a9; } .units.active .l-unit.focus .l-unit-toolbar__col--right { - display: block; + display: block; } + .units > div:last-child { - border-bottom: none; + border-bottom: none; } .l-unit-ft { - color: #929292; - padding: 0 0 0 15px; + color: #929292; + padding: 0 0 0 15px; } .l-unit:hover .l-unit-toolbar__col--right { - display: block; + display: block; } - .l-unit--blue { - border-left: 2px solid #23b7e5; + border-left: 2px solid #55c9c0; } .l-unit--suspended { - background-color: #eaeaea; - color: #c0c0c0; + background-color: #eaeaea; + color: #c0c0c0; } + .units .l-unit.l-unit--outdated { - background-color: #ffcaca; - color: #555; - border-left: 5px solid #ff6f6f; - border-bottom: 1px solid #fff; + background-color: #ffcaca; + color: #555; + border-left: 5px solid #ff6f6f; + border-bottom: 1px solid #fff; } -.l-unit--suspended .l-unit__name, .l-unit--suspended b { - color: #c0c0c0; +.l-unit--suspended .l-unit__name, +.l-unit--suspended b, +.l-unit--outdated .l-unit__name, +.l-unit--outdated b { + color: #c0c0c0; } -.l-unit--outdated .l-unit__name, .l-unit--outdated b { - color: #c0c0c0; -} .l-unit--outdated .l-unit__name { - color: #333; + color: #333; } .l-unit--outdated b { - color: #555; + color: #555; } .l-unit--suspended .l-percent { - border-color: #fff; + border-color: #fff; } .l-unit--suspended .l-percent__fill { - background-color: #fff; -} -.l-unit--suspended .l-unit__name { - color: #ADADAD; + background-color: #fff; } +.l-unit--suspended .l-unit__name, .l-unit--suspended .l-unit__name span { - color: #ADADAD; -} -.l-unit--suspended.selected { - background-color: #f2eab8 !important; - color: #b2ac87 !important; -} -.l-unit--suspended.selected .l-unit__name { - color: #777; + color: #ADADAD; } + +.l-unit--suspended.selected .l-unit__name, .l-unit--suspended.selected .l-unit__name span { - color: #777; + color: #777; +} + +.l-unit--suspended.selected { + background-color: #f2eab8 !important; + color: #b2ac87 !important; } .l-unit--outdated.selected { - background: #765D5D !important; - color: #333 !important; + background: #765D5D !important; + color: #333 !important; } -.l-unit--suspended.selected .l-unit__name, .l-unit--suspended.selected b { - color: #333 !important; -} -.l-unit--outdated.selected .l-unit__name, .l-unit--outdated.selected b { - color: #333 !important; -} -.l-unit--suspended.selected .l-percent, .l-unit--suspended.selected .l-percent__fill { - color: #333 !important; -} -.l-unit--suspended.selected .l-unit__name { - color: #333 !important; -} +.l-unit--suspended.selected .l-unit__name, +.l-unit--suspended.selected b, +.l-unit--outdated.selected .l-unit__name, +.l-unit--outdated.selected b, +.l-unit--suspended.selected .l-percent, +.l-unit--suspended.selected .l-percent__fill, +.l-unit--suspended.selected .l-unit__name, .l-unit--suspended.selected .l-unit__name span { - color: #333 !important; + color: #333 !important; } .l-unit.selected .l-percent { - border-bottom: 1px dotted #777; + border-bottom: 1px dotted #777; } + .l-unit--selected { - background-color: #d1eddc; + background-color: #d1eddc; } - -.l-unit-toolbar { - height: 39px; +.l-unit-toolbar{ + height: 39px; } .l-unit label { - margin-bottom: 20px; + margin-bottom: 20px; } - .l-unit__columns { - display: table; - width: 100%; + display: table; + width: 100%; } - .l-unit__col { - display: table-cell; - padding-top: 1px; - vertical-align: top; + display: table-cell; + padding-top: 1px; + vertical-align: top; } - .l-unit__col--left { - width: 124px; - padding-right: 10px; + width: 124px; + padding-right: 10px; } - .units.compact .l-unit__col--left { - vertical-align: top; + vertical-align: top; } .l-unit__col--left.step-left { - padding-left: 30px; + padding-left: 30px; } .l-unit__col--right.total { - padding-left: 16px; + padding-left: 16px; } + .l-unit__col--right.back { - padding-left: 78px; + padding-left: 78px } .l-sort-toolbar .step-left { - padding-left: 40px; + padding-left: 40px; } - .step-right { - padding-right: 40px; + padding-right: 40px; } .l-unit__date { - font-size: 12px; - letter-spacing: 1px; - margin-top: 10px; - padding-bottom: 30px; + font-size: 12px; + letter-spacing: 1px; + margin-top: 10px; + padding-bottom: 30px; } .l-unit__suspended { - display: none; - font-size: 11px; - font-weight: bold; - letter-spacing: 3px; - margin-top: 36px; - text-transform: uppercase; - margin-bottom: 14px; + display: none; + font-size: 11px; + font-weight: bold; + letter-spacing: 3px; + margin-top: 36px; + text-transform: uppercase; + margin-bottom: 14px; } .units.compact .l-unit__suspended { - margin-top: 1px; + margin-top: 1px; } -.l-unit--outdated .l-unit__suspended, .l-unit--suspended .l-unit__suspended { - display: block; -} - -.l-unit-ft .subtitle { - color: #9c8cff; - font-size: 12px; - font-weight: bold; - margin: 20px 0 18px 129px; - text-transform: uppercase; +.l-unit--outdated .l-unit__suspended, +.l-unit--suspended .l-unit__suspended { + display: block; } +.l-unit-ft .subtitle, .l-unit .subtitle { - color: #9c8cff; - font-size: 12px; - font-weight: bold; - margin: 20px 0 18px 129px; - text-transform: uppercase; + color: #ff6701; + font-size: 12px; + font-weight: bold; + margin: 20px 0 18px 129px; + text-transform: uppercase; } + .l-unit.l-unit--outdated .l-unit__date { - color: #d24c4c; - font-size: 10px; - letter-spacing: 3px; - text-transform: uppercase; - font-weight: bold; + color: #d24c4c; + font-size: 10px; + letter-spacing: 3px; + text-transform: uppercase; + font-weight: bold; } .l-unit__name { - color: #111; - font-size: 32px; - margin-bottom: 10px; + color: #111; + font-size: 32px; + margin-bottom: 10px; } - -.l-unit__stats.separate { - padding-bottom: 15px; -} - +.l-unit__stats.separate, .l-unit__name.separate { - padding-bottom: 15px; + padding-bottom: 15px; } + .l-unit__name.small { - font-size: 19px; + font-size: 19px; } + .l-unit__name.small-2 { - font-size: 24px; + font-size: 24px; } + + .l-unit__name span { - color: #999; - margin-left: 30px; - font-size: 14px; - font-style: italic; + color: #999; + margin-left: 30px; + font-size: 14px; + font-style: italic; } .l-unit__name span:first-of-type { - margin-left: 39px; + margin-left: 39px; } .l-unit__name b { - font-weight: normal; - font-style: italic; + font-weight: normal; + font-style: italic; } .l-unit__ip { - margin-bottom: 26px; - font-size: 12px; - letter-spacing: 1px; + margin-bottom: 26px; + font-size: 12px; + letter-spacing: 1px; } .l-unit__ip span { - padding-left: 3px; - padding-right: 3px; + padding-left: 3px; + padding-right: 3px; } - .display-ip { - font-size: 12px; - letter-spacing: 1px; + font-size: 12px; + letter-spacing: 1px; } .display-ip span { - padding-left: 3px; - padding-right: 3px; + padding-left: 3px; + padding-right: 3px; } .l-unit__stats { - margin-bottom: 50px; + margin-bottom: 50px; } .l-unit__stats table { - width: 100%; - table-layout: fixed; + width: 100%; + table-layout: fixed; } .l-unit__stats td { - height: 22px; - padding-bottom: 3px; - vertical-align: top; + height: 22px; + padding-bottom: 3px; + vertical-align: top; } - .l-unit__stat-col--left { - float: left; - width: 124px; + float: left; + width: 124px; } .l-unit__stat-col--left.compact { - width: 70px; + width: 70px; } .l-unit__stat-col--left.compact-2 { - width: 95px; + width: 95px; } .l-unit__stat-col--left.wide { - width: 190px; + width: 190px; } .l-unit__stat-col--left.wide-2 { - width: 230px; + width: 230px; } .l-unit__stat-col--left.wide-3 { - width: 250px; + width: 250px; } .l-unit__stat-col--left.wide-4 { - width: 550px; -} -.l-unit__stat-col--left.small-2 { - line-height: 11px; -} -.l-unit__stat-col--left.tiny { - font-size: 11px; -} -.l-unit__stat-col--left.tiny b { - font-size: 18px; + width: 550px; } + +.l-unit__stat-col--left.small-2 { + line-height: 11px; +} + +.l-unit__stat-col--left.tiny { + font-size: 11px; +} + +.l-unit__stat-col--left.tiny b { + font-size: 18px; +} + + .l-unit__stat-col--right { - float: left; - max-width: 152px; + float: left; + max-width: 152px; } .l-unit-toolbar__col--left { - float: left; - margin-left: -15px; - margin-top: 0; - padding-bottom: 0px; - /* 8px */ - padding-left: 15px; - padding-top: 15px; - width: 30px; - cursor: pointer; + float: left; + margin-left: -15px; + margin-top: 0; + padding-bottom: 0px;/* 8px */ + padding-left: 15px; + padding-top: 15px; + width: 30px; + cursor: pointer; } .l-unit-toolbar__col--right { - float: right; - display: none; + float: right; + display: none; } body.mobile .l-unit-toolbar__col--right { - display: block; + display: block; } .l-unit-toolbar .shortcut { - display: none; + display: none; } .units.active .l-unit.focus .l-unit-toolbar .shortcut { - display: block; - background-color: #69a298; - border-radius: 13px; - color: #fff; - cursor: pointer; - display: block; - font-size: 12px; - font-weight: 700; - line-height: 25px; - padding-left: 7px; - padding-right: 9px; - position: absolute; - right: 3px; - top: 3px; + display: block; + background-color: #69a298; + border-radius: 13px; + color: #fff; + cursor: pointer; + display: block; + font-size: 12px; + font-weight: 700; + line-height: 25px; + padding-left: 7px; + padding-right: 9px; + position: absolute; + right: 3px; + top: 3px; } .units.active .l-unit.focus .l-unit-toolbar .shortcut.delete { - font-size: 10px; - padding-left: 2px; - padding-right: 5px; - text-transform: capitalize; + font-size: 10px; + padding-left: 2px; + padding-right: 5px; + text-transform: capitalize; } .units.active .l-unit.focus .l-unit-toolbar .shortcut.enter { - font-size: 17px; - padding-left: 1px; - padding-right: 7px; + font-size: 17px; + padding-left: 1px; + padding-right: 7px; } .units.active .l-unit.focus .l-unit-toolbar i { - background: none; + background: none; } .l-unit__stat-col.volume { - font-size: 12px; - line-height: 17px; - float: right; + font-size: 12px; + line-height: 17px; + float: right; } .actions-panel__col { - float: left; - min-width: 95px; - min-height: 31px; - text-transform: uppercase; - background-color: #dde6e9; - border-right: 1px solid #dde6e9; - position: relative; + float: left; + min-width: 95px; + min-height: 31px; + text-transform: uppercase; + background-color: #dfdedd; + border-right: 1px solid #d8d7d7; + position: relative; } - .selected .actions-panel__col { - -webkit-filter: contrast(80%); - filter: contrast(80%); + -webkit-filter: contrast(80%); + filter: contrast(80%); } - .actions-panel__col i { - background-image: url("/images/sprite.png?1446554104"); - background-repeat: no-repeat; - display: inline-block; - float: right; - content: ""; - width: 31px; - height: 31px; - position: absolute; - top: 0; - right: 0; + background-image: url("/images/sprite.png?1446554103"); + background-repeat: no-repeat; + display: inline-block; + float: right; + content: ''; + width: 31px; + height: 31px; + position: absolute; + top: 0; + right: 0; } .actions-panel__col a { - line-height: 31px; - color: #777; - font-weight: 700; - font-size: 12px; - padding-left: 13px; - display: block; - cursor: pointer; - position: relative; - padding-right: 36px; + line-height: 31px; + color: #777; + font-weight: 700; + font-size: 12px; + padding-left: 13px; + display: block; + cursor: pointer; + position: relative; + padding-right: 36px; } - .lang-ru .actions-panel__col a { - font-size: 11px; - padding-top: 1px; + font-size: 11px; + padding-top: 1px; } - .lang-tw .actions-panel__col a { - font-size: 15px; - font-weight: normal; - line-height: 29px; + font-size: 15px; + font-weight: normal; + line-height: 29px; +} +.lang-ar .actions-panel__col a { + font-size: 15px; + font-weight: normal; + line-height: 31px; } -.lang-ar .actions-panel__col a { - font-size: 15px; - font-weight: normal; - line-height: 31px; -} .actions-panel__favorite a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__favorite i { - background-position: -39px -85px; + background-position: -39px -85px; } .actions-panel__edit i { - background-position: -1px -169px; + background-position: -1px -169px; } .actions-panel__edit:hover a { - background-color: #27c24c; - color: #fff; + background-color: #9fbf0c; + color: #fff; } .actions-panel__edit:active a { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .actions-panel__edit:hover a i { - background-position: -41px -169px; + background-position: -41px -169px; } .actions-panel__edit:active a i { - background-position: -81px -169px; + background-position: -81px -169px; } - .actions-panel__edit--active a { - background-color: #32f360; - color: #fff; + background-color: #c0e60f; + color: #fff; } .actions-panel__edit--active i { - background-position: -78px -169px; + background-position: -78px -169px; } .actions-panel__restart i { - background-position: -1px -520px; + background-position: -1px -520px; } .actions-panel__restart:hover a { - background-color: #27c24c; - color: #fff; + background-color: #9fbf0c; + color: #fff; } .actions-panel__restart:active a { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .actions-panel__restart:hover a i { - background-position: -41px -520px; + background-position: -41px -520px; } .actions-panel__restart:active a i { - background-position: -81px -520px; + background-position: -81px -520px; } - .actions-panel__restart--active a { - background-color: #32f360; - color: #fff; + background-color: #c0e60f; + color: #fff; } .actions-panel__restart--active i { - background-position: -78px -520px; + background-position: -78px -520px; } .actions-panel__add i { - background-position: -1px -285px; + background-position: -1px -285px; } .actions-panel__add:hover a { - background-color: #27c24c; - color: #fff; + background-color: #9fbf0c; + color: #fff; } .actions-panel__add:active a { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .actions-panel__add:hover a i { - background-position: -41px -285px; + background-position: -41px -285px; } .actions-panel__add:active a i { - background-position: -81px -285px; + background-position: -81px -285px; } .actions-panel__add--active a { - background-color: #32f360; - color: #fff; + background-color: #c0e60f; + color: #fff; } .actions-panel__add--active i { - background-position: -78px -285px; + background-position: -78px -285px; } .actions-panel__update i { - background-position: -1px -481px; + background-position: -1px -481px; } .actions-panel__update:hover a { - background-color: #27c24c; - color: #fff; + background-color: #9fbf0c; + color: #fff; } .actions-panel__update:active a { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .actions-panel__update:hover a i { - background-position: -41px -481px; + background-position: -41px -481px; } .actions-panel__update:active a i { - background-position: -81px -481px; + background-position: -81px -481px; } - .actions-panel__update--active a { - background-color: #32f360; - color: #fff; + background-color: #c0e60f; + color: #fff; } .actions-panel__update--active i { - background-position: -78px -481px; + background-position: -78px -481px; } .actions-panel__logs i { - background-position: -2px -130px; + background-position: -2px -130px; } .actions-panel__logs:hover a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__logs:active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__logs:hover a i { - background-position: -42px -130px; + background-position: -42px -130px; } .actions-panel__logs:active a i { - background-position: -82px -130px; + background-position: -82px -130px; } - .actions-panel__logs--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__logs--active i { - background-position: -79px -130px; + background-position: -79px -130px; } .actions-panel__db i { - background-position: -2px -363px; + background-position: -2px -363px; } .actions-panel__db:hover a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__db:active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__db:hover a i { - background-position: -42px -363px; + background-position: -42px -363px; } .actions-panel__db:active a i { - background-position: -82px -363px; + background-position: -82px -363px; } - .actions-panel__db--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__db--active i { - background-position: -79px -362px; + background-position: -79px -362px; } .actions-panel__suspend i { - background-position: -1px -51px; + background-position: -1px -51px; } .actions-panel__suspend:hover a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__suspend:active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__suspend:hover a i { - background-position: -41px -51px; + background-position: -41px -51px; } .actions-panel__suspend:active a i { - background-position: -81px -51px; + background-position: -81px -51px; } - .actions-panel__suspend--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__suspend--active i { - background-position: -78px -51px; + background-position: -78px -51px; } .actions-panel__unsuspend i { - background-position: -1px -12px; + background-position: -1px -12px; } .actions-panel__unsuspend:hover a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__unsuspend:active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__unsuspend:hover a i { - background-position: -41px -12px; + background-position: -41px -12px; } .actions-panel__unsuspend:active a i { - background-position: -81px -12px; + background-position: -81px -12px; } - .actions-panel__unsuspend--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__unsuspend--active i { - background-position: -78px -12px; + background-position: -78px -12px; } + .actions-panel__loginas i { - background-position: -1px -245px; + background-position: -1px -245px; } .actions-panel__loginas:hover a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__loginas:active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__loginas:hover a i { - background-position: -41px -245px; + background-position: -41px -245px; } .actions-panel__loginas:active a i { - background-position: -81px -245px; + background-position: -81px -245px; } - .actions-panel__loginas--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__loginas--active i { - background-position: -78px -245px; + background-position: -78px -245px; } .actions-panel__download i { - background-position: -1px -402px; + background-position: -1px -402px; } .actions-panel__download:hover a { - background-color: #27c24c; - color: #fff; + background-color: #9fbf0c; + color: #fff; } .actions-panel__download:active a { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .actions-panel__download:hover a i { - background-position: -41px -402px; + background-position: -41px -402px; } .actions-panel__download:active a i { - background-position: -81px -402px; + background-position: -81px -402px; } - .actions-panel__download--active a { - background-color: #32f360; - color: #fff; + background-color: #c0e60f; + color: #fff; } .actions-panel__download--active i { - background-position: -78px -402px; + background-position: -78px -402px; } .actions-panel__configure i { - background-position: -1px -442px; + background-position: -1px -442px; } .actions-panel__configure:hover a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__configure:active a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__configure:hover a i { - background-position: -81px -442px; + background-position: -81px -442px; } .actions-panel__configure:active a i { - background-position: -41px -442px; + background-position: -41px -442px; } - .actions-panel__configure--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__configure--active i { - background-position: -78px -442px; + background-position: -78px -442px; } .actions-panel__.l-icon-starmail i { - background-position: -1px -324px; + background-position: -1px -324px; } - .actions-panel__mail:hover a { - background-color: #afafac; - color: #fff; + background-color: #afafac; + color: #fff; } .actions-panel__mail:active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__mail:hover a i { - background-position: -41px -324px; + background-position: -41px -324px; } .actions-panel__mail:active a i { - background-position: -81px -324px; + background-position: -81px -324px; } - .actions-panel__mail--active a { - background-color: #23b7e5; - color: #fff; + background-color: #55c9c0; + color: #fff; } .actions-panel__mail--active i { - background-position: -78px -324px; + background-position: -78px -324px; } .actions-panel__delete i { - background-position: -1px -207px; + background-position: -1px -207px; } .actions-panel__delete:hover a { - background-color: #ff3438; - color: #fff; + background-color: #ff3438; + color: #fff; } .actions-panel__delete:active a { - background-color: #ff5f5f; - color: #fff; + background-color: #ff5f5f; + color: #fff; } .actions-panel__delete:hover a i { - background-position: -41px -207px; + background-position: -41px -207px; } .actions-panel__delete:active a i { - background-position: -81px -207px; + background-position: -81px -207px; } - .actions-panel__delete--active a { - background-color: #ff5f5f; - color: #fff; + background-color: #ff5f5f; + color: #fff; } .actions-panel__delete--active i { - background-position: -78px -207px; + background-position: -78px -207px; } .actions-panel__stop i { - background-position: -1px -561px; + background-position: -1px -561px; } .actions-panel__stop:hover a { - background-color: #ff3438; - color: #fff; + background-color: #ff3438; + color: #fff; } .actions-panel__stop:active a { - background-color: #ff5f5f; - color: #fff; + background-color: #ff5f5f; + color: #fff; } .actions-panel__stop:hover a i { - background-position: -41px -561px; + background-position: -41px -561px; } .actions-panel__stop:active a i { - background-position: -81px -561px; + background-position: -81px -561px; } - .actions-panel__stop--active a { - background-color: #ff5f5f; - color: #fff; + background-color: #ff5f5f; + color: #fff; } .actions-panel__stop--active i { - background-position: -78px -561px; + background-position: -78px -561px; } .actions-panel__start i { - background-position: -1px -482px; + background-position: -1px -482px; } .actions-panel__start:hover a { - background-color: #27c24c; - color: #fff; + background-color: #9fbf0c; + color: #fff; } .actions-panel__start:active a { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .actions-panel__start:hover a i { - background-position: -41px -482px; + background-position: -41px -482px; } .actions-panel__start:active a i { - background-position: -81px -482px; + background-position: -81px -482px; } - .actions-panel__start--active a { - background-color: #32f360; - color: #fff; + background-color: #c0e60f; + color: #fff; } .actions-panel__start--active i { - background-position: -78px -482px; + background-position: -78px -482px; } + .l-icon-up-arrow, .l-icon-down-arrow, .l-icon-star, .l-icon-to-top, .l-icon-shortcuts, .l-icon-star-orange, .l-icon-star-blue { - display: inline-block; - vertical-align: middle; - background-image: url("/images/sprite.png?1446554104"); + display: inline-block; + vertical-align: middle; + background-image: url("/images/sprite.png?1446554103"); } .l-icon-down-arrow { - width: 7px; - height: 15px; - background-position: -280px -128px; + width: 7px; + height: 15px; + background-position: -280px -128px; } .l-icon-up-arrow { - width: 7px; - height: 15px; - background-position: -299px -129px; + width: 7px; + height: 15px; + background-position: -299px -129px; } + .l-icon-star { - width: 36px; - height: 36px; - background-position: -216px 560px; - cursor: pointer; - visibility: hidden; + width: 36px; + height: 36px; + background-position: -216px 560px; + cursor: pointer; + visibility: hidden; } - .l-unit--starred .l-icon-star { - background-position: -174px 560px; - visibility: visible; + background-position: -174px 560px; + visibility: visible; } - .selected .l-icon-star { - filter: contrast(70%); - -webkit-filter: contrast(70%); + filter: contrast(70%); + -webkit-filter: contrast(70%); } .units.compact .l-icon-star { - margin-top: -14px; + margin-top: -14px; } .l-icon-star:hover { - background-position: 0px 560px; + background-position: 0px 560px; } + .l-icon-star:active { - -background-position: -174px 560px; - background-position: -80px 562px; + -background-position: -174px 560px; + background-position: -80px 562px; } .l-unit:hover .l-icon-star { - visibility: visible; + visibility: visible; } + .l-icon-to-top { - width: 35px; - height: 35px; - background-position: -330px -68px; + width: 35px; + height: 35px; + background-position: -330px -68px; } .l-icon-to-top:hover { - background-position: -366px -68px; + background-position: -366px -68px; } .l-icon-to-top:active { - background-position: -402px -68px; + background-position: -402px -68px; } .l-icon-shortcuts { - width: 35px; - height: 35px; - background-position: -240px -281px; - border-radius: 18px; + width: 35px; + height: 35px; + background-position: -240px -281px; + border-radius: 18px; } .l-icon-shortcuts:hover { - background-position: -160px -281px; + background-position: -160px -281px; } .l-icon-shortcuts:active { - background-position: -198px -281px; + background-position: -198px -281px; } -body.mobile .l-icon-to-top, body.mobile .l-icon-shortcuts { - display: none; +body.mobile .l-icon-to-top, +body.mobile .l-icon-shortcuts { + display: none; } + .l-icon-star-orange { - width: 13px; - height: 13px; - background-position: -178px -97px; + width: 13px; + height: 13px; + background-position: -178px -97px; } .l-icon-star-blue { - width: 13px; - height: 13px; - background-position: -134px -97px; + width: 13px; + height: 13px; + background-position: -134px -97px; } .media-top { - vertical-align: top; + vertical-align: top; } .l-unit__stat-cols { - padding-right: 10px; + padding-right: 10px; } .l-unit__stat-cols.last { - padding-right: 0; + padding-right: 0; } .l-unit__stat-cols.graph { - width: 200px; + width: 200px; } .l-unit__stat-cols.tiny { - font-size: 11px; - line-height: 19px; + font-size:11px; + line-height: 19px; } .l-percent { - border-bottom: 1px dotted #ccc; - margin-top: 1px; - width: 200px; + border-bottom: 1px dotted #ccc; + margin-top: 1px; + width: 200px; } - .l-percent__fill { - background-color: #aacc0d; - height: 3px; - position: relative; - bottom: -1px; + background-color: #aacc0d; + height: 3px; + position: relative; + bottom: -1px; } .to-top { - display: inline-block; - position: fixed; - top: 92%; - right: 1%; + display: inline-block; + position: fixed; + top: 92%; + right: 1%; } .to-shortcuts { - display: inline-block; - position: fixed; - top: 92%; - right: 4%; + display: inline-block; + position: fixed; + top: 92%; + right: 4%; } + /* #vstobjects { margin-top: -1px; } */ + #vstobjects .l-center { - padding-top: 20px; - padding-bottom: 30px; - font-size: 12px; + padding-top: 20px; + padding-bottom: 30px; + font-size: 12px; } .timer-container { - margin-top: 4px; + margin-top: 4px; } + .timer-container .refresh-timer { - border: 2px solid #9f9f9f; - border-radius: 14px; - height: 14px; - width: 14px; - float: left; - margin: 2px 10px 0 0; + border: 2px solid #9f9f9f; + border-radius: 14px; + height: 14px; + width: 14px; + float: left; + margin: 2px 10px 0 0; } .timer-container .refresh-timer.paused { - border: 2px solid #9f9f9f; + border: 2px solid #9f9f9f; } -.timer-container .refresh-timer.paused .loader-half.right, .timer-container .refresh-timer.paused .loader-half.dark { - background-color: #9d9f9f; +.timer-container .refresh-timer.paused .loader-half.right, +.timer-container .refresh-timer.paused .loader-half.dark { + background-color: #9d9f9f; } .timer-container .loader-half { - border-radius: 0 14px 14px 0; - height: 14px; - width: 7px; - float: left; + border-radius: 0 14px 14px 0; + height: 14px; + width: 7px; + float: left; } .timer-container .loader-half.left { - border-radius: 14px 0 0 14px; - background-color: #fff; + border-radius: 14px 0 0 14px; + background-color: #fff; } .timer-container .loader-half.right { - margin-left: 7px; - background-color: #9f9f9f; + margin-left: 7px; + background-color: #9f9f9f; } .timer-container .loader-half.dark { - background-color: #9f9f9f; + background-color: #9f9f9f; } .timer-container .movement { - float: left; - width: 14px; - height: 14px; - position: absolute; + float: left; + width: 14px; + height: 14px; + position: absolute; } .timer-container .movement.left { - z-index: 10; + z-index: 10; } .timer-container .movement.right { - transform: rotate(180deg); - -webkit-transform: rotate(180deg); + transform: rotate(180deg); + -webkit-transform: rotate(180deg); } .timer-container .timer-button { - cursor: pointer; - text-decotation: underline; - margin: 7px 0 0 38px; - width: 15px; - float: left; - height: 10px; + cursor: pointer; + text-decotation: underline; + margin: 7px 0 0 38px; + width: 15px; + float: left; + height: 10px; } .timer-container .timer-button.pause { - background: url(/images/pause.png) no-repeat; + background: url(/images/pause.png) no-repeat ; } .timer-container .timer-button.play { - background: url(/images/start.png) no-repeat; + background: url(/images/start.png) no-repeat; } .uppercase { - text-transform: uppercase; + text-transform: uppercase; +} + +.title b, +.title { + color: #ff6701; + font-size: 12px; + font-weight: bold; + padding: 0 30px 0px 73px; + line-height: 30px; + text-transform: uppercase; } .title { - color: #9c8cff; - font-size: 12px; - font-weight: bold; - padding: 0 30px 0px 73px; - line-height: 30px; - text-transform: uppercase; - display: inline-block; - float: left; -} -.title b { - color: #9c8cff; - font-size: 12px; - font-weight: bold; - padding: 0 30px 0px 73px; - line-height: 30px; - text-transform: uppercase; + display: inline-block; + float: left; } + + + /* form styles */ + + + .vst-error { - color: #BE5ABF; - font-weight: bold; - display: inline-block; - height: 17px; - overflow: hidden; - padding-top: 6px; - width: 593px; + color: #BE5ABF; + font-weight: bold; + display: inline-block; + height: 17px; + overflow: hidden; + padding-top: 6px; + width: 593px; } .vst-ok { - color: #27c24c; - font-weight: bold; - display: inline-block; - height: 17px; - overflow: hidden; - padding-top: 6px; - max-width: 600px; + color: #9fbf0c; + font-weight: bold; + display: inline-block; + height: 17px; + overflow: hidden; + padding-top: 6px; + max-width: 600px; } + .vst-ok a { - color: #27c24c; + color: #2c9491; } .vst-ok a:hover { - color: #9c8cff; + color: #ff6701; } .vst-ok a:active { - color: #796cc7; + color: #f72b44; } + + + .data { - margin: 0 0 90px 0; + margin: 0 0 90px 0; } - .data-col1 { - width: 148px; + width: 148px; } + .data-col1 td { - padding: 10px 0 0 5px; + padding: 10px 0 0 5px; } + .data-col1 tr:first-child td { - padding: 59px 0 0 5px; + padding: 59px 0 0 5px; } -.login-box td, .data td { - color: #555; - font-size: 15px; - padding-bottom: 3px; - font-weight: bold; +.login-box td, +.data td { + color: #555; + font-size: 15px; + padding-bottom: 3px; + font-weight: bold; } - .input-label { - padding-top: 20px; + padding-top: 20px; } - -.data input[type=checkbox] { - display: inline; - cursor: pointer; +.data input[type="checkbox"] { + display: inline; + cursor: pointer; } - .step-top { - padding-top: 42px; + padding-top: 42px; } - .step-top-small { - padding-top: 22px; + padding-top: 22px; } - .jump-top { - margin-top: -60px; + margin-top: -60px; } - .jump-small-top { - margin-top: -12px; + margin-top: -12px; } - .float-right { display: inline-block; float: right; } .data a { - text-decoration: none; + text-decoration: none; +} +label { + cursor: pointer; } -label { - cursor: pointer; -} label:hover { - color: #333; + color: #333; } .vst-input { - background-color: #fff; - border: 1px solid #dee5e7; - border-radius: 3px; - color: #555; - font-family: Arial; - font-size: 19px; - height: 28px; - margin: 2px 6px 0 0; - padding: 7px 3px 9px 14px; - width: 360px; - font-weight: normal; + background-color: #fff; + border: 1px solid #cfcfcf; + border-radius: 0px; + color: #555; + font-family: Arial; + font-size: 19px; + height: 28px; + margin: 2px 6px 0 0; + padding: 7px 3px 9px 14px; + width: 360px; + font-weight: normal; } .vst-input:hover { - border: 1px solid #909090; + border: 1px solid #909090; } .vst-input:focus { - border: 1px solid #23b7e5; - background-color: #fff; - color: #333; -} -.vst-input:disabled { - background-color: #e0e0e0; + border: 1px solid #55C9C0; + background-color: #D7F9FF; + color: #333; } +.vst-input:disabled, .vst-list:disabled { - background-color: #e0e0e0; + background-color: #e0e0e0; } - .vst-input:focus:disabled { - border-color: #f1f1f1; - background-color: #f1f1f1; + border-color: #f1f1f1; + background-color: #f1f1f1; } .vst-input.long { - width: 100%; + width: 832px; } .vst-input.short { - width: 200px; + width: 200px; } .vst-list { - background-color: #fff; - border: 1px solid #dee5e7; - border-radius: 3px; - color: #555; - font-family: Arial, Helvetica, sans-serif; - font-size: 19px; - font-weight: normal; - height: 43px; - cursor: pointer; - margin: 2px 6px 0 0; - min-width: 138px; - padding: 8px 1px 6px 10px; - background-image: url("/images/sprite.png?1446554104"); - background-position: -185px -604px; - width: 270px; - appearance: none; - -moz-appearance: none; - -webkit-appearance: none; - text-shadow: 0 0 0 #555; -} -.vst-list.long-2 { - width: 486px; - background-position: 502px -604px; -} -.vst-list option { - padding: 6px 1px 6px 15px; -} -.vst-list:hover { - border: 1px solid #909090; -} -.vst-list:focus { - border: 1px solid #23b7e5; - color: #333; -} -.vst-list.flat { - border: 1px solid #fff; - color: #27c24c; - text-transform: uppercase; - font-weight: bold; - font-size: 11px; - margin-left: -14px; - background-position: -210px -604px; - text-shadow: none !important; -} -.vst-list.flat:hover { - color: #9c8cff; -} -.vst-list.flat option { - color: #555; + background-color: #fff; + border: 1px solid #ccc; + border-radius: 0; + color: #555; + font-family: Arial,Helvetica,sans-serif; + font-size: 19px; + font-weight: normal; + height: 43px; + cursor: pointer; + margin: 2px 6px 0 0; + min-width: 138px; + padding: 8px 1px 6px 10px; + background-image: url("/images/sprite.png?1446554103"); + background-position: -185px -604px; + width: 270px; + appearance:none; + -moz-appearance:none; + -webkit-appearance:none; + text-shadow: 0 0 0 #555; } -a.vst-text { - color: #27c24c; +.vst-list.long-2 { + width: 486px; + background-position: 502px -604px; } -a.vst-text b { - color: #27c24c; +.vst-list option { + padding: 6px 1px 6px 15px; } -a.vst-text:hover, a.vst-text:active { - color: #9c8cff; +.vst-list:hover { + border: 1px solid #909090; } -a.vst-text:hover b, a.vst-text:active b { - color: #9c8cff; +.vst-list:focus { + border: 1px solid #55C9C0; + color: #333; +} + +.vst-list.flat { + border: 1px solid #fff; + color: #2c9491; + text-transform: uppercase; + font-weight: bold; + font-size: 11px; + margin-left: -14px; + background-position: -210px -604px; + text-shadow: none !important; +} +.vst-list.flat:hover { + color: #ff6701; +} +.vst-list.flat option { + color: #555; +} + +a.vst-text, +a.vst-text b{ + color: #2c9491; +} +a.vst-text:hover, +a.vst-text:hover b{ + color: #ff6701; +} +a.vst-text:active, +a.vst-text:active b{ + color: #ff6701; } .vst-textinput { - background-color: #fff; - border: 1px solid #dee5e7; - border-radius: 3px; - color: #555; - font-size: 19px; - padding: 5px; - width: 560px; - height: 90px; - font-family: Arial, Helvetica, sans-serif; - padding: 9px 1px 6px 14px; - font-weight: normal; + background-color: #fff; + border: 1px solid #cfcfcf; + border-radius: 0px; + color: #555; + font-size: 19px; + padding: 5px; + width: 560px; + height: 90px; + font-family:Arial, Helvetica, sans-serif; + padding: 9px 1px 6px 14px; + font-weight: normal; } .vst-textinput:hover { - border: 1px solid #909090; + border: 1px solid #909090; } .vst-textinput:focus { - border: 1px solid #23b7e5; - background-color: #fff; - color: #333; + border: 1px solid #55C9C0; + background-color: #D7F9FF; + color: #333; } .vst-textinput:disabled { - background-color: #f1f1f1; + background-color: #f1f1f1; } -.vst-textinput.console { - font-size: 13px; - width: 630px; - height: 300px; - font-family: "Lucida Console", Monaco, monospace; - white-space: pre; +.vst-textinput.console{ + font-size: 13px; + width: 630px; + height: 300px; + font-family:"Lucida Console", Monaco, monospace; + white-space: pre; } .vst-textinput.short { - width: 360px; + width: 360px; } - -#advanced-options .console { - width: 833px; - height: 600px; +#advanced-options .console{ + width: 833px; + height: 600px; } - .generate { - color: #27c24c; - text-decoration: underline; - cursor: pointer; - margin-left: -3px; - padding: 0 3px; + color: #2C9491; + text-decoration: underline; + cursor: pointer; + margin-left: -3px; + padding: 0 3px; } .generate:hover { - background-color: #9c8cff; - border-color: #9c8cff; - color: #fff; + background-color: #ff6701; + border-color: #ff6701; + color: #fff; } .generate:active { - background-color: #F7D616; - border-color: #F7D616; + background-color: #F7D616; + border-color: #F7D616; } - .vst-advanced { - border-bottom: 1px solid #27c24c; - color: #27c24c; - font-size: 11px; - letter-spacing: 1px; - padding: 2px 2px 0; - text-decoration: none; - text-transform: uppercase; + border-bottom: 1px solid #2c9491; + color: #2c9491; + font-size: 11px; + letter-spacing: 1px; + padding: 2px 2px 0; + text-decoration: none; + text-transform: uppercase; } - .login-box .vst-advanced:hover { - color: #9c8cff; - background-color: transparent; - border-color: transparent; + color: #ff6701; + background-color: transparent; + border-color: transparent; } .vst-advanced:hover { - color: #fff; - background-color: #9c8cff; - border-color: #9c8cff; + color: #fff; + background-color: #ff6701; + border-color: #ff6701; } -.login-box .vst-advanced:active, .vst-advanced:active { - color: #fff; - background-color: #F7D616; - border-color: #F7D616; +.login-box .vst-advanced:active, +.vst-advanced:active { + color: #fff; + background-color: #F7D616; + border-color: #F7D616; } .login-box .vst-advanced { - border-bottom: none; - color: #27c24c; - font-size: 10px; - letter-spacing: 1px; - padding: 2px 2px 0; - text-decoration: none; - text-transform: uppercase; + border-bottom: none; + color: #2c9491; + font-size: 10px; + letter-spacing: 1px; + padding: 2px 2px 0; + text-decoration: none; + text-transform: uppercase; } - .vst-checkbox { - font-size: 19px; - margin: 2px 6px 0 3px; - padding: 5px; + font-size: 19px; + margin: 2px 6px 0 3px; + padding: 5px; } - .lets-encrypt-note { - color: #89a40a !important; - font-style: italic; - font-weight: normal !important; - height: 30px; - padding-top: 10px; - vertical-align: top; + color: #89a40a !important; + font-style: italic; + font-weight: normal !important; + height: 30px; + padding-top: 10px; + vertical-align: top; } .additional-control { - margin-left: 17px; - color: #27c24c; - border-bottom: 1px solid #27c24c; - font-size: 11px; - letter-spacing: 1px; - cursor: pointer; - text-transform: uppercase; - font-weight: bold; - padding: 2px 2px 0; + margin-left: 17px; + color: #2C9491; + border-bottom: 1px solid #2C9491; + font-size: 11px; + letter-spacing: 1px; + cursor: pointer; + text-transform: uppercase; + font-weight: bold; + padding: 2px 2px 0; } .additional-control:hover { - background-color: #9c8cff; - border-color: #9c8cff; - color: #fff; + background-color: #ff6701; + border-color: #ff6701; + color: #fff; } .additional-control:active { - color: #fff; - background-color: #aaa; + color: #fff; + background-color: #aaa; } + .additional-control.ftp-remove-user { - padding: 2px 0 0 0; + padding: 2px 0 0 0; } -.additional-control.delete:hover, .additional-control.ftp-remove-user:hover { - background-color: #FF3438; - border-color: #FF3438; + +.additional-control.delete:hover, +.additional-control.ftp-remove-user:hover { + background-color: #FF3438; + border-color: #FF3438; } -.additional-control.delete:active, .additional-control.ftp-remove-user:active { - background-color: #FF5F5F; - border-color: #FF5F5F; +.additional-control.delete:active, +.additional-control.ftp-remove-user:active { + background-color: #FF5F5F; + border-color: #FF5F5F; } .additional-control.add:hover { - background-color: #27c24c; - border-color: #27c24c; + background-color: #9FBF0C; + border-color: #9FBF0C; } -.additional-control.add:active { - background-color: #32f360; - border-color: #32f360; +.additional-control.add:active{ + background-color: #c0e60f; + border-color: #c0e60f; } + .additional-control.remove-ns { - display: none; + display: none; } .data .step-left { - padding-left: 50px; + padding-left: 50px; } - .hide-password { - color: #2361a1; - margin-left: -36px; - padding-left: 3px; - z-index: 1; + color: #2361a1; + margin-left: -36px; + padding-left: 3px; + z-index: 1; } - .toggle-psw-visibility-icon { - cursor: pointer; - opacity: 1; + cursor: pointer; + opacity: 1; } - .show-passwords-enabled-action { - opacity: 0.4; + opacity: 0.4; +} +.ftp-path-value, +.hint, +td.hint { + color: #777; + font-size: 15px; + font-style: italic; + font-weight: normal; +} +.ftp-path-prefix { padding-top: 7px; } + +.ui-button, +.button { + filter:chroma(color=#000); + cursor: pointer; + border-radius: 3px 3px 3px 3px; + font-size: 13px; + font-weight: bold; + padding: 1px 16px 3px 16px; + width: 108px; + height: 34px; + color: #fafafa; + border: 1px solid #9FBF0C; + background-color: #9FBF0C; +} +.ui-button:hover, +.button:hover { + color: #555; + border: 1px solid #C0E60F; + background-color: #C0E60F; +} +.ui-button:active, +.button:active { + border: 1px solid #D1D70D !important; + background-color: #D1D70D !important; } -.ftp-path-value, .hint, td.hint { - color: #777; - font-size: 15px; - font-style: italic; - font-weight: normal; +.ui-button:focus, +.button:focus { + border: 1px solid #90AD0D; + background-color: #90AD0D; } -.ftp-path-prefix { - padding-top: 7px; +.ui-button.cancel, +.button.cancel { + color: #777; + border: 1px solid #DFDEDD; + background-color: #DFDEDD; } - -.ui-button, .button { - filter: chroma(color=#000); - cursor: pointer; - border-radius: 3px 3px 3px 3px; - font-size: 13px; - font-weight: bold; - padding: 1px 16px 3px 16px; - width: 108px; - height: 34px; - color: #fafafa; - border: 1px solid #27c24c; - background-color: #27c24c; +.ui-button.cancel:hover, +.button.cancel:hover { + color: #fff; + border: 1px solid #999; + background-color: #999; } - -.ui-button:hover, .button:hover { - color: #555; - border: 1px solid #32f360; - background-color: #32f360; +.ui-button.cancel:active, +.button.cancel:active { + border: 1px solid #D1D70D; + background-color: #D1D70D; } - -.ui-button:active, .button:active { - border: 1px solid #54ca70 !important; - background-color: #54ca70 !important; -} - -.ui-button:focus, .button:focus { - border: 1px solid #25af49; - background-color: #25af49; -} - -.ui-button.cancel, .button.cancel { - color: #777; - border: 1px solid #dde6e9; - background-color: #dde6e9; -} - -.ui-button.cancel:hover, .button.cancel:hover { - color: #fff; - border: 1px solid #999; - background-color: #999; -} - -.ui-button.cancel:active, .button.cancel:active { - border: 1px solid #54ca70; - background-color: #54ca70; -} - a.button.cancel { - padding: 8px 38px; - text-transform: capitalize; + padding: 8px 38px; + text-transform: capitalize; } + .ui-dialog button.cancel { - color: #000; - border: 1px solid #555; - background-color: #555; + color: #000; + border: 1px solid #555; + background-color: #555; } - /* .ui-dialog button.cancel:hover { color: #fff; @@ -2614,101 +2789,105 @@ a.button.cancel { background-color: #999; } .ui-dialog button.cancel:active { - border: 1px solid #54ca70; - background-color: #54ca70; + border: 1px solid #D1D70D; + background-color: #D1D70D; } */ + + + .ui-button span { - color: #fff; + color: #fff; } .ui-button:hover span { - color: #555 !important; + color: #555 !important; } .ui-button:active span { - color: #555; + color: #555; } .ui-button.cancel span { - color: #777; + color: #777; } -.ui-button:hover span, .ui-button:active span { - color: #fff; +.ui-button:hover span { + color: #fff; +} +.ui-button:active span { + color: #fff; } .ui-dialog button.cancel span { - color: #ccc; + color: #ccc; } + .unlim-trigger { - cursor: pointer; - margin-left: -36px; - padding-left: 3px; - z-index: 1; + cursor: pointer; + margin-left: -36px; + padding-left: 3px; + z-index: 1; } - .optional { - font-size: 12px; - padding: 0 0 0 6px; - font-weight: normal; + font-size: 12px; + padding: 0 0 0 6px; + font-weight: normal; } - .data-active b { - color: #27c24c; - font-size: 11px; - letter-spacing: 1px; - text-transform: uppercase; + color: #9FBF0C; + font-size: 11px; + letter-spacing: 1px; + text-transform: uppercase; } - .data-suspended b { - color: #A3A3A3; - font-size: 11px; - letter-spacing: 3px; - font-weight: bold; - text-transform: uppercase; + color: #A3A3A3; + font-size: 11px; + letter-spacing: 3px; + font-weight: bold; + text-transform: uppercase; } - .data-date { - font-weight: normal; - color: #777; - font-size: 12px; - letter-spacing: 1px; - line-height: 23px; + font-weight: normal; + color: #777; + font-size: 12px; + letter-spacing: 1px; + line-height: 23px; } - -.data-dotted, .mail-infoblock-td { - vertical-align: top; +.data-dotted { + vertical-align: top; +} +.mail-infoblock-td { + vertical-align: top; } - .mail-infoblock { - margin-left: -110px; - font-size: 12px; - color: #777; - border: 1px solid #d9d9d9; - padding: 0px 5px 12px 20px; - margin-top: 64px; - width: 334px; - overflow: hidden; + margin-left: -110px; + font-size: 12px; + color: #777; + border: 1px solid #d9d9d9; + padding: 0px 5px 12px 20px; + margin-top: 64px; + width: 334px; + overflow: hidden; } .mail-infoblock:hover { - overflow: visible; + overflow: visible; } .mail-infoblock td { - color: #777; - font-size: 14px; - height: 18px; - font-weight: normal; + color: #777; + font-size: 14px; + height: 18px; + font-weight: normal; } -.mail-infoblock td:first-child { - padding-right: 15px; +.mail-infoblock td:first-child{ + padding-right: 15px; } .mail-infoblock div { - width: 190px; - white-space: nowrap; + width: 190px; + white-space: nowrap; } .mail-infoblock a { - color: #27c24c; + color: #2c9491; } .mail-infoblock a:hover { - color: #9c8cff; + color: #ff6701; } .additional-info { @@ -2725,1540 +2904,489 @@ a.button.cancel { padding-left: 20px; } -:focus { - outline: none; -} -::-moz-focus-inner { - border: 0; -} + +:focus {outline:none;} +::-moz-focus-inner {border:0;} .login { - background-color: #fff; - box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3); - font-family: Arial, Helvetica, sans-serif; - margin: 0; - padding: 0; - text-align: left; - vertical-align: top; - width: 500px; -} -.login a.error { - color: #BE5ABF; + background-color: #fff; + box-shadow: 0 2px 6px rgba(100, 100, 100, 0.3); + font-family: Arial,Helvetica,sans-serif; + margin: 0; + padding: 0; + text-align: left; + vertical-align: top; + width: 500px; } +.login a.error { + color: #BE5ABF; +} .vestacp { - color: #505050; - font-size: 10px; - text-align: right; + color: #505050; + font-size: 10px; + text-align: right; } .vestacp:hover { - color: #27c24c; + color: #2c9491; } .vestacp:active { - color: #9c8cff; + color: #ff6701; } - .login-bottom { - height: 50px; - margin: 0; - padding: 0 26px 0 0; - text-align: right; - vertical-align: top; - width: 474px; + height: 50px; + margin: 0; + padding: 0 26px 0 0; + text-align: right; + vertical-align: top; + width: 474px; } .l-unit.selected { - background-color: #feef9a; - color: #555; - border-bottom: 1px solid #c0b990; + background-color: #feef9a; + color: #555; + border-bottom: 1px solid #c0b990; } -.l-unit.selected b, .l-unit.selected strong { - color: #555; + +.l-unit.selected b, +.l-unit.selected strong { + color: #555; } + /* MAIN MENU COLLAPSED */ .collapsed .l-stat { - padding-top: 20px; + padding-top: 20px; } + .collapsed .l-stat__col a { - height: 0; - min-height: 0; - overflow: hidden; + height: 0; + min-height: 0; + overflow: hidden; } + .collapsed .l-stat__col-title { - padding-top: 2px; + padding-top: 2px; } div.l-content.collapsed > div.l-separator:nth-of-type(2) { - margin-top: 93px; - position: fixed; + margin-top: 93px; + position: fixed; } + div.l-content.collapsed > div.l-separator:nth-of-type(4) { - margin-top: 138px; - position: fixed; + margin-top: 138px; + position: fixed; } + div.l-content.collapsed .l-sort { - margin-top: 94px; + margin-top: 94px; } .l-content > .units.l-center::before { - content: ""; - display: block; - height: 260px; + content: ''; + display: block; + height: 260px; } form#vstobjects { - padding-top: 280px; + padding-top: 280px; } + form#vstobjects.suspended { - background-color: #EAEAEA; - padding-bottom: 30px; + background-color: #EAEAEA; + padding-bottom: 30px; } #add-icon { - width: 45px; - height: 45px; - background-image: url("/images/sprite.png?1446554104"); - background-position: -378px -107px; - background-repeat: no-repeat; - display: inline-block; - z-index: 3; + width: 45px; + height: 45px; + background-image: url("/images/sprite.png?1446554103"); + background-position: -378px -107px; + background-repeat: no-repeat; + display: inline-block; + z-index: 3; } - .l-sort__create-btn.restore #add-icon { - background-position: -378px -250px; + background-position: -378px -250px; } .l-sort__create-btn.edit #add-icon { - background-position: -378px -154px; + background-position: -378px -154px; } - #tooltip { - background-color: #aacc0d; - border-radius: 15px; - bottom: 6px; - color: #fff; - font-size: 12px; - font-weight: bold; - height: 26px; - left: 12px; - letter-spacing: 0; - line-height: 25px; - margin-left: 12px; - margin-top: 7px; - padding: 3px 14px 3px 27px; - position: absolute; - text-transform: uppercase; - white-space: nowrap; - word-break: keep-all; - z-index: -1; + background-color: #aacc0d; + border-radius: 15px; + bottom: 6px; + color: #fff; + font-size: 12px; + font-weight: bold; + height: 26px; + left: 12px; + letter-spacing: 0; + line-height: 25px; + margin-left: 12px; + margin-top: 7px; + padding: 3px 14px 3px 27px; + position: absolute; + text-transform: uppercase; + white-space: nowrap; + word-break: keep-all; + z-index: -1; } .l-sort__create-btn:active #add-icon { - background-position: -425px -107px; + background-position: -425px -107px; } .l-sort__create-btn.restore:active #add-icon { - background-position: -425px -250px !important; + background-position: -425px -250px !important; } + .l-sort__create-btn.edit:active #add-icon { - background-position: -425px -154px !important; + background-position: -425px -154px !important; } + .l-sort__create-btn.edit:hover #tooltip { - background-color: #23b7e5; + background-color: #55C9C0; } .l-sort__create-btn.edit:active #tooltip { - background-color: #3BF0E6 !important; + background-color: #3BF0E6 !important; } + + + + .l-sort__create-btn:active #tooltip { - background-color: #D9F210; + background-color: #D9F210; } .noselect { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; } .search-input { - background-color: #fff; - border: 1px solid #ddd; - height: 21px; - line-height: 28px; - padding-left: 7px; - float: left; - width: 74px; - /* visibility: hidden;*/ - -webkit-transition: width 0.2s ease-out; - -moz-transition: width 0.2s ease-out; - -o-transition: width 0.2s ease-out; - transition: width 0.2s ease-out; + background-color: #fff; + border: 1px solid #ddd; + height: 21px; + line-height: 28px; + padding-left: 7px; + float: left; + width: 74px; +/* visibility: hidden;*/ + -webkit-transition: width .2s ease-out; + -moz-transition: width .2s ease-out; + -o-transition: width .2s ease-out; + transition: width .2s ease-out; +} +.lang-ru .search-input.activated{ + width: 70px; +} +.search-input.activated{ + width: 130px; + visibility: visible; +} +.search-input:focus { +// background-color: #e8fcff; +// border-color: #75c9c2; +// color: #333; } -.lang-ru .search-input.activated { - width: 70px; -} - -.search-input.activated { - width: 130px; - visibility: visible; -} .float-left { - float: left; + float: left; } - .float-right { - float: right; + float: right; } - .display-inline-block { - display: inline-block; + display: inline-block; } - .width-100p { - width: 100%; + width: 100%; } .l-sort-toolbar table td { - float: left; + float: left; } - .l-sort-toolbar__search-box { - float: right !important; - padding-top: 3px; - padding-right: 0 !important; + float: right !important; + padding-top: 3px; + padding-right: 0 !important; } - .ui-dialog .ui-dialog-buttonpane button:nth-of-type(2) { - -background-color: #dde6e9; + -background-color: #dfdedd; } .shortcuts { - background: rgba(50, 50, 50, 0.9); - display: inline-block; - position: fixed; - left: 50%; - bottom: 0; - color: #eee; - width: 800px; - border: 1px solid #333; - font-size: 13px; - z-index: 120; - transform: translate(-50%, 0); + background: rgba(50, 50, 50, 0.9); + display: inline-block; + position: fixed; + left: 50%; + bottom: 0; + color: #eee; + width: 800px; + border: 1px solid #333; + font-size: 13px; + z-index: 120; + transform: translate(-50%, 0); } .shortcuts .header { - border-bottom: 1px solid #333; - height: 43px; + border-bottom: 1px solid #333; + height: 43px; } .shortcuts .title { - text-transform: uppercase; - color: #ffcc00; - padding: 7px 0 7px 14px; - display: inline-block; - float: left; - font-size: 11px; - letter-spacing: 3px; + text-transform: uppercase; + color: #ffcc00; + padding: 7px 0 7px 14px; + display: inline-block; + float: left; + font-size: 11px; + letter-spacing: 3px; } .shortcuts .close { - background: url("/images/sprite.png?1446554104") repeat scroll -408px -469px; - cursor: pointer; - display: inline-block; - float: right; - height: 32px; - padding-top: 11px; - width: 46px; + background: url("/images/sprite.png?1446554103") repeat scroll -408px -469px; + cursor: pointer; + display: inline-block; + float: right; + height: 32px; + padding-top: 11px; + width: 46px; } .shortcuts .close:hover { - background-color: #000; + background-color: #000; } .shortcuts .close:active { - background-color: #23b7e5; + background-color: #55c9c0; } .shortcuts ul { - list-style-type: none; - padding: 30px 20px; - display: inline-block; - float: left; - width: 360px; + list-style-type: none; + padding: 30px 20px; + display: inline-block; + float: left; + width: 360px; } .shortcuts ul li { - padding: 5px 20px; + padding: 5px 20px; } .shortcuts ul li.step-top { - padding-top: 30px; + padding-top: 30px; } .shortcuts ul li span { - color: #48F4EF; - display: inline-block; - font-weight: bold; - padding: 0 20px 0 0; - text-align: right; - /* width: 140px;*/ + color: #48F4EF; + display: inline-block; + font-weight: bold; + padding: 0 20px 0 0; + text-align: right; +/* width: 140px;*/ } .shortcuts ul li span.bigger { - font-size: 18px; + font-size: 18px; } .description { - font-weight: normal; - line-height: 25px; - padding-bottom: 45px; - margin-left: 50px; + font-weight: normal; + line-height: 25px; + padding-bottom: 45px; + margin-left: 50px; } -.description ul { - margin-top: 15px; - list-style: none; - padding-left: 0; +.description ul{ + margin-top: 15px; + list-style: none; + padding-left: 0; } -.description li { - margin: 10px 0; + +.description li{ + margin: 10px 0; } + .description a { - line-height: 30px; - text-decoration: underline; - color: #27c24c; + line-height: 30px; + text-decoration: underline; + color: #2c9491; } .description a.purchase { - color: #FFF; - background-color: #27c24c; - border: none; - border-radius: 3px; - font-size: 13px; - font-weight: bold; - padding: 7px 15px; - text-transform: capitalize; - text-decoration: none; + color: #FFF; + background-color: #9fbf0c; + border: none; + border-radius: 3px; + font-size: 13px; + font-weight: bold; + padding: 7px 15px;; + text-transform: capitalize; + text-decoration: none; } .description a.purchase:hover { - background-color: #32f360; - color: #555; + background-color: #c0e60f; + color: #555; } .description a.purchase:active { - background-color: #D9F210; - color: #555; + background-color: #D9F210; + color: #555; } + .description a.cancel { - background-color: #999; - border: none; - border-radius: 3px; - color: #fff; - font-size: 13px; - font-weight: bold; - padding: 7px 15px; - text-transform: capitalize; - text-decoration: none; + background-color: #999; + border: none; + border-radius: 3px; + color: #fff; + font-size: 13px; + font-weight: bold; + padding: 7px 15px; + text-transform: capitalize; + text-decoration: none; } .description a.cancel:hover { - background-color: #27c24c; + background-color: #2c9491; } .description a.cancel:active { - background-color: #5f9491; + background-color: #5f9491; } + .description.cancel-success { - color: #8fac0a; - font-weight: bold; + color: #8fac0a; + font-weight: bold; } + .description .licence { - padding: 20px 0; - color: #27c24c; + padding: 20px 0; + color: #2c9491; } + .description .licence input { - margin-left: 17px; - width: 137px; + margin-left: 17px; + width: 137px; } + .description span { - font-style: italic; - line-height: 45px; - padding-top: 20px; + font-style: italic; + line-height: 45px; + padding-top: 20px; } + .description .twoco { - font-style: italic; - line-height: 15px; - font-size: 12px; + font-style: italic; + line-height: 15px; + font-size: 12px; } .ui-dialog .ui-dialog-content { - padding: 10px 26px 30px !important; + padding: 10px 26px 30px !important; } .helper-container { - float: right; - height: 293px; - margin-bottom: -450px; - margin-top: 459px; - padding-top: 3px; - width: 563px; + float: right; + height: 293px; + margin-bottom: -450px; + margin-top: 459px; + padding-top: 3px; + width: 563px; } .context-helper { - text-transform: uppercase; - color: #777; - font-size: 11px; - cursor: pointer; - font-weight: bold; - float: right; + text-transform: uppercase; +# text-decoration: underline; + color: #777; + font-size: 11px; + cursor: pointer; + font-weight: bold; + float: right; } .context-helper:hover { - color: #23b7e5; + color: #55C9C0; } .context-helper:active { - color: #9c8cff; + color: #ff6701; } + .cron-helper-tabs { - /* margin-top: 30px;*/ - border: 1px solid #d9d9d9 !important; +/* margin-top: 30px;*/ + border: 1px solid #d9d9d9 !important; } + .cron-helper-tabs a { - color: #777; - font-size: 11px; - font-weight: bold; - line-height: 30px; - padding: 0 12px; - text-transform: uppercase; + color: #777; + font-size: 11px; + font-weight: bold; + line-height: 30px; + padding: 0 12px; + text-transform: uppercase; } + .cron-helper-tabs a:hover { - color: #9c8cff; + color: #ff6701; } .cron-helper-tabs a:active { - color: #23b7e5; + color: #55C9C0; } .cron-helper-tabs .ui-tabs-selected a { - color: #9c8cff; + color: #ff6701; } + .cron-helper-tabs select { - font-size: 15px !important; + font-size: 15px !important; } .cron-helper-tabs select.short { - background-position: -388px -604px; - min-width: 30px; - width: 70px; + background-position: -388px -604px; + min-width: 30px; + width: 70px; } + .cron-helper-tabs p { - color: #777; - font-size: 12px; + color: #777; + font-size: 12px; } -.cron-helper-tabs p span { - padding-right: 15px; - padding-left: 25px; +.cron-helper-tabs p span{ + padding-right: 15px; + padding-left: 25px; } -.cron-helper-tabs p span.first { - display: inline-block; - padding-right: 15px; - width: 100px; - padding-left: 0; +.cron-helper-tabs p span.first{ + display: inline-block; + padding-right: 15px; + width: 100px; + padding-left: 0; } + .cron-helper-tabs .button { - width: auto; - background-color: #23b7e5; - border: 1px solid #23b7e5; - text-transform: capitalize; + width: auto; + background-color: #55C9C0; + border: 1px solid #55C9C0; + text-transform: capitalize; } .cron-helper-tabs .button:hover { - background-color: #00d8ff; - border: 1px solid #00d8ff; + background-color: #5BD8CF; + border: 1px solid #5BD8CF; } .cron-helper-tabs .button:active { - background-color: #49c8ef; - border: 1px solid #49c8ef; + background-color: #4FBCB4; + border: 1px solid #4FBCB4; } .context-helper-close { - background: rgba(0, 0, 0, 0) url("/images/sprite.png?1446554104") repeat scroll -408px -469px; - cursor: pointer; - display: inline-block; - float: right; - height: 32px; - padding-top: 11px; - width: 46px; - filter: contrast(50%); + background: rgba(0, 0, 0, 0) url("/images/sprite.png?1446554103") repeat scroll -408px -469px; + cursor: pointer; + display: inline-block; + float: right; + height: 32px; + padding-top: 11px; + width: 46px; + filter: contrast(50%); } .context-helper-close:hover { - background-color: #aaa; - filter: none; + background-color: #aaa; + filter: none; } .context-helper-close:active { - background-color: #999; - filter: none; + background-color: #999; + filter: none; } @media screen and (max-width: 950px) { - .helper-container { - display: none; - } -} - - -/* ------ fixes ------ */ - -body { - background: #f0f3f5; - color: #58666f; - font-family: 'Source Sans Pro', sans-serif; -} -b, strong { - color: #58666f; -} -.l-percent { - border-bottom: none; - margin-top: 1px; - width: 200px; - background: #e4eaed; -} -.l-percent__fill { - background-color: #2ac34e; - bottom: 0; -} -.to-top { - z-index: 100; - top: unset; - bottom: 30px; - right: 285px; -} -.to-shortcuts { - z-index: 100; - top: unset; - bottom: 30px; - right: 330px; -} -.shortcuts { - right: calc(50% - 400px); - bottom: calc(50% - 213px); -} -.l-separator { - display: none; -} -.l-header { - position: fixed; - width: calc(100% - 40px); - z-index: 99; - background: #fff; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(0, 0, 0, 0.05); - color: #58666f; - height: 50px; - padding: 0 20px; - margin-bottom: unset; -} -.l-header a { - color: #58666f; - font-size: 14px; -} -.l-header a:hover { - color: #58666f; -} -.l-header .l-center { - max-width: none !important; -} -.l-header .l-center .l-logo { - background-position: -65px -182px; - /* background-position: -125px -478px; */ - background-repeat: no-repeat; - display: block; - height: 40px; - margin-top: 0; - width: 80px; - /* width: 42px; */ - margin-left: 0; - background-size: 235px 325px; - position: relative; - top: 5px; - left: 0; - float: left; - padding-right: 20px; -} -.l-header .l-center .l-menu { - position: unset; - margin-left: unset; -} -.l-header .l-center .l-menu .l-menu__item a { - line-height: 50px; - padding: 0 18px; - display: inline-block; -} -.l-header .l-center .l-menu .l-menu__item a:hover { - background-color: rgba(0, 0, 0, 0.05); -} -.l-header .l-center .l-menu .l-menu__item a:active { - background-color: rgba(0, 0, 0, 0.05); -} -.l-header .l-center .l-menu .l-menu__item.l-menu__item--active a { - color: unset; - font-size: unset; - font-weight: unset; - text-transform: unset; - background-color: rgba(0, 0, 0, 0.05); -} -.l-header .l-center .l-profile .l-profile__notifications { - margin-top: 13px; -} -.l-header .l-center .l-profile .l-profile__notifications:hover { - background-color: rgba(0, 0, 0, 0.05); -} -.l-header .l-center .l-profile .l-profile__username { - padding: 15px 0 0 10px; -} -.l-header .l-center .l-profile .l-profile__logout { - padding: 15px 0 0 10px; -} -.l-header > .l-center { - margin-left: 200px; -} -.l-content { - position: relative; - top: 50px; -} -.l-content + div { - right: 100px !important; - top: unset !important; - bottom: 40px !important; -} -.l-content + div div { - background-color: #e4eaed !important; - padding: 10px; - border-radius: 5px; -} -.l-content .l-center { - max-width: none !important; -} -.l-content .l-center .l-stat { - display: block; - position: fixed; - z-index: 100; - padding-top: 0 !important; - width: 200px; - height: 100%; - top: 0; - margin-top: 0; - background: #1c2b35; - overflow-y: scroll; - scrollbar-width: thin; - /* Firefox */ - -ms-overflow-style: scrollbar; - /* Internet Explorer 10+ */ - /* width */ -} -.l-content .l-center .l-stat::-webkit-scrollbar { - display: block; - width: 7px; - /* Track */ -} -.l-content .l-center .l-stat::-webkit-scrollbar-track { - background: rgba(255, 255, 255, 0); - /* Handle */ -} -.l-content .l-center .l-stat::-webkit-scrollbar-thumb { - background: rgba(255, 255, 255, 0.15); -} -.l-content .l-center .l-stat:hover { - /* Handle on hover */ -} -.l-content .l-center .l-stat:hover::-webkit-scrollbar-thumb { - background: rgba(255, 255, 255, 0.4); -} -.l-content .l-center .l-stat .l-stat__col--active ul { - display: block !important; -} -.l-content .l-center .l-stat .l-stat__col--active { - background: #131e27; -} -.l-content .l-center .l-stat .l-stat__col--active a { - border-bottom: 2px solid #131e27; -} -.l-content .l-center .l-stat .l-stat__col--active a .l-stat__col-title { - background: #16232d; - color: white !important; - font-size: 20px; - font-weight: 400; - margin-top: unset; - letter-spacing: unset; - margin-right: unset; -} -.l-content .l-center .l-stat .l-stat__col--active span { + .helper-container { display: none; -} -.l-content .l-center .l-stat .focus { - background: #5e5e5e; -} -.l-content .l-center .l-stat .focus a { - border-bottom: 2px solid #131e27; -} -.l-content .l-center .l-stat .focus a ul li { - color: #c2e5ff !important; -} -.l-content .l-center .l-stat .focus a .l-stat__col-title { - background: #5e5e5e; - color: #c4d0d8; - font-size: 20px; - font-weight: 400; - margin-top: unset; - letter-spacing: unset; - margin-right: unset; -} -.l-content .l-center .l-stat .l-stat__col { - display: block; - float: unset; -} -.l-content .l-center .l-stat .l-stat__col:hover .l-stat__col-title { - color: #fff; -} -.l-content .l-center .l-stat .l-stat__col:hover .l-stat__col-title:after { - color: #fff; -} -.l-content .l-center .l-stat .l-stat__col a { - height: unset !important; - min-height: unset !important; - display: block; - width: unset; - border-bottom: 2px solid #131e27; - background-color: transparent; - padding-left: unset; - padding-bottom: 10px; - padding-top: unset; - margin-top: unset; -} -.l-content .l-center .l-stat .l-stat__col a .l-stat__col-title { - min-height: unset !important; - color: #869fb2; - font-size: 20px; - font-weight: 400; - padding: 15px 15px 15px 20px; - margin-bottom: 0; - margin-top: 0 !important; -} -.l-content .l-center .l-stat .l-stat__col a .l-stat__col-title:after { - font-family: 'Font Awesome 5 Free'; - font-weight: bold; - content: "\f054"; - float: right; - font-size: 10px; - color: #5c798f; - margin-top: 8px; - margin-right: 26px; -} -.l-content .l-center .l-stat .l-stat__col a .l-stat__col-title:before { - font-family: 'Font Awesome 5 Free'; - font-weight: bold; - content: "\f233"; - padding-right: 10px; - font-size: 17px; -} - -.l-content .l-center .l-stat .l-stat__col--active a .l-stat__col-title:after { - margin-right: 26px; -} - -.l-content .l-center .l-stat .l-stat__col a ul { - margin: 0; - display: none; -} -.l-content .l-center .l-stat .l-stat__col a ul li { - color: #92adc2; - margin-bottom: unset; - padding: 10px 20px 10px 20px; - font-size: 14px; -} -.l-content .l-center .l-stat .l-stat__col a ul li span { - float: right; - padding: 3px 5px 4px 5px; - font-size: 13px; - color: #fff; - background-color: #27c54e; - font-weight: 700; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); - display: inline-block; - min-width: 10px; - line-height: 1; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: 0.25em; - left: 133px; -} -.l-content .l-center .l-stat .l-stat__col a ul li:first-child span { - float: right; - padding: 3px 5px 4px 5px; - font-size: 13px; - color: #fff; - background-color: #34b5dd; - font-weight: 700; - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.2); - display: inline-block; - min-width: 10px; - line-height: 1; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - border-radius: 10px; -} -.l-content .l-center .l-stat .l-stat__col a ul li:before { - font-family: 'Font Awesome 5 Free'; - font-weight: bold; - content: "\f03a"; - padding-right: 15px; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(1) a .l-stat__col-title:before { - content: "\f500"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(1) a ul li:nth-of-type(1):before { - content: "\f0a0"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(1) a ul li:nth-of-type(2):before { - content: "\f75b"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(1) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(2) a .l-stat__col-title:before { - content: "\f233"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(2) a ul li:nth-of-type(1):before { - content: "\f0ac"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(2) a ul li:nth-of-type(2):before { - content: "\f0c5"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(2) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(3) a .l-stat__col-title:before { - content: "\f6ff"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(3) a ul li:nth-of-type(1):before { - content: "\f0ac"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(3) a ul li:nth-of-type(2):before { - content: "\f303"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(3) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(4) a .l-stat__col-title:before { - content: "\f674"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(4) a ul li:nth-of-type(1):before { - content: "\f0ac"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(4) a ul li:nth-of-type(2):before { - content: "\f2bb"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(4) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(5) a .l-stat__col-title:before { - content: "\f1c0"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(5) a ul li:nth-of-type(1):before { - content: "\f1c0"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(5) a ul li:nth-of-type(2):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(5) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(6) a .l-stat__col-title:before { - content: "\f120"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(6) a ul li:nth-of-type(1):before { - content: "\f120"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(6) a ul li:nth-of-type(2):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(6) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(7) a .l-stat__col-title:before { - content: "\f019"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(7) a ul li:nth-of-type(1):before { - content: "\f019"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(7) a ul li:nth-of-type(2):before { - content: "\f05e"; -} -.l-content .l-center .l-stat .l-stat__col:nth-of-type(7) a ul li:nth-of-type(3):before { - content: "\f05e"; -} -.l-content .l-center .l-sort { - padding: 0 20px; - position: relative; - z-index: 98; - width: auto; - margin-top: unset !important; - background-color: #f6f8f8; - border-bottom: 1px solid #dee5e8; - margin-bottom: 30px; -} -.l-content .l-center .l-sort .l-sort__create-btn { - bottom: -20px; -} -.l-content .l-center .l-sort .context-menu { - top: 77px; -} -.l-content .l-center .l-sort .l-sort-toolbar { - padding: 24px 0 22px 0; - color: #98a6ac; -} -.l-content .l-center .l-sort .l-sort-toolbar .l-select { - border-radius: 3px 0 0 3px; - background: #fff; - border: 1px solid #dee5e8; -} -.l-content .l-center .l-sort .l-sort-toolbar .l-sort-toolbar__filter-apply { - border-radius: 0 3px 3px 0; -} -.l-content .l-center .l-sort .l-sort-toolbar table tbody tr .l-sort-toolbar__search-box form .search-input { - border-radius: 3px 0 0 3px; - border: 1px solid #dee5e8; -} -.l-content .l-center .l-sort .l-sort-toolbar table tbody tr .l-sort-toolbar__search-box form .l-sort-toolbar__search { - border-radius: 0 3px 3px 0; -} -.l-content .l-center .l-sort .l-sort-toolbar table tbody tr .sort-by { - padding-left: 30px; -} -.l-content .l-center .l-unit { - padding: 0 0 0 15px; - overflow: hidden; - margin: 0px 20px 20px 20px; - background: #fff; - border-radius: 3px; - border-bottom: none !important; - border-left: none !important; - color: #98a6ac; - font-size: 14px; -} -.l-content .l-center .l-unit.selected { - background-color: #e4eaed; -} -.l-content .l-center .l-unit--suspended { - background-color: #eaeaea !important; -} -.l-content .l-center .l-unit.selected .l-percent { - border-bottom: none; - margin-top: 1px; - width: 200px; - background: #cbd3d7; -} -.l-content .l-center .l-unit .l-unit-toolbar .l-unit-toolbar__col.l-unit-toolbar__col--right { - position: relative; - top: 20px; - right: 20px; - display: block; -} -.l-content .l-center .l-unit .l-unit-toolbar .l-unit-toolbar__col.l-unit-toolbar__col--right .actions-panel__col { - margin-left: 10px; - border-radius: 3px; - overflow: hidden; - border-right: none; - background-color: #dde6e8; -} -.l-content .l-center .l-unit .l-unit-toolbar .l-unit-toolbar__col.l-unit-toolbar__col--right .actions-panel__col a { - font-weight: 500; -} -.l-content .l-center .l-unit .l-unit-toolbar .l-unit-toolbar__col .check-label:before { - z-index: 97; -} -.l-content .l-center .l-unit .l-unit__col .l-unit__name { - color: #34b5dd; - font-weight: 500; - font-size: 24px; - margin-bottom: unset; -} -.l-content .l-center .l-unit .l-unit__col .l-unit__ip { - font-size: 18px; -} -.l-content .l-center .l-unit .l-unit__col .l-unit__date { - letter-spacing: unset; - display: inline-block; - border-bottom: solid 10px #ffeb0087; - line-height: 3px; - padding: 0 0px; - margin-bottom: 30px; - font-weight: 400; - font-size: 16px; -} -.l-content .l-center .l-unit .l-unit__col .l-unit__stats td { - height: 27px; -} -.l-content .l-center .io-box { - overflow: hidden; - margin: 20px 20px 0px 20px; - color: #98a6ac; -} -.l-content .l-center .io-box .io-box-left { - float: left; - width: calc(100% - 800px); - /*min-width: 283px;*/ - text-align: center; -} -.l-content .l-center .io-box .io-box-left .io-box-left-items { - float: left; - width: calc(50% - 20px); - height: 137px; - margin-right: 20px; - margin-bottom: 20px; - background: #fff; - border-radius: 3px; - min-width: 125px; -} -.l-content .l-center .io-box .io-box-left .io-box-left-items a { - display: block; - font-size: 36px; - font-weight: 300; - margin-top: 32px; -} -.l-content .l-center .io-box .io-box-left .io-1-homepage-block { - color: #98a6ac; -} -.l-content .l-center .io-box .io-box-left .io-1-homepage-block a { - color: #34b5dd; -} -.l-content .l-center .io-box .io-box-left .io-2-homepage-block { - color: #b4efc2; - background-color: #27c54e; -} -.l-content .l-center .io-box .io-box-left .io-2-homepage-block a { - color: #ecfff1; -} -.l-content .l-center .io-box .io-box-left .io-3-homepage-block { - color: #b0e1f1; - background-color: #34b5dd; -} -.l-content .l-center .io-box .io-box-left .io-3-homepage-block a { - color: #dcf2f8; -} -.l-content .l-center .io-box .io-box-left .io-4-homepage-block { - color: #98a6ac; -} -.l-content .l-center .io-box .io-box-left .io-4-homepage-block a { - color: #58666f; -} -.l-content .l-center .io-box .io-box-left .io-1-homepage-block span { - padding: 5px; -} -.l-content .l-center .io-box .io-box-left .io-2-homepage-block span { - padding: 5px; -} -.l-content .l-center .io-box .io-box-left .io-3-homepage-block span { - padding: 5px; -} -.l-content .l-center .io-box .io-box-left .io-4-homepage-block span { - padding: 5px; -} -.l-content .l-center .io-box .io-box-left .io-5-homepage-block span { - padding: 5px; -} - -.l-content .l-center .io-box .io-box-left .io-5-homepage-block { - width: calc(100% - 20px); - color: #98a6ac; - background: #e4eaed; -} -.l-content .l-center .io-box .io-box-left .io-5-homepage-block a { - color: #27c54e; -} -.l-content .l-center .io-box .io-box-left .io-5-homepage-block:before { - font-family: 'Font Awesome 5 Free'; - font-weight: bold; - font-size: 32px; - background: #dde6e8; - height: 121px; - width: 115px; - line-height: 90px; - content: "\f581"; - color: #fff; - float: left; - border-radius: 5px 0 0 5px; - padding-top: 16px; -} -.l-content .l-center .io-box .io-box-right { - float: right; - width: 800px; - background: #fff; - height: 450px; - overflow: hidden; - border-radius: 3px; - text-align: center; -} -.l-content .l-center .io-box .io-box-right img { - margin-top: 8px; - width: 767px; - height: 433px; - position: relative; -} -.l-content .l-center .l-unit-ft { - padding: 0 0 37px 15px; - overflow: hidden; - margin: 0px 20px 19px 20px; - background: #e4eaed; - border-radius: 3px; - border-bottom: none !important; - border-left: none !important; - position: relative; - color: #a6b0b4; - font-weight: bold; - text-transform: uppercase; - font-size: 11px; -} -.l-content .l-center .l-unit-ft:before { - font-family: "Font Awesome 5 Free"; - font-weight: bold; - font-size: 32px; - background: #dde6e8; - height: 100%; - width: 90px; - line-height: 108px; - content: "\f05a"; - color: #fff; - float: left; - border-radius: 5px 0 0 5px; - position: absolute; - left: 0; - text-align: center; -} -.l-content .l-center .l-unit-ft .data { - margin: 0 0 50px 0; -} -.l-content .l-center #vstobjects { - padding: 0 0 0 15px; - overflow: hidden; - margin: 0px 20px 20px 20px; - background: #fff; - border-radius: 3px; - border-bottom: none !important; - border-left: none !important; - color: #98a6ac; - font-size: 14px; -} -.l-content .l-center #vstobjects .data-date { - color: #98A6AC; - letter-spacing: unset; - display: inline-block; - border-bottom: solid 10px #ffeb0087; - line-height: 3px; - padding: 0 0px; - margin-bottom: 30px; - font-weight: 400; - font-size: 16px; -} -.l-content .l-center .vst-text.step-top.helper-container { - margin-bottom: unset; - margin-top: 0; - float: unset; - height: auto; - width: auto; -} -.l-content .l-center .vst-text.step-top.helper-container #tabs.cron-helper-tabs { - padding: 0 0 0 15px; - overflow: hidden; - margin: 0 20px 20px 20px; - background: #fff; - border-radius: 3px; - border-bottom: none !important; - border-left: none !important; - color: #98a6ac; - font-size: 14px; - border: none !important; -} -.l-content > .units.l-center::before { - content: ''; - display: block; - height: 0; -} -.l-content > .l-center { - margin-left: 200px; - margin-right: 240px; -} -.l-content > .l-center:first-child { - margin-left: 0; -} -.l-content #vstobjects > .l-center { - margin-left: 200px; - margin-right: 240px; - padding-top: 0; - padding-bottom: 1px; -} - -.l-content .right_sidebar { - width: 240px; - position: fixed; - display: block; - z-index: 98; - top: 50px; - right: 0px; - box-sizing: border-box; - height: 100%; - background: #fff; - border-left: 1px solid #dee5e8; -} -.l-content .io-log { - color: #58666f; - border-left: 1px solid #dee5e8; - width: 240px; - position: relative; - display: block; - /*overflow-scrolling: auto;*/ - z-index: 99; - top: 0px; - right: 0px; - background: #fff; - word-break: break-word; - overflow: hidden; - border-right: 8px solid #e3e3e3; - box-sizing: border-box; -} -.l-content .io-log::-webkit-scrollbar { - width: 7px; - /* Track */ -} -.l-content .io-log::-webkit-scrollbar-track { - background: rgba(255, 255, 255, 0); - /* Handle */ -} -.l-content .io-log::-webkit-scrollbar-thumb { - background: rgba(0, 0, 0, 0.15); - border-radius: 7px; - /* Handle on hover */ -} -.l-content .io-log::-webkit-scrollbar-thumb:hover { - background: rgba(0, 0, 0, 0.4); - border-radius: 7px; -} -.l-content .io-log > * { - margin: 0 20px; -} -.l-content .io-log h2 { - margin: 0 0 20px 0; - padding-left: 20px; - font-size: 24px; - font-weight: 300; - line-height: 60px; - color: #98a6ac; - border-bottom: 1px solid #dee5e8; - cursor: pointer; -} -.l-content .io-log h2:before { - font-family: "Font Awesome 5 Free"; - font-weight: bold; - content: "\f15c"; - padding-right: 10px; - font-size: 17px; -} -.l-content .io-log > div { - /* border-left: solid 1px #dee5e8; */ - padding-left: 15px; - position: relative; - margin-left: 25px; -} -.l-content .io-log > div > div { - position: relative; - margin-bottom: 25px; -} -.l-content .io-log > div > div > div:nth-of-type(2) { - color: #98a6ac; - font-size: 13px; - margin-bottom: 5px; -} -.l-content .io-log > div > div > div:nth-of-type(3) { - color: #98a6ac; - font-size: 13px; - margin-bottom: 5px; -} -.l-content .io-log > div > div:before { - content: ''; - position: absolute; - height: 100%; - width: 7px; - border-radius: 10px; - border: solid 1px #dee5e8; - background: #e0fff9; - left: -20px; -} -.l-content .io-log > div > div:first-child(1n):before { - background: #e0fff9; -} -.l-content .io-log > div > div:nth-child(2n):before { - background: #fbffe0; -} -.l-content .io-log > div > div:nth-child(3n):before { - background: #fbffe0; -} -.l-content .io-log > div > div:nth-child(4n):before { - background: #fbffe0; -} -.l-content .io-log > div > div:nth-child(5n):before { - background: #fbffe0; -} - -.l-content .io-log2 { - color: #58666f; - border-left: 1px solid #dee5e8; - border-top: 1px solid #cecece; - width: 240px; - position: relative; - height: 100%; - display: block; - /*overflow-scrolling: auto;*/ - z-index: 99; - top: 0px; - right: 0px; - background: #fff; - word-break: break-word; - overflow-y: scroll; - scrollbar-width: thin; - box-sizing: border-box; -} -.l-content .io-log2::-webkit-scrollbar { - width: 7px; - /* Track */ -} -.l-content .io-log2::-webkit-scrollbar-track { - background: rgba(255, 255, 255, 0); - /* Handle */ -} -.l-content .io-log2::-webkit-scrollbar-thumb { - background: rgba(0, 0, 0, 0.15); - border-radius: 7px; - /* Handle on hover */ -} -.l-content .io-log2::-webkit-scrollbar-thumb:hover { - background: rgba(0, 0, 0, 0.4); - border-radius: 7px; -} -.l-content .io-log2 > * { - margin: 0 20px; -} -.l-content .io-log2 h2 { - margin: 0 0 20px 0; - padding-left: 20px; - font-size: 24px; - font-weight: 300; - line-height: 60px; - color: #98a6ac; - border-bottom: 1px solid #dee5e8; - cursor: pointer; -} -.l-content .io-log2 h2:before { - font-family: "Font Awesome 5 Free"; - font-weight: bold; - content: "\f15c"; - padding-right: 10px; - font-size: 17px; -} -.l-content .io-log2 > div { - border-left: solid 1px #dee5e8; - padding-left: 15px; - position: relative; - margin-left: 25px; -} -.l-content .io-log2 > div > div { - position: relative; - margin-bottom: 25px; -} -.l-content .io-log2 > div > div > div:nth-of-type(2) { - color: #98a6ac; - font-size: 12px; - margin-bottom: 5px; -} -.l-content .io-log2 > div > div:before { - content: ''; - position: absolute; - height: 100%; - width: 7px; - border-radius: 10px; - border: solid 1px #dee5e8; - background: #fff; - left: -20px; -} -.l-content .io-log2 > div > div:nth-child(2n):before { - border: solid 1px #27c54e; -} -.l-content .io-log2 > div > div:nth-child(3n):before { - border: solid 1px #27bbc5; -} -.l-content .io-log2 > div > div:nth-child(4n):before { - border: solid 1px #275bc5; -} -.l-content .io-log2 > div > div:nth-child(5n):before { - border: solid 1px #ffcc00; -} - - -#tooltip { - background-color: #3AB5DD; -} -#tooltip:hover { - background-color: #1ca2cc; -} - -.l-sort__create-btn.edit:hover #tooltip { - background-color: #49c8ef; -} -.l-sort__create-btn.edit:active #tooltip { - background-color: #00d8ff !important; -} -.l-sort__create-btn:active #tooltip { - background-color: #00d8ff; -} -.body-login, .body-reset { - background-color: #f0f3f5; -} -.body-login .login, .body-reset .login { - font-family: Arial, Helvetica, sans-serif; - border: 1px solid #e7ecee; - border-radius: 10px; - overflow: hidden; - position: relative; - padding: 35px 35px 10px 35px; - display: block; - width: 420px; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(0, 0, 0, 0.05); -} -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(1), .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(1) { - position: absolute; - text-align: center; - width: calc(100% - 46px); -} -/* -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(1) a, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(1) a { - background-image: url(/images/sprite.png?1446554103); - background-position: -65px -182px; - background-repeat: no-repeat; - display: inline-block; - height: 40px; - margin-top: 0; - width: 80px; - margin-left: 0; - background-size: 235px 325px; - position: relative; -} -*/ -/* -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(1) a img, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(1) a img { - display: none; -} -*/ -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2), .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) { - position: relative; - padding: 65px 0 0 0 !important; -} -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .vst-input, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .vst-input { - padding: 5px 10px; - margin: 0; - width: 320px !important; - margin-top: 7px; - border-radius: 3px; - border: solid 1px #d3d9e2; -} -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .button, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .button, .body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .button:hover, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .button:hover, .body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .button:active, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(1) > td:nth-of-type(2) .button:active { - width: 100% !important; - border: 1px solid #27c54e; - background-color: #27c54e; - color: #f4f3f9; - margin-bottom: 20px; -} -.body-login .login > tbody > tr > td > table > tbody > tr:nth-of-type(2) .login-bottom, .body-reset .login > tbody > tr > td > table > tbody > tr:nth-of-type(2) .login-bottom { - width: auto; - text-align: center; - padding-bottom: unset; - padding: 0; -} -.body-login .login-box .vst-advanced, .body-reset .login-box .vst-advanced { - color: #34b5dd; -} -.body-web-log .l-header > .l-center { - margin-left: 0; -} -.l-stat__col span { - padding: 4px 0; - font-size: 15px; - position: fixed; - display: inline-block; - left: 159px; -} -.l-sort__create-btn2 { - background-image: url("/images/sprite.png?1446554103"); - background-position: -331px -107px; - background-repeat: no-repeat; - display: inline-block; - height: 45px; - width: 45px; -} -/* -.ui-resizable-handle { - background-color: #333 !important; -} -*/ -/* -div.ui-dialog div { - background-color: #333 !important; -} -*/ -div.ui-dialog > div { - background-color: #333 !important; -} -div.ui-dialog > div div { - background-color: #333 !important; -} -/* -div.ui-dialog > div > div { - background-color: #333 !important; -} -div.ui-dialog + div { - background-color: #333 !important; -} -div.ui-dialog + div div{ - background-color: #333 !important; -} -*/ -/* -.ui-dialog-titlebar { - background-color: #333 !important; -} -.ui-dialog-buttonpane { - background-color: #333 !important; -} -*/ - -.backup-items { - background-color: #f8f8f8; - margin: 10px 33px; - border-radius: 10px; -} - -.upper_button { - background-color: #3AB5DD; - color: #fff !important; - padding: 5px 10px !important; - border-radius: 13px; -} - -.get-ip-info-btn { - cursor: pointer; - margin-left: 10px; -} -.get-ip-info-btn:hover { - color: #000000; -} -.get-ip-info-btn + .get-ip-info-result { - margin: 10px 0; -} -.get-ip-info-btn + .get-ip-info-result dl dt { - font-weight: bold; -} -.get-ip-info-btn + .get-ip-info-result dl dd { - margin: 0 0 10px 0; -} -.get-ip-info-btn + .get-ip-info-result dl .fa-exclamation-triangle { - color: red; -} -.get-ip-info-btn + .get-ip-info-result dl .fa-check-circle { - color: green; -} -.get-ip-info-btn + .get-ip-info-result dl .fa-exclamation-circle { - color: orange; + } } diff --git a/web/delete/backup/exclusion/index.php b/web/delete/backup/exclusion/index.php index 7cad5856..29ad3bd5 100644 --- a/web/delete/backup/exclusion/index.php +++ b/web/delete/backup/exclusion/index.php @@ -1,7 +1,4 @@ " . escapeshellarg($passthru_is_disabled_workaround_file), $output, $return_var); - readfile($passthru_is_disabled_workaround_file); - fclose($passthru_is_disabled_workaround_handle); // fclose(tmpfile()) automatically deletes the file, unlink is not required :) -} -if ($return_var != 0) { - $errstr = "Internal server error: command returned non-zero: {$return_var}: {$cmd}"; - echo $errstr; - throw new Exception($errstr); // make sure it ends up in an errorlog somewhere +exec (VESTA_CMD."v-list-web-domain-".$type."log $user ".$v_domain." 5000", $output, $return_var); +if ($return_var == 0 ) { + foreach($output as $file) { + echo $file . "\n"; + } } +?> diff --git a/web/edit/backup/exclusions/index.php b/web/edit/backup/exclusions/index.php index f4b854b0..bbbb4b3e 100644 --- a/web/edit/backup/exclusions/index.php +++ b/web/edit/backup/exclusions/index.php @@ -12,7 +12,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { } // List backup exclustions -exec (VESTA_CMD."v-list-user-backup-exclusions ".$user." json", $output, $return_var); +exec (VESTA_CMD."v-list-user-backup-exclusions ".$user." 'json'", $output, $return_var); check_return_code($return_var,$output); $data = json_decode(implode('', $output), true); unset($output); diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php index 9f7ffb34..c66ca85c 100644 --- a/web/edit/cron/index.php +++ b/web/edit/cron/index.php @@ -20,10 +20,10 @@ if (empty($_GET['job'])) { // List cron job $v_job = escapeshellarg($_GET['job']); -exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." json", $output, $return_var); +exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var); check_return_code($return_var,$output); -$data = json_decode(implode('', $output), true); +$data = json_decode(implode('', str_replace("\\", "\\\\", $output)), true); unset($output); // Parse cron job diff --git a/web/edit/db/index.php b/web/edit/db/index.php index 232f6322..21d394f0 100644 --- a/web/edit/db/index.php +++ b/web/edit/db/index.php @@ -20,7 +20,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) { // List datbase $v_database = escapeshellarg($_GET['database']); -exec (VESTA_CMD."v-list-database ".$user." ".$v_database." json", $output, $return_var); +exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var); check_return_code($return_var,$output); $data = json_decode(implode('', $output), true); unset($output); @@ -42,8 +42,6 @@ if ( $v_suspended == 'yes' ) { $v_status = 'active'; } -$v_database = escapeshellarg($_GET['database']); - // Check POST request if (!empty($_POST['save'])) { $v_username = $user; diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php index b8cbc4db..3c2e1e5c 100644 --- a/web/edit/dns/index.php +++ b/web/edit/dns/index.php @@ -52,7 +52,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) { if ((!empty($_GET['domain'])) && (!empty($_GET['record_id']))) { $v_domain = escapeshellarg($_GET['domain']); $v_record_id = escapeshellarg($_GET['record_id']); - exec (VESTA_CMD."v-list-dns-records ".$user." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-records ".$user." ".$v_domain." 'json'", $output, $return_var); check_return_code($return_var,$output); $data = json_decode(implode('', $output), true); unset($output); @@ -88,7 +88,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor // Change domain IP if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." no", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); check_return_code($return_var,$output); $restart_dns = 'yes'; unset($output); @@ -97,7 +97,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor // Change domain template if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." no", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -106,7 +106,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor // Change SOA record if (($v_soa != $_POST['v_soa']) && (empty($_SESSION['error_msg']))) { $v_soa = escapeshellarg($_POST['v_soa']); - exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." no", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -115,7 +115,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor // Change expiriation date if (($v_exp != $_POST['v_exp']) && (empty($_SESSION['error_msg']))) { $v_exp = escapeshellarg($_POST['v_exp']); - exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." no", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -123,7 +123,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (empty($_GET['recor // Change domain ttl if (($v_ttl != $_POST['v_ttl']) && (empty($_SESSION['error_msg']))) { $v_ttl = escapeshellarg($_POST['v_ttl']); - exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." no", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; diff --git a/web/edit/file/index.php b/web/edit/file/index.php index 931b861f..d6ae8dce 100644 --- a/web/edit/file/index.php +++ b/web/edit/file/index.php @@ -37,12 +37,6 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { $content = ''; $path = $_REQUEST['path']; if (!empty($_POST['save'])) { - // Check token - if ((!isset($_POST['token'])) || ($_SESSION['token'] != $_POST['token'])) { - header('location: /login/'); - exit(); - } - $fn = tempnam ('/tmp', 'vst-save-file-'); if ($fn) { $contents = $_POST['contents']; @@ -79,7 +73,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { - + @@ -99,7 +93,6 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { var makeBackup = function() { var params = { action: 'backup', - token: '', path: '' }; diff --git a/web/edit/firewall/index.php b/web/edit/firewall/index.php index 67e039d4..18b4be4c 100644 --- a/web/edit/firewall/index.php +++ b/web/edit/firewall/index.php @@ -20,7 +20,7 @@ if (empty($_GET['rule'])) { // List rule $v_rule = escapeshellarg($_GET['rule']); -exec (VESTA_CMD."v-list-firewall-rule ".$v_rule." json", $output, $return_var); +exec (VESTA_CMD."v-list-firewall-rule ".$v_rule." 'json'", $output, $return_var); check_return_code($return_var,$output); $data = json_decode(implode('', $output), true); unset($output); diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php index c7ec6d7a..b9eaa581 100644 --- a/web/edit/ip/index.php +++ b/web/edit/ip/index.php @@ -20,7 +20,7 @@ if (empty($_GET['ip'])) { // List ip $v_ip = escapeshellarg($_GET['ip']); -exec (VESTA_CMD."v-list-sys-ip ".$v_ip." json", $output, $return_var); +exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var); check_return_code($return_var,$output); $data = json_decode(implode('', $output), true); unset($output); @@ -45,7 +45,7 @@ if ( $v_suspended == 'yes' ) { } // List users -exec (VESTA_CMD."v-list-sys-users json", $output, $return_var); +exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); $users = json_decode(implode('', $output), true); unset($output); @@ -55,13 +55,13 @@ if (!empty($_POST['save'])) { // Change Status if (($v_ipstatus == 'shared') && (empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." dedicated", $output, $return_var); + exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_dedicated = 'yes'; } if (($v_ipstatus == 'dedicated') && (!empty($_POST['v_shared'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." shared", $output, $return_var); + exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var); check_return_code($return_var,$output); unset($output); unset($v_dedicated); diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php index 44f122f1..6c673118 100644 --- a/web/edit/mail/index.php +++ b/web/edit/mail/index.php @@ -45,7 +45,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) { if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { $v_domain = escapeshellarg($_GET['domain']); $v_account = escapeshellarg($_GET['account']); - exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); unset($output); @@ -70,16 +70,12 @@ if ((!empty($_GET['domain'])) && (!empty($_GET['account']))) { $v_date = $data[$v_account]['DATE']; $v_time = $data[$v_account]['TIME']; - $v_domain = escapeshellarg($_GET['domain']); - $v_account = escapeshellarg($_GET['account']); - $v_account_without_quotas = $_GET['account']; - // Parse autoreply if ( $v_autoreply == 'yes' ) { - exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." ".$v_domain." ".$v_account." json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-account-autoreply ".$user." '".$v_domain."' '".$v_account."' json", $output, $return_var); $autoreply_str = json_decode(implode('', $output), true); unset($output); - $v_autoreply_message = $autoreply_str[$v_account_without_quotas]['MSG']; + $v_autoreply_message = $autoreply_str[$v_account]['MSG']; $v_autoreply_message=str_replace("\\n", "\n", $v_autoreply_message); } } @@ -232,7 +228,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $result = array_diff($valiases, $aliases); foreach ($result as $alias) { if ((empty($_SESSION['error_msg'])) && (!empty($alias))) { - exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($alias), $output, $return_var); + exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var); check_return_code($return_var,$output); unset($output); } @@ -258,7 +254,7 @@ if ((!empty($_POST['save'])) && (!empty($_GET['domain'])) && (!empty($_GET['acco $result = array_diff($vfwd, $fwd); foreach ($result as $forward) { if ((empty($_SESSION['error_msg'])) && (!empty($forward))) { - exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." ".escapeshellarg($forward), $output, $return_var); + exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var); check_return_code($return_var,$output); unset($output); } diff --git a/web/edit/package/index.php b/web/edit/package/index.php index e8d4eddc..763bfdf4 100644 --- a/web/edit/package/index.php +++ b/web/edit/package/index.php @@ -22,7 +22,7 @@ if (empty($_GET['package'])) { // List package $v_package = escapeshellarg($_GET['package']); -exec (VESTA_CMD."v-list-user-package ".$v_package." json", $output, $return_var); +exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); unset($output); @@ -203,7 +203,7 @@ if (!empty($_POST['save'])) { fclose($fp); // Save changes - exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." yes", $output, $return_var); + exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var); check_return_code($return_var,$output); unset($output); @@ -212,7 +212,7 @@ if (!empty($_POST['save'])) { unset($output); // Propogate new package - exec (VESTA_CMD."v-update-user-package ".$v_package." json", $output, $return_var); + exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var); check_return_code($return_var,$output); unset($output); diff --git a/web/edit/server/index.php b/web/edit/server/index.php index eed4baab..a505e214 100644 --- a/web/edit/server/index.php +++ b/web/edit/server/index.php @@ -78,43 +78,20 @@ foreach ($backup_types as $backup_type) { } } -// List ssl web domains -exec (VESTA_CMD."v-search-ssl-certificates json", $output, $return_var); -$v_ssl_domains = json_decode(implode('', $output), true); -//$v_vesta_certificate -unset($output); - // List ssl certificate info exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); -$v_sys_ssl_str = json_decode(implode('', $output), true); +$ssl_str = json_decode(implode('', $output), true); unset($output); -$v_sys_ssl_crt = $v_sys_ssl_str['VESTA']['CRT']; -$v_sys_ssl_key = $v_sys_ssl_str['VESTA']['KEY']; -$v_sys_ssl_ca = $v_sys_ssl_str['VESTA']['CA']; -$v_sys_ssl_subject = $v_sys_ssl_str['VESTA']['SUBJECT']; -$v_sys_ssl_aliases = $v_sys_ssl_str['VESTA']['ALIASES']; -$v_sys_ssl_not_before = $v_sys_ssl_str['VESTA']['NOT_BEFORE']; -$v_sys_ssl_not_after = $v_sys_ssl_str['VESTA']['NOT_AFTER']; -$v_sys_ssl_signature = $v_sys_ssl_str['VESTA']['SIGNATURE']; -$v_sys_ssl_pub_key = $v_sys_ssl_str['VESTA']['PUB_KEY']; -$v_sys_ssl_issuer = $v_sys_ssl_str['VESTA']['ISSUER']; - -// List mail ssl certificate info -if (!empty($_SESSION['VESTA_CERTIFICATE'])); { - exec (VESTA_CMD."v-list-sys-mail-ssl json", $output, $return_var); - $v_mail_ssl_str = json_decode(implode('', $output), true); - unset($output); - $v_mail_ssl_crt = $v_mail_ssl_str['MAIL']['CRT']; - $v_mail_ssl_key = $v_mail_ssl_str['MAIL']['KEY']; - $v_mail_ssl_ca = $v_mail_ssl_str['MAIL']['CA']; - $v_mail_ssl_subject = $v_mail_ssl_str['MAIL']['SUBJECT']; - $v_mail_ssl_aliases = $v_mail_ssl_str['MAIL']['ALIASES']; - $v_mail_ssl_not_before = $v_mail_ssl_str['MAIL']['NOT_BEFORE']; - $v_mail_ssl_not_after = $v_mail_ssl_str['MAIL']['NOT_AFTER']; - $v_mail_ssl_signature = $v_mail_ssl_str['MAIL']['SIGNATURE']; - $v_mail_ssl_pub_key = $v_mail_ssl_str['MAIL']['PUB_KEY']; - $v_mail_ssl_issuer = $v_mail_ssl_str['MAIL']['ISSUER']; -} +$v_ssl_crt = $ssl_str['VESTA']['CRT']; +$v_ssl_key = $ssl_str['VESTA']['KEY']; +$v_ssl_ca = $ssl_str['VESTA']['CA']; +$v_ssl_subject = $ssl_str['VESTA']['SUBJECT']; +$v_ssl_aliases = $ssl_str['VESTA']['ALIASES']; +$v_ssl_not_before = $ssl_str['VESTA']['NOT_BEFORE']; +$v_ssl_not_after = $ssl_str['VESTA']['NOT_AFTER']; +$v_ssl_signature = $ssl_str['VESTA']['SIGNATURE']; +$v_ssl_pub_key = $ssl_str['VESTA']['PUB_KEY']; +$v_ssl_issuer = $ssl_str['VESTA']['ISSUER']; // Check POST request if (!empty($_POST['save'])) { @@ -209,58 +186,17 @@ if (!empty($_POST['save'])) { // Update mysql pasword if (empty($_SESSION['error_msg'])) { if (!empty($_POST['v_mysql_password'])) { - exec (VESTA_CMD."v-change-database-host-password mysql localhost root ".escapeshellarg($_POST['v_mysql_password']), $output, $return_var); + exec (VESTA_CMD."v-change-database-host-password mysql localhost root '".escapeshellarg($_POST['v_mysql_password'])."'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_db_adv = 'yes'; } } - - // Delete Mail Domain SSL certificate - if ((!isset($_POST['v_mail_ssl_domain_checkbox'])) && (!empty($_SESSION['MAIL_CERTIFICATE'])) && (empty($_SESSION['error_msg']))) { - unset($_SESSION['MAIL_CERTIFICATE']); - exec (VESTA_CMD."v-delete-sys-mail-ssl", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - } - - // Updating Mail Domain SSL certificate - if ((isset($_POST['v_mail_ssl_domain_checkbox'])) && (isset($_POST['v_mail_ssl_domain'])) && (empty($_SESSION['error_msg']))) { - if ((!empty($_POST['v_mail_ssl_domain'])) && ($_POST['v_mail_ssl_domain'] != $_SESSION['MAIL_CERTIFICATE'])) { - $v_mail_ssl_str = explode(":", $_POST['v_mail_ssl_domain']); - $v_mail_ssl_user = escapeshellarg($v_mail_ssl_str[0]); - $v_mail_ssl_domain = escapeshellarg($v_mail_ssl_str[1]); - exec (VESTA_CMD."v-add-sys-mail-ssl ".$v_mail_ssl_user." ".$v_mail_ssl_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - unset($v_mail_ssl_str); - - if (empty($_SESSION['error_msg'])) { - $_SESSION['MAIL_CERTIFICATE'] = $_POST['v_mail_ssl_domain']; - - // List SSL certificate info - exec (VESTA_CMD."v-list-sys-mail-ssl json", $output, $return_var); - $v_mail_ssl_str = json_decode(implode('', $output), true); - unset($output); - $v_mail_ssl_crt = $v_mail_ssl_str['MAIL']['CRT']; - $v_mail_ssl_key = $v_mail_ssl_str['MAIL']['KEY']; - $v_mail_ssl_ca = $v_mail_ssl_str['MAIL']['CA']; - $v_mail_ssl_subject = $v_mail_ssl_str['MAIL']['SUBJECT']; - $v_mail_ssl_aliases = $v_mail_ssl_str['MAIL']['ALIASES']; - $v_mail_ssl_not_before = $v_mail_ssl_str['MAIL']['NOT_BEFORE']; - $v_mail_ssl_not_after = $v_mail_ssl_str['MAIL']['NOT_AFTER']; - $v_mail_ssl_signature = $v_mail_ssl_str['MAIL']['SIGNATURE']; - $v_mail_ssl_pub_key = $v_mail_ssl_str['MAIL']['PUB_KEY']; - $v_mail_ssl_issuer = $v_mail_ssl_str['MAIL']['ISSUER']; - } - } - } - // Update webmail url if (empty($_SESSION['error_msg'])) { if ($_POST['v_mail_url'] != $_SESSION['MAIL_URL']) { - exec (VESTA_CMD."v-change-sys-config-value MAIL_URL ".escapeshellarg($_POST['v_mail_url']), $output, $return_var); + exec (VESTA_CMD."v-change-sys-config-value MAIL_URL '".escapeshellarg($_POST['v_mail_url'])."'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_mail_adv = 'yes'; @@ -270,7 +206,7 @@ if (!empty($_POST['save'])) { // Update phpMyAdmin url if (empty($_SESSION['error_msg'])) { if ($_POST['v_mysql_url'] != $_SESSION['DB_PMA_URL']) { - exec (VESTA_CMD."v-change-sys-config-value DB_PMA_URL ".escapeshellarg($_POST['v_mysql_url']), $output, $return_var); + exec (VESTA_CMD."v-change-sys-config-value DB_PMA_URL '".escapeshellarg($_POST['v_mysql_url'])."'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_db_adv = 'yes'; @@ -280,7 +216,7 @@ if (!empty($_POST['save'])) { // Update phpPgAdmin url if (empty($_SESSION['error_msg'])) { if ($_POST['v_pgsql_url'] != $_SESSION['DB_PGA_URL']) { - exec (VESTA_CMD."v-change-sys-config-value DB_PGA_URL ".escapeshellarg($_POST['v_pgsql_url']), $output, $return_var); + exec (VESTA_CMD."v-change-sys-config-value DB_PGA_URL '".escapeshellarg($_POST['v_pgsql_url'])."'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_db_adv = 'yes'; @@ -339,8 +275,7 @@ if (!empty($_POST['save'])) { $v_backup_username = escapeshellarg($_POST['v_backup_username']); $v_backup_password = escapeshellarg($_POST['v_backup_password']); $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']); - $v_backup_port = escapeshellarg($_POST['v_backup_port']); - exec (VESTA_CMD."v-add-backup-host ".$v_backup_type." ".$v_backup_host ." ".$v_backup_username." ".$v_backup_password." ".$v_backup_bpath." ".$v_backup_port, $output, $return_var); + exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host']; @@ -348,16 +283,16 @@ if (!empty($_POST['save'])) { if (empty($_SESSION['error_msg'])) $v_backup_username = $_POST['v_backup_username']; if (empty($_SESSION['error_msg'])) $v_backup_password = $_POST['v_backup_password']; if (empty($_SESSION['error_msg'])) $v_backup_bpath = $_POST['v_backup_bpath']; - if (empty($_SESSION['error_msg'])) $v_backup_port = $_POST['v_backup_port']; $v_backup_new = 'yes'; $v_backup_adv = 'yes'; $v_backup_remote_adv = 'yes'; } } + // Change remote backup host type if (empty($_SESSION['error_msg'])) { if ((!empty($_POST['v_backup_host'])) && ($_POST['v_backup_type'] != $v_backup_type)) { - exec (VESTA_CMD."v-delete-backup-host " . escapeshellarg($v_backup_type), $output, $return_var); + exec (VESTA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var); unset($output); $v_backup_host = escapeshellarg($_POST['v_backup_host']); @@ -365,7 +300,7 @@ if (!empty($_POST['save'])) { $v_backup_username = escapeshellarg($_POST['v_backup_username']); $v_backup_password = escapeshellarg($_POST['v_backup_password']); $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']); - exec (VESTA_CMD."v-add-backup-host ".$v_backup_type." ".$v_backup_host." ".$v_backup_username." ".$v_backup_password." ".$v_backup_bpath, $output, $return_var); + exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host']; @@ -387,7 +322,7 @@ if (!empty($_POST['save'])) { $v_backup_username = escapeshellarg($_POST['v_backup_username']); $v_backup_password = escapeshellarg($_POST['v_backup_password']); $v_backup_bpath = escapeshellarg($_POST['v_backup_bpath']); - exec (VESTA_CMD."v-add-backup-host ".$v_backup_type." ".$v_backup_host." ".$v_backup_username." ".$v_backup_password." ".$v_backup_bpath, $output, $return_var); + exec (VESTA_CMD."v-add-backup-host '". $v_backup_type ."' '". $v_backup_host ."' '". $v_backup_username ."' '". $v_backup_password ."' '". $v_backup_bpath ."'", $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) $v_backup_host = $_POST['v_backup_host']; @@ -404,7 +339,7 @@ if (!empty($_POST['save'])) { // Delete remote backup host if (empty($_SESSION['error_msg'])) { if ((empty($_POST['v_backup_host'])) && (!empty($v_backup_host))) { - exec (VESTA_CMD."v-delete-backup-host ". $v_backup_type, $output, $return_var); + exec (VESTA_CMD."v-delete-backup-host '". $v_backup_type ."'", $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) $v_backup_host = ''; @@ -417,67 +352,24 @@ if (!empty($_POST['save'])) { } } - - - // Delete WEB Domain SSL certificate - if ((!isset($_POST['v_web_ssl_domain_checkbox'])) && (!empty($_SESSION['VESTA_CERTIFICATE'])) && (empty($_SESSION['error_msg']))) { - unset($_SESSION['VESTA_CERTIFICATE']); - exec (VESTA_CMD."v-delete-sys-vesta-ssl", $output, $return_var); - check_return_code($return_var,$output); - unset($output); - } - - // Updating WEB Domain SSL certificate - if ((isset($_POST['v_web_ssl_domain_checkbox'])) && (isset($_POST['v_web_ssl_domain'])) && (empty($_SESSION['error_msg']))) { - - if ((!empty($_POST['v_web_ssl_domain'])) && ($_POST['v_web_ssl_domain'] != $_SESSION['VESTA_CERTIFICATE'])) { - $v_web_ssl_str = explode(":", $_POST['v_web_ssl_domain']); - $v_web_ssl_user = escapeshellarg($v_web_ssl_str[0]); - $v_web_ssl_domain = escapeshellarg($v_web_ssl_str[1]); - exec (VESTA_CMD."v-add-sys-vesta-ssl ".$v_web_ssl_user." ".$v_web_ssl_domain, $output, $return_var); - check_return_code($return_var,$output); - unset($output); - - if (empty($_SESSION['error_msg'])) { - $_SESSION['VESTA_CERTIFICATE'] = $_POST['v_web_ssl_domain']; - - // List SSL certificate info - exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); - $v_sys_ssl_str = json_decode(implode('', $output), true); - unset($output); - $v_sys_ssl_crt = $v_sys_ssl_str['VESTA']['CRT']; - $v_sys_ssl_key = $v_sys_ssl_str['VESTA']['KEY']; - $v_sys_ssl_ca = $v_sys_ssl_str['VESTA']['CA']; - $v_sys_ssl_subject = $v_sys_ssl_str['VESTA']['SUBJECT']; - $v_sys_ssl_aliases = $v_sys_ssl_str['VESTA']['ALIASES']; - $v_sys_ssl_not_before = $v_sys_ssl_str['VESTA']['NOT_BEFORE']; - $v_sys_ssl_not_after = $v_sys_ssl_str['VESTA']['NOT_AFTER']; - $v_sys_ssl_signature = $v_sys_ssl_str['VESTA']['SIGNATURE']; - $v_sys_ssl_pub_key = $v_sys_ssl_str['VESTA']['PUB_KEY']; - $v_sys_ssl_issuer = $v_sys_ssl_str['VESTA']['ISSUER']; - } - } - } - - // Update SSL certificate - if ((!empty($_POST['v_sys_ssl_crt'])) && (empty($_POST['v_web_ssl_domain'])) && (empty($_SESSION['error_msg']))) { - if (($v_sys_ssl_crt != str_replace("\r\n", "\n", $_POST['v_sys_ssl_crt'])) || ($v_sys_ssl_key != str_replace("\r\n", "\n", $_POST['v_sys_ssl_key']))) { + if ((!empty($_POST['v_ssl_crt'])) && (empty($_SESSION['error_msg']))) { + if (($v_ssl_crt != str_replace("\r\n", "\n", $_POST['v_ssl_crt'])) || ($v_ssl_key != str_replace("\r\n", "\n", $_POST['v_ssl_key']))) { exec ('mktemp -d', $mktemp_output, $return_var); $tmpdir = $mktemp_output[0]; // Certificate - if (!empty($_POST['v_sys_ssl_crt'])) { + if (!empty($_POST['v_ssl_crt'])) { $fp = fopen($tmpdir."/certificate.crt", 'w'); - fwrite($fp, str_replace("\r\n", "\n", $_POST['v_sys_ssl_crt'])); + fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_crt'])); fwrite($fp, "\n"); fclose($fp); } // Key - if (!empty($_POST['v_sys_ssl_key'])) { + if (!empty($_POST['v_ssl_key'])) { $fp = fopen($tmpdir."/certificate.key", 'w'); - fwrite($fp, str_replace("\r\n", "\n", $_POST['v_sys_ssl_key'])); + fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_key'])); fwrite($fp, "\n"); fclose($fp); } @@ -486,22 +378,20 @@ if (!empty($_POST['save'])) { check_return_code($return_var,$output); unset($output); - if (empty($_SESSION['error_msg'])) { - // List ssl certificate info - exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); - $v_sys_ssl_str = json_decode(implode('', $output), true); - unset($output); - $v_sys_ssl_crt = $v_sys_ssl_str['VESTA']['CRT']; - $v_sys_ssl_key = $v_sys_ssl_str['VESTA']['KEY']; - $v_sys_ssl_ca = $v_sys_ssl_str['VESTA']['CA']; - $v_sys_ssl_subject = $v_sys_ssl_str['VESTA']['SUBJECT']; - $v_sys_ssl_aliases = $v_sys_ssl_str['VESTA']['ALIASES']; - $v_sys_ssl_not_before = $v_sys_ssl_str['VESTA']['NOT_BEFORE']; - $v_sys_ssl_not_after = $v_sys_ssl_str['VESTA']['NOT_AFTER']; - $v_sys_ssl_signature = $v_sys_ssl_str['VESTA']['SIGNATURE']; - $v_sys_ssl_pub_key = $v_sys_ssl_str['VESTA']['PUB_KEY']; - $v_sys_ssl_issuer = $v_sys_ssl_str['VESTA']['ISSUER']; - } + // List ssl certificate info + exec (VESTA_CMD."v-list-sys-vesta-ssl json", $output, $return_var); + $ssl_str = json_decode(implode('', $output), true); + unset($output); + $v_ssl_crt = $ssl_str['VESTA']['CRT']; + $v_ssl_key = $ssl_str['VESTA']['KEY']; + $v_ssl_ca = $ssl_str['VESTA']['CA']; + $v_ssl_subject = $ssl_str['VESTA']['SUBJECT']; + $v_ssl_aliases = $ssl_str['VESTA']['ALIASES']; + $v_ssl_not_before = $ssl_str['VESTA']['NOT_BEFORE']; + $v_ssl_not_after = $ssl_str['VESTA']['NOT_AFTER']; + $v_ssl_signature = $ssl_str['VESTA']['SIGNATURE']; + $v_ssl_pub_key = $ssl_str['VESTA']['PUB_KEY']; + $v_ssl_issuer = $ssl_str['VESTA']['ISSUER']; } } diff --git a/web/edit/web/index.php b/web/edit/web/index.php index 79d79053..edf29e9d 100644 --- a/web/edit/web/index.php +++ b/web/edit/web/index.php @@ -36,7 +36,7 @@ $v_cgi = $data[$v_domain]['CGI']; $v_elog = $data[$v_domain]['ELOG']; $v_ssl = $data[$v_domain]['SSL']; if (!empty($v_ssl)) { - exec (VESTA_CMD."v-list-web-domain-ssl ".$user." ".escapeshellarg($v_domain)." json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); $ssl_str = json_decode(implode('', $output), true); unset($output); $v_ssl_crt = $ssl_str[$v_domain]['CRT']; @@ -117,7 +117,7 @@ if (!empty($_POST['save'])) { // Change web domain IP if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." no", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); check_return_code($return_var,$output); $restart_web = 'yes'; $restart_proxy = 'yes'; @@ -129,8 +129,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain." json", $output, $return_var); unset($output); if ($return_var == 0 ) { - $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." no", $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -140,12 +139,10 @@ if (!empty($_POST['save'])) { // Change dns ip for each alias if (($v_ip != $_POST['v_ip']) && (empty($_SESSION['error_msg']))) { foreach($valiases as $v_alias ){ - $v_alias = escapeshellarg($v_alias); - exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_alias." json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domain ".$v_username." '".$v_alias."' json", $output, $return_var); unset($output); if ($return_var == 0 ) { - $v_ip = escapeshellarg($_POST['v_ip']); - exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_alias." ".$v_ip, $output, $return_var); + exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -153,10 +150,10 @@ if (!empty($_POST['save'])) { } } - // Change template - if (($v_template != $_POST['v_template']) && (empty($_SESSION['error_msg']))) { + // Change template (admin only) + if (($v_template != $_POST['v_template']) && ( $_SESSION['user'] == 'admin') && (empty($_SESSION['error_msg']))) { $v_template = escapeshellarg($_POST['v_template']); - exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." no", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_web = 'yes'; @@ -176,8 +173,7 @@ if (!empty($_POST['save'])) { $restart_web = 'yes'; $restart_proxy = 'yes'; $v_template = escapeshellarg($_POST['v_template']); - $alias = escapeshellarg($alias); - exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." ".$alias." no", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); @@ -185,7 +181,7 @@ if (!empty($_POST['save'])) { exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var); unset($output); if ($return_var == 0) { - exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." ".$alias." no", $output, $return_var); + exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -200,15 +196,14 @@ if (!empty($_POST['save'])) { $restart_web = 'yes'; $restart_proxy = 'yes'; $v_template = escapeshellarg($_POST['v_template']); - $alias = escapeshellarg($alias); - exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." ".$alias." no", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." ".escapeshellarg($alias)." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); if (empty($_SESSION['error_msg'])) { exec (VESTA_CMD."v-list-dns-domain ".$v_username." ".$v_domain, $output, $return_var); unset($output); if ($return_var == 0) { - exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".$alias." ".$v_ip." no", $output, $return_var); + exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".escapeshellarg($alias)." ".$v_ip." no", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_dns = 'yes'; @@ -228,15 +223,15 @@ if (!empty($_POST['save'])) { // Delete proxy support if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." no", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-proxy ".$v_username." ".$v_domain." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); unset($v_proxy); $restart_proxy = 'yes'; } - // Change proxy template / Update extension list - if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg'])) ) { + // Change proxy template / Update extension list (admin only) + if ((!empty($_SESSION['PROXY_SYSTEM'])) && (!empty($v_proxy)) && (!empty($_POST['v_proxy'])) && (empty($_SESSION['error_msg'])) && ($_SESSION['user'] == 'admin')) { $ext = preg_replace("/\n/", " ", $_POST['v_proxy_ext']); $ext = preg_replace("/,/", " ", $ext); $ext = preg_replace('/\s+/', ' ',$ext); @@ -245,7 +240,7 @@ if (!empty($_POST['save'])) { if (( $v_proxy_template != $_POST['v_proxy_template']) || ($v_proxy_ext != $ext)) { $ext = str_replace(', ', ",", $ext); if (!empty($_POST['v_proxy_template'])) $v_proxy_template = $_POST['v_proxy_template']; - exec (VESTA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." no", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-proxy-tpl ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var); check_return_code($return_var,$output); $v_proxy_ext = str_replace(',', ', ', $ext); unset($output); @@ -264,7 +259,7 @@ if (!empty($_POST['save'])) { $ext = str_replace(' ', ",", $ext); $v_proxy_ext = str_replace(',', ', ', $ext); } - exec (VESTA_CMD."v-add-web-domain-proxy ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." no", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-proxy ".$v_username." ".$v_domain." ".escapeshellarg($v_proxy_template)." ".escapeshellarg($ext)." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_proxy = 'yes'; @@ -274,7 +269,7 @@ if (!empty($_POST['save'])) { if (( $v_ssl == 'yes') && (!empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { if ( $v_ssl_home != $_POST['v_ssl_home'] ) { $v_ssl_home = escapeshellarg($_POST['v_ssl_home']); - exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." no", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var); check_return_code($return_var,$output); $v_ssl_home = $_POST['v_ssl_home']; $restart_web = 'yes'; @@ -313,13 +308,13 @@ if (!empty($_POST['save'])) { fclose($fp); } - exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." no", $output, $return_var); + exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $restart_web = 'yes'; $restart_proxy = 'yes'; - exec (VESTA_CMD."v-list-web-domain-ssl ".$user." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); $ssl_str = json_decode(implode('', $output), true); unset($output); $v_ssl_crt = $ssl_str[$v_domain]['CRT']; @@ -343,7 +338,7 @@ if (!empty($_POST['save'])) { // Delete Lets Encrypt support if (( $v_letsencrypt == 'yes' ) && (empty($_POST['v_letsencrypt'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." no", $output, $return_var); + exec (VESTA_CMD."v-delete-letsencrypt-domain ".$user." ".$v_domain." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_ssl_crt = ''; @@ -358,7 +353,7 @@ if (!empty($_POST['save'])) { // Delete SSL certificate if (( $v_ssl == 'yes' ) && (empty($_POST['v_ssl'])) && (empty($_SESSION['error_msg']))) { - exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." no", $output, $return_var); + exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_ssl_crt = ''; @@ -372,7 +367,7 @@ if (!empty($_POST['save'])) { // Add Lets Encrypt support if ((!empty($_POST['v_ssl'])) && ( $v_letsencrypt == 'no' ) && (!empty($_POST['v_letsencrypt'])) && empty($_SESSION['error_msg'])) { $l_aliases = str_replace("\n", ',', $v_aliases); - exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." ".escapeshellarg($l_aliases)." no", $output, $return_var); + exec (VESTA_CMD."v-add-letsencrypt-domain ".$user." ".$v_domain." '".$l_aliases."' 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_letsencrypt = 'yes'; @@ -420,14 +415,14 @@ if (!empty($_POST['save'])) { fwrite($fp, str_replace("\r\n", "\n", $_POST['v_ssl_ca'])); fclose($fp); } - exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." no", $output, $return_var); + exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var); check_return_code($return_var,$output); unset($output); $v_ssl = 'yes'; $restart_web = 'yes'; $restart_proxy = 'yes'; - exec (VESTA_CMD."v-list-web-domain-ssl ".$user." ".$v_domain." json", $output, $return_var); + exec (VESTA_CMD."v-list-web-domain-ssl ".$user." '".$v_domain."' json", $output, $return_var); $ssl_str = json_decode(implode('', $output), true); unset($output); $v_ssl_crt = $ssl_str[$_POST['v_domain']]['CRT']; diff --git a/web/favicon.ico b/web/favicon.ico index 8b137891..fad74c2a 100644 Binary files a/web/favicon.ico and b/web/favicon.ico differ diff --git a/web/file_manager/fm_api.php b/web/file_manager/fm_api.php index eb407ba7..ac5faa3a 100644 --- a/web/file_manager/fm_api.php +++ b/web/file_manager/fm_api.php @@ -1,20 +1,14 @@ formatFullPath($item); $dst = $this->formatFullPath($target_dir); - exec ("nice -n 19 ionice -c 3 ".VESTA_CMD . "v-copy-fs-file {$this->user} {$src} {$dst}", $output, $return_var); + exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src} {$dst}", $output, $return_var); $error = self::check_return_code($return_var, $output); @@ -104,7 +104,7 @@ class FileManager { $src = $this->formatFullPath($item); $dst = $this->formatFullPath($target_dir); - exec ("nice -n 19 ionice -c 3 ".VESTA_CMD . "v-copy-fs-directory {$this->user} {$src} {$dst}", $output, $return_var); + exec (VESTA_CMD . "v-copy-fs-directory {$this->user} {$src} {$dst}", $output, $return_var); $error = self::check_return_code($return_var, $output); @@ -159,7 +159,7 @@ class FileManager { $dst_item = $this->formatFullPath($dst_item); - exec ("nice -n 19 ionice -c 3 ".VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$items}", $output, $return_var); + exec (VESTA_CMD . "v-add-fs-archive {$this->user} {$dst_item} {$items}", $output, $return_var); $error = self::check_return_code($return_var, $output); @@ -183,7 +183,7 @@ class FileManager { $dst_item = $this->formatFullPath($dst_item_name); - exec ("nice -n 19 ionice -c 3 ".VESTA_CMD . "v-copy-fs-file {$this->user} {$src_item} {$dst_item}", $output, $return_var); + exec (VESTA_CMD . "v-copy-fs-file {$this->user} {$src_item} {$dst_item}", $output, $return_var); $error = self::check_return_code($return_var, $output); @@ -219,7 +219,7 @@ class FileManager { $item = $this->formatFullPath($item); $dst_item = $this->formatFullPath($target_dir); - exec ("nice -n 19 ionice -c 3 ".VESTA_CMD . "v-extract-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var); + exec (VESTA_CMD . "v-extract-fs-archive {$this->user} {$item} {$dst_item}", $output, $return_var); $error = self::check_return_code($return_var, $output); diff --git a/web/images/favicon.ico b/web/images/favicon.ico index 231b61d2..fad74c2a 100644 Binary files a/web/images/favicon.ico and b/web/images/favicon.ico differ diff --git a/web/images/myvesta-large-white-130.png b/web/images/myvesta-large-white-130.png deleted file mode 100644 index 2007b0bc..00000000 Binary files a/web/images/myvesta-large-white-130.png and /dev/null differ diff --git a/web/images/sprite.png b/web/images/sprite.png index c0ac73f3..cc9fa741 100644 Binary files a/web/images/sprite.png and b/web/images/sprite.png differ diff --git a/web/images/vesta_logo.png b/web/images/vesta_logo.png index 7a2bd53a..d3ca5e9f 100644 Binary files a/web/images/vesta_logo.png and b/web/images/vesta_logo.png differ diff --git a/web/inc/allow-index.php b/web/inc/allow-index.php deleted file mode 100644 index 7e73ee7e..00000000 --- a/web/inc/allow-index.php +++ /dev/null @@ -1,9 +0,0 @@ - 'المجلد الرئيسي لـ SSL', 'Lets Encrypt Support' => 'دعم Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'سوف يتم اصدار الترخيص الخاص بك خلال 5 دقائق', 'Proxy Support' => 'دغم بروكسي', 'Proxy Extensions' => 'توسعات بروكسي', @@ -561,7 +560,6 @@ $LANG['ar'] = array( 'MAIL Server' => 'مخدم البريد الالكتروني', 'Antivirus' => 'مضاد الفيروسات', 'AntiSpam' => 'مضاد البريد المزعج سبام', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'رابط WebMail', 'MySQL Support' => 'دعم MySQL', 'phpMyAdmin URL' => 'رابط phpMyAdmin', diff --git a/web/inc/i18n/az.php b/web/inc/i18n/az.php deleted file mode 100644 index 929d5d29..00000000 --- a/web/inc/i18n/az.php +++ /dev/null @@ -1,728 +0,0 @@ - 'Paketlər', - 'IP' => 'IP', - 'Graphs' => 'Qrafiklər', - 'Statistics' => 'Statistikalar', - 'Log' => 'Log', - 'Server' => 'Server', - 'Services' => 'Servislər', - 'Firewall' => 'Firewall', - 'Updates' => 'Yeniləmələr', - 'Log in' => 'Hesab yarat', - 'Log out' => 'Çıxış', - 'USER' => 'İstifadəsi', - 'WEB' => 'Veb', - 'DNS' => 'DNS', - 'MAIL' => 'Poçt', - 'DB' => 'DB', - 'CRON' => 'CRON', - 'BACKUP' => 'NÜSXƏ', - 'LOGIN' => 'Giriş', - 'RESET PASSWORD' => 'Şifrəni sıfırlamaq', - 'SEARCH' => 'Axtar', - 'PACKAGE' => 'Paket', - 'RRD' => 'RRD', - 'STATS' => 'STATS', - 'LOG' => 'LOG', - 'UPDATES' => 'Yenilənmələr', - 'FIREWALL' => 'Firewall', - 'SERVER' => 'Server', - 'MEMORY' => 'Yaddaş', - 'DISK' => 'Disk', - 'NETWORK' => 'Şəbəkə', - 'Web Log Manager' => 'Veb loq menecer', - 'no notifications' => 'bildiriş yoxdur', - 'Add User' => 'İstifadəçi əlavə edin', - 'Add Domain' => 'Domen əlavə edin', - 'Add Web Domain' => 'Domen əlavə edin', - 'Add DNS Domain' => 'DNS domeni əlavə edin', - 'Add DNS Record' => 'DNS qeydləri əlavə edin', - 'Add Mail Domain' => 'E-poçt domeni əlavə edin', - 'Add Mail Account' => 'E-poçt hesabı əlavə edin', - 'Add Database' => 'Verilənlər bazası əlavə edin', - 'Add Cron Job' => 'Cron əlavə et', - 'Create Backup' => 'Nüsxə yarat', - 'Configure' => 'Konfiqurasiya', - 'Restore All' => 'Hamısını bərpa edin', - 'Add Package' => 'Paket əlavə edin', - 'Add IP' => 'IP əlavə edin', - 'Add Rule' => 'Qayda əlavə edin', - 'Ban IP Address' => 'IP ünvanını ban edin', - 'Search' => 'Axtar', - 'Add one more FTP Account' => 'FTP hesabı əlavə edin', - 'Overall Statistics' => 'Bütün statistikalar', - 'Daily' => 'Günlük', - 'Weekly' => 'Həftəlik', - 'Monthly' => 'Aylıq', - 'Yearly' => 'İllik', - 'Add' => 'Əlavə edin', - 'Back' => 'Ləğv edin', - 'Save' => 'Yadda saxla', - 'Submit' => 'Göndər', - 'toggle all' => 'Hamısını seç', - 'apply to selected' => 'Seçimi tətbiq edin', - 'rebuild' => 'Yenidən yarat', - 'rebuild web' => "Veb-in yenidən qurulması", - 'rebuild dns' => "DNS-in yenidən qurulması", - 'rebuild mail' => "E-poçt-un yenidən qurulması", - 'rebuild db' => "DB-nin yenidən qurulması", - 'rebuild cron' => "Cron-nun yenidən qurulması", - 'update counters' => 'Yeniləmə sayğacları', - 'suspend' => 'Dayandırın', - 'unsuspend' => 'Davam etdirin', - 'delete' => 'Sil', - 'show per user' => 'istifadəçiyə görə göstər', - 'login as' => 'GİRİŞ ET:', - 'logout' => 'Çıxış et', - 'edit' => 'redaktə et', - 'open webstats' => 'webstats aç', - 'view logs' => 'logları göstər', - 'list records' => '%s siyahı qeydiyyatı', - 'add record' => 'qeyd əlavə edin', - 'list accounts' => '%s hesabı sıyahıya alın', - 'add account' => 'hesap əlavə edin', - 'open webmail' => 'Vebpoçtu aç', - 'list fail2ban' => 'fail2ban siyahı alın', - 'open %s' => '%s aç', - 'download' => 'yüklə', - 'restore' => 'bərpa edin', - 'configure restore settings' => 'bərpa ayarlarını quraşdırın', - 'stop' => 'dayandırın', - 'start' => 'başlat', - 'restart' => 'yenidən başlat', - 'update' => 'yenilə', - 'generate' => 'yarat', - 'Generate CSR' => 'CSR yarat', - 'reread IP' => 'IP-ni yenidən oxu', - 'enable autoupdate' => 'AVTOMATIK YENİLƏNMƏNİ AKTİVLƏŞDİR', - 'disable autoupdate' => 'AVTOMATİK YENİLƏNMƏNİ SÖNDÜR', - 'turn on notifications' => 'xəbərdarlıqları açın', - 'turn off notifications' => 'xəbərdarlıqları bağlayın', - 'configure' => 'ayalar', - 'Adding User' => 'İstifadəçi əlavə edin', - 'Editing User' => 'İstifadəçi redaktə edin', - 'Adding Domain' => 'Domen əlavə edin', - 'Editing Domain' => 'Domen redaktə edin', - 'Adding DNS Domain' => 'DNS domeni əlavə edin', - 'Editing DNS Domain' => 'DNS domeni redaktə edin', - 'Adding DNS Record' => 'DNS qeyd əlavə edin', - 'Editing DNS Record' => 'DNS qeydi redaktə edin', - 'Adding Mail Domain' => 'E-poçt domen əlavə edin', - 'Editing Mail Domain' => 'E-poçt domen redaktə edin', - 'Adding Mail Account' => 'E-poçt əlavə edin', - 'Editing Mail Account' => 'E-poçt hesabını redaktə edin', - 'Adding database' => 'Verilənlər bazası əlavə edin', - 'Editing Cron Job' => 'Cron-u redaktə et', - 'Adding Cron Job' => 'Cron əlavə etmək', - 'Editing Database' => 'Verilənlər bazasını redaktə edin', - 'Adding Package' => 'Paket əlavə edin', - 'Editing Package' => 'Paketi redaktə edin', - 'Adding IP address' => 'IP ünvanı əlavə edin', - 'Editing IP Address' => 'IP ünvamını redaktə edin', - 'Editing Backup Exclusions' => 'Nüsxələmə istisnalarını redaktə edin', - 'Generating CSR' => 'CSR yaratma', - 'Listing' => 'Siyahılama', - 'Search Results' => 'Axtarış nəticələri', - 'Adding Firewall Rule' => 'Təhlükəsizlik divarı qaydası əlavə edin', - 'Editing Firewall Rule' => 'Təhlükəsizlik divarı qaydasını redaktə edin', - 'Adding IP Address to Banlist' => 'Ban siyahısına IP ünvanı əlavə edin', - 'active' => 'aktiv', - 'spnd' => 'söndürülmüş', - 'suspended' => 'söndürülmüş', - 'running' => 'işləyir', - 'stopped' => 'dayandı', - 'outdated' => 'köhnəlmiş', - 'updated' => 'yenilənmiş', - 'yes' => 'bəli', - 'no' => 'xeyir', - 'none' => 'heç biri', - 'pb' => 'pb', - 'tb' => 'tb', - 'gb' => 'gb', - 'mb' => 'mb', - 'minute' => 'dəqiqə', - 'hour' => 'saat', - 'day' => 'gün', - 'days' => 'günlər', - 'hours' => 'saat', - 'minutes' => 'dəqiqə', - 'month' => 'ay', - 'package' => 'paket', - 'Bandwidth' => 'Traffik', - 'Disk' => 'Disk', - 'Web' => 'Veb', - 'Mail' => 'E-poçt', - 'Databases' => 'Verilənlər bazası', - 'User Directories' => 'İstifadəçi qovluqları', - 'Template' => 'Şablon', - 'Web Template' => 'Veb Şablonu', - 'Backend Template' => 'Backend şablonu', - 'Proxy Template' =>'Proxy şablonu', - 'DNS Template' => 'DNS şablonu', - 'Web Domains' => 'Veb domenləri', - 'SSL Domains' => 'SSL domenləri', - 'Web Aliases' => 'Veb aliasları', - 'per domain' => 'domen başına', - 'DNS Domains' => 'DNS domen adları', - 'DNS domains' => 'DNS domen adları', - 'DNS records' => 'DNS qeydləri', - 'Name Servers' => 'Neymserverlər', - 'Mail Domains' => 'E-poçt domenləri', - 'Mail Accounts' => 'E-poçt hesabları', - 'Cron Jobs' => 'Cron-lar', - 'SSH Access' => 'SSH giriş', - 'IP Address' => 'IP ünvan', - 'IP Addresses' => 'IP ünvanları', - 'Backups' => 'Nüsxələr', - 'Backup System' => 'Nüsxələmə sistemi', - 'backup exclusions' => 'NÜSXƏLƏMƏ İSTİSNALARI', - 'template' => 'şablon', - 'SSL Support' => 'SSL dəstək', - 'SSL Home Directory' => 'SSL Ana qovluğu', - 'Lets Encrypt Support' => 'Lets Encrypt dəstəyi', - 'Lets Encrypt' => 'Şifrələ', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => 'Sənədiniz avtomatik olaraq 5 dəqiqə ərzində veriləcək', - 'Proxy Support' => 'Proxy dəstəyi', - 'Proxy Extensions' => 'Proxy əlavələri', - 'Web Statistics' => 'Veb statistikaları', - 'Additional FTP Account' => 'Əlavə FTP hesabı', - 'Path' => 'Path', - 'SOA' => 'SOA', - 'TTL' => 'TTL', - 'Expire' => 'Sona çatdırın', - 'Records' => 'Qeydlər', - 'Serial' => 'Seriya', - 'Catchall email' => 'Catchall e-poçt', - 'AntiVirus Support' => 'AntiVirus dəstəyi', - 'AntiSpam Support' => 'AntiSpam dəstəyi', - 'DKIM Support' => 'DKIM dəstəyi', - 'Accounts' => 'Hesablar', - 'Quota' => 'Norma', - 'Autoreply' => 'Avtomatik cavab', - 'Forward to' => 'Buraya yönləndir', - 'Do not store forwarded mail' => 'Göndərilən poçtu saxlamayın', - 'IMAP hostname' => 'IMAP hostname', - 'IMAP port' => 'IMAP port', - 'IMAP security' => 'IMAP təhlükəsizlik', - 'IMAP auth method' => 'IMAP auth metodu', - 'SMTP hostname' => 'SMTP hostname', - 'SMTP port' => 'SMTP port', - 'SMTP security' => 'SMTP təhlükəsizlik', - 'SMTP auth method' => 'SMTP auth metodu', - 'STARTTLS' => 'STARTTLS', - 'Normal password' => 'Normal şifrə', - 'database' => 'verilənələr bazası', - 'User' => 'İstifadəçi', - 'Host' => 'Host', - 'Charset' => 'Kodlaşdırma', - 'Min' => 'Dəq', - 'Hour' => 'Saat', - 'Day' => 'Gün', - 'Month' => 'Ay', - 'Day of week' => 'Həftənin günü', - 'local' => 'yerli', - 'Run Time' => 'İşləmə müddəti', - 'Backup Size' => 'Nüsxə ölçüsü', - 'SYS' => 'SYS', - 'Domains' => 'Domenlər', - 'Status' => 'Status', - 'shared' => 'paylaşılan', - 'dedicated' => 'həsr olunan', - 'Owner' => 'Sahib', - 'Users' => 'İstifadəçilər', - 'Load Average' => 'Sistem yükü', - 'Memory Usage' => 'Yaddaşın istifadəsi', - 'APACHE2 Usage' => 'APACHE2 istifadəsi', - 'HTTPD Usage' => 'HTTPD istifadəsi', - 'NGINX Usage' => 'NGINX istifadəsi', - 'MySQL Usage on localhost' => 'Localhost üzərindəki MySQL istifadəsi', - 'PostgreSQL Usage on localhost' => 'Localhost üzərindəki PostgreSQL istifadəsi', - 'Bandwidth Usage eth0' => 'eth0 traffik istifadəsi', - 'Bandwidth Usage eth1' => 'eth1 traffik istifadəsi', - 'Exim Usage' => 'Exim istifadəsi', - 'FTP Usage' => 'FTP istifadəsi', - 'SSH Usage' => 'SSH istifadəsi', - 'reverse proxy' => 'geri proksi', - 'web server' => 'veb server', - 'dns server' => 'dns server', - 'mail server' => 'e-poçt serve', - 'pop/imap server' => 'pop/imap server', - 'email antivirus' => 'e-poçt antivirus', - 'email antispam' => 'e-poçt antispam', - 'database server' => 'database server', - 'ftp server' => 'ftp server', - 'job scheduler' => 'job planlaşdırma', - 'firewall' => 'firewall', - 'brute-force monitor' => 'brute-force monitor', - 'CPU' => 'CPU', - 'Memory' => 'Yaddaş', - 'Uptime' => 'Uptime', - 'core package' => 'əsas paket', - 'php interpreter' => 'php tərcüməçi', - 'internal web server' => 'daxili veb server', - 'Version' => 'Versiya', - 'Release' => 'Buraxın', - 'Architecture' => 'Memarlıq', - 'Object' => 'Obyekt', - 'Username' => 'İstifadəçi adı', - 'Password' => 'Şifrə', - 'Email' => 'E-poçt', - 'Package' => 'Paket', - 'Language' => 'Dil', - 'First Name' => 'Ad', - 'Last Name' => 'Soyad', - 'Send login credentials to email address' => 'Giriş məlumatlarını ünvanlarını e-poçt ünvanına göndərin', - 'Default Template' => 'Default şablon', - 'Default Name Servers' => 'Default neymserver', - 'Domain' => 'Domen', - 'DNS Support' => 'DNS dəstəyi', - 'Mail Support' => 'E-poçt dəstəyi', - 'Advanced options' => 'TƏKMİLLƏŞMİŞ SEÇİMLƏR', - 'Basic options' => 'Əsas seçimlər', - 'Aliases' => 'Ləqəblər (Alias)', - 'SSL Certificate' => 'SSL sertifikatı', - 'SSL Key' => 'SSL açarı (Key)', - 'SSL Certificate Authority / Intermediate' => 'SSL sertifikat eyniləşdirməsi / köməkçi)', - 'SSL CSR' => 'SSL CSR', - 'optional' => 'istəyə bağlı', - 'internal' => 'daxili', - 'Statistics Authorization' => 'Statistikanın avtorizasiyası', - 'Statistics Auth' => 'Statistika eyniləşdirməsi', - 'Account' => 'Hesab', - 'Prefix will be automaticaly added to username' => 'Prefiks avtomatik olaraq istifadəçi adına əlavə olunacaq', - 'Send FTP credentials to email' => 'FTP məlumatlarını e-poçt ile göndər', - 'Expiration Date' => 'Bitmə tarixi', - 'YYYY-MM-DD' => 'YYYY-AA-GG', - 'Name servers' => 'Neymserverlər', - 'Record' => 'Qeydiyyat', - 'IP or Value' => 'IP və ya qiymət', - 'Priority' => 'Prioritet', - 'Record Number' => 'Qeydiyyat sayı', - 'in megabytes' => 'megabayt olaraq', - 'Message' => 'Mesaj', - 'use local-part' => 'local-part istifadə et', - 'one or more email addresses' => 'bir və ya daha çox e-poçt ünvanı', - 'Prefix will be automaticaly added to database name and database user' => 'Prefiks avtomatik olaraq verilənlər bazası adı və verilənlər bazası istifadəçisinə əlavə olunacaq', - 'Database' => 'Verilənlər bazası', - 'Type' => 'Tip', - 'Minute' => 'Dəqiqə', - 'Command' => 'Əmr', - 'Package Name' => 'Paket adı', - 'Netmask' => 'Netmask', - 'Interface' => 'İnterfeys', - 'Shared' => 'Paylaşılan', - 'Assigned user' => 'Təyin edilən istifadəçi', - 'Assigned domain' => 'Təyin edilən domen', - 'NAT IP association' => 'NAT IP assosiasiyası', - 'shell' => 'shell', - 'web domains' => 'Veb domenləri', - 'web aliases' => 'veb ləqəblər', - 'dns records' => 'dns qeydləri', - 'mail domains' => 'mail domenləri', - 'mail accounts' => 'mail hesabları', - 'accounts' => 'hesablar', - 'databases' => 'verilənlər bazası', - 'cron jobs' => 'Cron tapşırıqları', - 'backups' => 'nüsxələr', - 'quota' => 'kvota', - 'day of week' => 'həftənin günü', - 'cmd' => 'cmd', - 'users' => 'istifadəçilər', - 'domains' => 'domenlər', - 'aliases' => 'aliases', - 'records' => 'qeydlər', - 'jobs' => 'işlər', - 'username' => 'istifadəçi adı', - 'password' => 'şifrə', - 'type' => 'tip', - 'charset' => 'kodlaşdırma', - 'domain' => 'domen', - 'ip' => 'ip', - 'ip address' => 'ip ünvanı', - 'IP address' => 'IP ünvanı', - 'netmask' => 'netmask', - 'interface' => 'interfeys', - 'assigned user' => 'təyin edilən istifadəçi', - 'ns1' => 'ns1', - 'ns2' => 'ns2', - 'user' => 'istifadəçi', - 'email' => 'e-poçt', - 'first name' => 'ad', - 'last name' => 'soyad', - 'account' => 'hesab', - 'ssl certificate' => 'ssl sertifikatı', - 'ssl key' => 'ssl açarı (key)', - 'stats user password' => 'statistik istifadəçi sifrəsi', - 'stats username' => 'statistik istifadəçi adı', - 'stats password' => 'statistik şifrəsi', - 'ftp user password' => 'ftp istifadəçi şifrəsi', - 'ftp user' => 'ftp istifadəçisi', - 'Last 70 lines of %s.%s.log' => '%s.%s.log faylının son 70 sətri', - 'AccessLog' => 'AccessLog', - 'ErrorLog' => 'ErrorLog', - 'Download AccessLog' => 'AccessLog yüklə', - 'Download ErrorLog' => 'ErrorLog yüklə', - 'Country' => 'Ölkə', - '2 letter code' => '2 hərf kodu', - 'State / Province' => 'Dövlət / Əyalət', - 'City / Locality' => 'Şəhər / Yerləşmə', - 'Organization' => 'Orqanizasiya', - 'Action' => 'Fəaliyyət', - 'Protocol' => 'Protokol', - 'Port' => 'Port', - 'Comment' => 'Rəy', - 'Banlist' => 'Ban siyahısı', - 'ranges are acceptable' => 'qəbul edilə bilən aralıqlar', - 'CIDR format is supported' => 'CIDR versiyasını dəstəkləyir', - 'ACCEPT' => 'ACCEPT', - 'DROP' => 'DROP', - 'TCP' => 'TCP', - 'UDP' => 'UDP', - 'ICMP' => 'ICMP', - 'SSH' => 'SSH', - 'FTP' => 'FTP', - 'VESTA' => 'VESTA', - 'Add one more Name Server' => 'Neymserver əlavə edin', - 'web domain' => 'veb domen', - 'dns domain' => 'dns domen', - 'dns record' => 'dns qeyd', - 'mail domain' => 'mail domen', - 'mail account' => 'mail hesabı', - 'cron job' => 'cron işi', - 'cron' => 'cron', - 'user dir' => 'istifadəçidir', - 'unlimited' => 'limitsiz', - '1 account' => '1 hesab', - '%s accounts' => '%s hesab', - '1 domain' => '1 alan adı', - '%s domains' => '%s alan adı', - '1 record' => '1 kayıt', - '%s records' => '%s kayıt', - '1 mail account' => '1 mail hesabı', - '%s mail accounts' => '%s mail hesabı', - '1 database' => '1 verilənlər bazası', - '%s databases' => '%s verilənlər bazası', - '1 cron job' => '1 zamanlanmış tapşırıq', - '%s cron jobs' => '%s zamanlanmış tapşırıq', - '1 archive' => '1 arxiv', - '%s archives' => '%s arxiv', - '1 item' => '1 maddə', - '%s items' => '%s maddələr', - '1 package' => '1 paket', - '%s packages' => '%s paket', - '1 IP address' => '1 IP ünvanı', - '%s IP addresses' => '%s IP ünvanı', - '1 month' => '1 ay', - '%s months' => '%s ay', - '1 log record' => '1 log qeydi', - '%s log records' => '%s log qeydi', - '1 object' => '1 obyekt', - '%s objects' => '%s obyekt', - 'no exclusions' => 'istisna yoxdur', - '1 rule' => '1 qayda', - '%s rules' => '%s qayda', - 'There are no currently banned IP' => 'Hazırda ban edilmiş İP yoxdur', - 'USER_CREATED_OK' => '%s istifadəşisi uğurla yaradıldı.', - 'WEB_DOMAIN_CREATED_OK' => '%s domen uğurla yaradıldı.', - 'DNS_DOMAIN_CREATED_OK' => '%s DNS domen uğurla yaradıldı.', - 'DNS_RECORD_CREATED_OK' => '%s.%s qeydi uğurla yaradıldı.', - 'MAIL_DOMAIN_CREATED_OK' => '%s əsas domen uğurla yaradıldı', - 'MAIL_ACCOUNT_CREATED_OK' => '%s@%s e-poçt hesabı uğurla yaradıldı', - 'DATABASE_CREATED_OK' => '%s verilənlər bazası uğurla yaradıldı.', - 'CRON_CREATED_OK' => 'Zamanlanmış tapşırıq uğurla yaradıldı.', - 'IP_CREATED_OK' => '%s ip ünvanı uğurla yaradıldı.', - 'PACKAGE_CREATED_OK' => '%s paketi uğurla yaradıldı.', - 'SSL_GENERATED_OK' => 'Sertifikart uğurla yaradıldı.', - 'RULE_CREATED_OK' => 'Qayda uğurla yaradıldı.', - 'BANLIST_CREATED_OK' => 'IP ünvan müvəffəqiyyətlə qadağan edildi', - 'Autoupdate has been successfully enabled' => 'Avtomatik yenilənmə uğurla aktivləşdirildi', - 'Autoupdate has been successfully disabled' => 'Avtomatik yenilənmə uğurla söndürüldü', - 'Cronjob email reporting has been successfully enabled' => 'Zamanlanmış tapşırıq e-poçt hesabatı uğurla aktivləşdirildi', - 'Cronjob email reporting has been successfully disabled' => 'Zamanlanmış tapşırıq e-poçt hesabatı uğurla dayandırıldı', - 'Changes has been saved.' => 'Dəyişikliklər yadda saxlanıldı.', - 'Confirmation' => 'Təsdiqləmə', - 'DELETE_USER_CONFIRMATION' => '%s istifadəçisini silmək istədiyinizə əminsinizmi?', - 'SUSPEND_USER_CONFIRMATION' => '%s istifadəçisini qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_USER_CONFIRMATION' => '%s istifadəçisini davam etdirmək istədiyinizə əminsinizmi?', - 'DELETE_DOMAIN_CONFIRMATION' => '%s domeni silmək istədiyinizə əminsinizmi?', - 'SUSPEND_DOMAIN_CONFIRMATION' => '%s domeni qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => '%s domeni davam etdirmək istədiyinizə əminsinizmi?', - 'DELETE_RECORD_CONFIRMATION' => '%s qeydi silmək istədiyinizə əminsinizmi?', - 'SUSPEND_RECORD_CONFIRMATION' => '%s qeydi qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_RECORD_CONFIRMATION' => '%s qeydi davam etdirmək istədiyinizə əminsinizmi?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '%s hesabını silmək istədiyinizə əminsinizmi?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '%s hesabını qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '%s hesabını davam etdirmək istədiyinizə əminsinizmi?', - 'DELETE_DATABASE_CONFIRMATION' => '%s verilənlər bazasını silmək istədiyinizə əminsinizmi?', - 'SUSPEND_DATABASE_CONFIRMATION' => '%s verilənlər bazasını qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_DATABASE_CONFIRMATION' => '%s verilənlər bazasını davam etdirmək istədiyinizə əminsinizmi?', - 'DELETE_CRON_CONFIRMATION' => 'Zamanlanmış tapşırığı silmək istədiyinizə əminsinizmi?', - 'SUSPEND_CRON_CONFIRMATION' => 'Zamanlanmış tapşırığı qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_CRON_CONFIRMATION' => 'Zamanlanmış tapşırığı davam etdirmək istədiyinizə əminsinizmi?', - 'DELETE_BACKUP_CONFIRMATION' => '%s nüsxəsini silmək istədiyinizə əminsinizmi?', - 'DELETE_EXCLUSION_CONFIRMATION' => '%s nüsxələmə qaydasını silmək istədiyinizə əminsinizmi?', - 'DELETE_PACKAGE_CONFIRMATION' => '%s paketini silmək istədiyinizə əminsinizmi?', - 'DELETE_IP_CONFIRMATION' => '%s IP ünvanı silmək istədiyinizə əminsinizmi?', - 'DELETE_RULE_CONFIRMATION' => '#%s qaydasını silmək istədiyinizə əminsinizmi?', - 'SUSPEND_RULE_CONFIRMATION' => '#%s qaydasını qapatmaq istədiyinizə əminsinizmi?', - 'UNSUSPEND_RULE_CONFIRMATION' => '#%s qaydasını davam etdirmək istədiyinizə əminsinizmi?', - 'LEAVE_PAGE_CONFIRMATION' => 'Səhifəni tərk edirsiniz?', - 'RESTART_CONFIRMATION' => '%s yenidən başladılacaq.əstiqləyirsiniz?', - 'Welcome' => 'XOŞ GƏLDİNİZ', - 'LOGGED_IN_AS' => '%s istifadəçisi olaraq daxil oldunuz', - 'Error' => 'Xəta', - 'Invalid username or password' => 'Doğru olmayan istifadəçi adı və ya şifrə', - 'Invalid username or code' => 'Doğru olmayan istifadəçi adı və ya kod', - 'Passwords not match' => 'Şifrələr uyğun deyil', - 'Please enter valid email address.' => 'Lütfən doğru e-poçt ünvanı daxil edin.', - 'Field "%s" can not be blank.' => '"%s" sahəni boş saxlaya bilməzsiniz.', - 'Password is too short.' => 'Şifrə çox qısadır (minimum 6 simvol)', - 'Error code:' => 'Xəta kodu: %s', - 'SERVICE_ACTION_FAILED' => '"%s" "%s" uğursuz oldu', - 'IP address is in use' => 'IP ünvanı istifadədədir', - 'BACKUP_SCHEDULED' => 'Tapşırıq uğurla əlavə edildi. Nüsxə yüklənildiyi zaman xəbərdarlıq e-poçtu alacaqsınız.', - 'BACKUP_EXISTS' => 'Artıq nüsxələmə əməliyyatı davam edir. Yenidən yaratmaq üçün bunun bitməsini gözləyin.', - 'RESTORE_SCHEDULED' => 'Tapşırıq sıraya əlavə edildi. Nüsxə yüklənildiyi zaman xəbərdarlıq e-poçtu alacaqsınız.', - 'RESTORE_EXISTS' => 'Artıq restovrasiya əməliyyatı davam edir. Bunu işlətmək üçün lütfən əvvəlki əməliyyatın bitməsiniz gözləyin.', - 'WEB_EXCLUSIONS' => 'Hər sətrə bir domen əlavə yazın. Bütün domenlər xaric etmək üçün * istifadə edin. Xüsusi qovluq üçün bu formatda yazın: domain.com:public_html/cache:public_html/tmp', - 'DNS_EXCLUSIONS' => 'Hər sətrə bi domen əlavə edin. Bütün domenləri xaric etmək üçün * istifadə edin', - 'MAIL_EXCLUSIONS' => 'Hər sətrə bi domen əlavə edin. Bütün domenləri xaric etmək üçün * istifadə edin. Xüsusi hesab təyin etmək üçün bu formatda yazın: domain.com:info:destek:postmaster', - 'DB_EXCLUSIONS' => 'Hər sətrə bir verilənlər bazası əlavə edin. Hamısı üçün * istifadə edin. ', - 'CRON_EXCLUSIONS' => 'Bütün zamanlanmış tapşırıqları xaric etmək üçün * istifadə edin', - 'USER_EXCLUSIONS' => 'Hər sətrə bir qovluq əlavə edin. Bütün versiyaları xaric etmək üçün * istifadə edin', - 'Welcome to Vesta Control Panel' => 'Vesta nəzarət panelinə xoş gəldiniz', - 'MAIL_FROM' => 'Vesta Nəzarət Paneli ', - 'GREETINGS_GORDON_FREEMAN' => "Hər vaxtınız xeyir, %s %s,\n", - 'GREETINGS' => "Hər vaxtınız xeyir,\n", - 'ACCOUNT_READY' => "Hesabınız uğurla yaradıldı və istifadəyə hazırdır.\n\nhttps://%s/login/\nİstifadəçi adı: %s\nŞifrə: %s\n\n--\nVesta Nəzarət Paneli\n", - 'FTP login credentials' => 'FTP giriş məlumatları', - 'FTP_ACCOUNT_READY' => "FTP hesabı uğurla yaradıldı və istifadə hazırdır.\n\nHostname: %s\nİstifadəçi adı: %s_%s\nŞifrə: %s\n\n--\nVesta Control Panel\n", - 'Database Credentials' => 'Veritabanı Bilgileri', - 'DATABASE_READY' => "Verilənlər bazası yaradıldı.\n\Verilənlər bazsı: %s\nİstifadəçi: %s\Şifrə: %s\n%s\n\n--\nVesta Nəzarət Paneli\n", - 'forgot password' => 'Şifrəmi unutdum', - 'Confirm' => 'Təstiqlə', - 'New Password' => 'Yeni şifrə', - 'Confirm Password' => 'Şifrəni təstiqlə', - 'Reset' => 'Sıfırla', - 'Reset Code' => 'Sıfırlama Kodu', - 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => 'Şifrə sıfırlama kodu e-poçt ünvanınıza göndərildi.
', - 'MAIL_RESET_SUBJECT' => 'Şifrə sıfırlama - %s', - 'PASSWORD_RESET_REQUEST' => "Şifrənizi sıfırlamaq üçün lütfən linki izləyin:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\Alternativ olaraq https://%s/reset/?action=code&user=%s linkinə klik edib davamına bu reset kodunuzu daxil edə bilərsiniz:\n%s\n\nƏgər şifrə sıfırlama istəyiniz olmayıbsa lütfən mesajı yox sayın və üzrümüzü qəbul edin.\n\n--\nVesta Nəzarət Mərkəzi\n", - 'Jan' => 'Yan', - 'Feb' => 'Fev', - 'Mar' => 'Mar', - 'Apr' => 'Apr', - 'May' => 'May', - 'Jun' => 'İyn', - 'Jul' => 'İyl', - 'Aug' => 'Avq', - 'Sep' => 'Sent', - 'Oct' => 'Okt', - 'Nov' => 'Noy', - 'Dec' => 'Dek', - 'Configuring Server' => 'Server ayarlanması', - 'Hostname' => 'Hostname', - 'Time Zone' => 'Vaxt qurşağı', - 'Default Language' => 'Default dil', - 'Proxy Server' => 'Proxy server', - 'Web Server' => 'Veb server', - 'Backend Server' => 'Backend Server', - 'Backend Pool Mode' => 'Backend pul rejimi', - 'DNS Server' => 'DNS server', - 'DNS Cluster' => 'DNS Cluster', - 'MAIL Server' => 'MAIL Server', - 'Antivirus' => 'Antivirus', - 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', - 'Webmail URL' => 'Vebmail URL', - 'MySQL Support' => 'MySQL dəstək', - 'phpMyAdmin URL' => 'phpMyAdmin URL', - 'PostgreSQL Support' => 'PostgreSQL dəstəyi', - 'phpPgAdmin URL' => 'phpPgAdmin URL', - 'Maximum Number Of Databases' => 'Verilənlər bazasının maksimum sayı', - 'Current Number Of Databases' => 'Current Number Of Databases', - 'Local backup' => 'Yerli backup', - 'Compression level' => 'Sıxılma səviyyəsi', - 'Directory' => 'Kataloq', - 'Remote backup' => 'Uzaqdan backup', - 'ftp' => 'FTP', - 'sftp' => 'SFTP', - 'SFTP Chroot' => 'SFTP Chroot', - 'FileSystem Disk Quota' => 'FaylSistemi disk kvotası', - 'Vesta Control Panel Plugins' => 'Vesta Nəzarət Paneli əlavələri', - 'preview' => 'Ön görünüş', - 'Reseller Role' => 'Reseller rolu', - 'Web Config Editor' => 'Veb Konfiqurasiya redaktoru', - 'Template Manager' => 'Şablon idarəçisi', - 'Backup Migration Manager' => 'Nüsxələmə miqrasiya idarəçisi', - 'FileManager' => 'Faylİdarəçisi', - 'show: CPU / MEM / NET / DISK' => 'göstər: CPU / BEL / ŞƏ / DISK', - 'sort by' => 'sıralama ölçüsü', - 'Date' => 'Tarix', - 'Starred' => 'Ulduzlu', - 'Name' => 'Ad', - 'save to favorites' => 'Sevimlilərə əlavə edin', - 'File Manager' => 'Fayl İdarəçisi', - 'size' => 'ölçü', - 'date' => 'tarix', - 'name' => 'ad', - 'Initializing' => 'Başladılır', - 'UPLOAD' => 'YÜKLƏ', - 'NEW FILE' => 'YENİ FAYL', - 'NEW DIR' => 'YENİ QOVLUQ', - 'DELETE' => 'SİL', - 'RENAME' => 'YENİDƏN ADLANDIR', - 'MOVE' => 'kÖÇÜRT', - 'RIGHTS' => 'HÜQUQLAR', - 'COPY' => 'KOPYALA', - 'ARCHIVE' => 'ARXİVLƏ', - 'EXTRACT' => 'ÇIXART', - 'DOWNLOAD' => 'YÜKLƏ', - 'Are you sure?' => 'Əminsinizmi?', - 'Hit' => 'Hit', - 'to reload the page' => 'səhifəni yeniləm üçün', - 'Directory name cannot be empty' => 'Kataloq adı boş ola bilməz', - 'File name cannot be empty' => 'Fayl adı boş ola bilməz', - 'No file selected' => 'Fayl seçilmədi', - 'No file or folder selected' => 'Fayl və ya qovluq seçilmədi', - 'File type not supported' => 'Fayl tipi dəstəklənmir', - 'Directory download not available in current version' => 'Kataloq yüklnməsi bu versiyada mövcud deyil', - 'Directory not available' => 'Kataloq keçərli deyil', - 'Done' => 'Birdi', - 'Close' => 'Bağla', - 'Copy' => 'Kopyala', - 'Cancel' => 'Ləğv et', - 'Rename' => 'Yenidən adlandır', - 'Move' => 'Köçürt', - 'Change Rights' => 'Hüquqları dəyişdirin', - 'Delete' => 'Sil', - 'Extract' => 'Çıxart', - 'Create' => 'Yarat', - 'Compress' => 'Sıx', - 'OK' => 'TAMAM', - 'YOU ARE COPYING' => 'Siz kopyalayırsınız', - 'YOU ARE REMOVING' => 'Siz silirsiniz', - 'Delete items' => 'Maddələri silin', - 'Copy files' => 'Faylları kopyalayın', - 'Move files' => 'Faylları daşıyın', - 'Are you sure you want to copy' => 'Kopyalamaq istədiyinizə əminsinizmi', - 'Are you sure you want to move' => 'Köçürtmək istədiyinizə əminsinizmi?', - 'Are you sure you want to delete' => 'Silmək istədiyinizə əminsinizmi?', - 'into' => 'daxil', - 'existing files will be replaced' => 'mövcud fayllar dəyişdirilir', - 'Original name' => 'Orjinal adı', - 'File' => 'Fayl', - 'already exists' => 'mövcuddur', - 'Create file' => 'Fayl yarat', - 'Create directory' => 'Kataloq yarat', - 'read by owner' => 'sahini tərəfindən oxunan', - 'write by owner' => 'sahibi tərəfindən yazılan', - 'execute/search by owner' => 'sahibi tərəfindən icra edilən/axtarılan', - 'read by group' => 'grup tərəfindən oxunan', - 'write by group' => 'qrup tərəfindən yazılan', - 'execute/search by group' => 'qrup tərəfindən icar edilən/axtarılan', - 'read by others' => 'başqaları tərəfindən oxunan', - 'write by others' => 'başqaları tərəfindən yazılan', - 'execute/search by others' => 'başqaları tərəfindən icra edilən/axtarılan', - 'Shortcuts' => 'Qısayollar', - 'Add New object' => 'Yeni obyekt əlavə edin', - 'Save Form' => 'Formanı yadda saxla', - 'Cancel saving form' => 'Formanı yadda saxlama', - 'Go to USER list' => 'İstifadəçi siyahısına get', - 'Go to WEB list' => 'Veb siyahısına get', - 'Go to DNS list' => 'DNS siyahısına get', - 'Go to MAIL list' => 'MAIL siyahısına get', - 'Go to DB list' => 'DB siyahısına get', - 'Go to CRON list' => 'CRON siyahısına get', - 'Go to BACKUP list' => 'Nüsxə siyahısına get', - 'Focus on search' => 'Axtarışa fokuslan', - 'Display/Close shortcuts' => 'Qısayolları göstər/bağla', - 'Move backward through top menu' => 'Üst menyu arasında geriyə get', - 'Move forward through top menu' => 'Üst menyu arasında iləriyə get', - 'Enter focused element' => 'Fokuslanmış elementi gör', - 'Move up through elements list' => 'Elementlər siyahısına keçin', - 'Move down through elements list' => 'Elementlər siyahısına keçin', - 'Upload' => 'Yüklə', - 'New File' => 'Yeni fayl', - 'New Folder' => 'Yeni qovluq', - 'Download' => 'Yüklə', - 'Archive' => 'Arxivlə', - 'Save File (in text editor)' => 'Faylı yadda saxla (mətn redaktorunda)', - 'Close Popup / Cancel' => 'Popup bağla / Ləğv et', - 'Move Cursor Up' => 'Kursoru yuxarı qaldır', - 'Move Cursor Down' => 'Kursoru aşağı endir', - 'Switch to Left Tab' => 'Sol taba keçin', - 'Switch to Right Tab' => 'Sağ taba keçin', - 'Switch Tab' => 'Taba keç', - 'Go to the Top of the File List' => 'Fayl siyahısının əvvəlinə get', - 'Go to the Last File' => 'Son fayla bax', - 'Open File / Enter Directory' => 'Faylı aç/Kataloqa daxil ol', - 'Edit File' => 'Faylı redaktə edin', - 'Go to Parent Directory' => 'Əsas kataloqa daxil olun', - 'Select Current File' => 'Hazırki faylı seçin', - 'Select Bunch of Files' => 'Fayl dəstini seçin', - 'Add File to the Current Selection' => 'Hazırki seçimə fayl əlavə edin', - 'Select All Files' => 'Bütün faylları seçin', - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'qısayollar mükəmməl fayl idarəçisi Midnight Commander fayl idarəçisindən alınmışdır', - 'Licence Key' => 'Lisenziya açarı', - 'Enter License Key' => 'Lisenziya açarını daxil edin', - 'Buy Licence' => 'Lisenziya alın', - 'Buy Lifetime License' => 'Ömür boyu lisenziyası alın', - 'Disable and Cancel Licence' => 'Lisenziyanı söndürün və ləğv edin', - 'Licence Activated' => 'Lisenziya aktivdir', - 'Licence Deactivated' => 'Lisenziya ləğv edilib', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'İstifadəçilə SSH yalnız öz əsas kataloqlarına daxil ola bilərlər.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Baxış, kopyalama, redaktə, tamfunksional fayl meneceri vasitəsilə veb domendə olan faylların baxışı və ixracı.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'Bu kommersiya moduludur. Ondan istifadə etmək üçün lisenziya açarını əldə etməlisiniz', - 'Minutes' => 'Dəqiqəlik', - 'Hourly' => 'Saatlıq', - 'Run Command' => 'Əmri aktivləşdir', - 'every month' => 'hər ay', - 'every odd month' => 'hər tək ay', - 'every even month' => 'hər cüt ay', - 'every day' => 'hər gün', - 'every odd day' => 'hər tək gün', - 'every even day' => 'hər cüt gün', - 'weekdays (5 days)' => 'həftə içi (5 gün)', - 'weekend (2 days)' => 'həftə sonu (2 gün)', - 'Monday' => 'Bazar ertəsi', - 'Tuesday' => 'Çərşənbə axşamı', - 'Wednesday' => 'Çərşənbə', - 'Thursday' => 'Cümə axşamı', - 'Friday' => 'Cümə', - 'Saturday' => 'Şənbə', - 'Sunday' => 'Bazar', - 'every hour' => 'hər saat', - 'every two hours' => 'hər iki saatda bir', - 'every minute' => 'hər dəqiqə', - 'every two minutes' => 'hər iki dəqiqdə bir', - 'every' => 'hər', - 'Generate' => 'Yaratmaq', - 'webalizer' => 'webalizer', - 'awstats' => 'awstats', - 'Vesta SSL' => 'Vesta SSL', - 'SUBJECT' => 'MÖVZU', - 'ALIASES' => 'LƏQƏBLƏR', - 'NOT_BEFORE' => 'NOT_BEFORE', - 'NOT_AFTER' => 'NOT_AFTER', - 'SIGNATURE' => 'İMZA', - 'PUB_KEY' => 'PUB_KEY', - 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'Server hostname-dən istifadə et', - 'Use domain hostname' => 'Domen hostname-dən istifadə et', - 'Use STARTTLS' => 'STARTTLS istifadə et', - 'Use SSL / TLS' => 'SSL / TLS istifadə et', - 'No encryption' => 'Şifrələnməsiz', - 'Do not use encryption' => 'Şifrələnməni istifadə etmə', - 'maximum characters length, including prefix' => 'Simvolların maksimal uzunlu %s, prfiks daxil', - 'Email Credentials' => 'E-poçt hüquqları', -); diff --git a/web/inc/i18n/bg.php b/web/inc/i18n/bg.php index 746963d3..760b88c1 100644 --- a/web/inc/i18n/bg.php +++ b/web/inc/i18n/bg.php @@ -40,8 +40,6 @@ $LANG['bg'] = array( 'NETWORK' => 'МРЕЖА', 'Web Log Manager' => 'МЕНИДЖЪР НА УЕБ ЛОГОВЕ', - 'no notifications' => 'no notifications', - 'Add User' => 'Добави потребител', 'Add Domain' => 'Добави домейн', 'Add Web Domain' => 'Добави уеб домейн', @@ -109,7 +107,6 @@ $LANG['bg'] = array( 'disable autoupdate' => 'забрани автоматичното обновяване', 'turn on notifications' => 'включи известията', 'turn off notifications' => 'изключи известията', - 'configure' => 'configure', 'Adding User' => 'Добавяне на потребител', 'Editing User' => 'Редактиране на потребител', @@ -194,8 +191,6 @@ $LANG['bg'] = array( 'SSL Home Directory' => 'SSL начало', 'Lets Encrypt Support' => 'Lets Encrypt поддръжка', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Прокси поддръжка', 'Proxy Extensions' => 'Прокси разширения', 'Web Statistics' => 'Уеб статистики', @@ -558,7 +553,6 @@ $LANG['bg'] = array( 'MAIL Server' => 'Пощенски сървър', 'Antivirus' => 'Антивирус', 'AntiSpam' => 'Антиспам', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Уебмейл адрес', 'MySQL Support' => 'MySQL поддръжкс', 'phpMyAdmin URL' => 'phpMyAdmin адрес', @@ -693,7 +687,7 @@ $LANG['bg'] = array( 'Select Bunch of Files' => 'Избери няколко файла', 'Add File to the Current Selection' => 'Добави файла към текущата селекция', 'Select All Files' => 'Избери всички файлове', - 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => + 'shortcuts are inspired by magnificent GNU Midnight Commander файлов мениджър' => 'преките пътища са вдъхновени от великолепният GNU Midnight Commander файлов мениджър', 'Licence Key' => 'Лицензен ключ', 'Enter License Key' => 'Въведете лицензен ключ', @@ -707,6 +701,9 @@ $LANG['bg'] = array( 'This is a commercial module, you would need to purchace license key to enable it.' => 'Това е комерсиален модул, за чиито ползване е нужно да поръчате лицензионен ключ.', 'Minutes' => 'Минути', 'Hourly' => 'Всеки час', + 'Daily' => 'Всеки ден ', + 'Weekly' => 'Всяка седмица', + 'Monthly' => 'Всеки месец', 'Run Command' => 'Изпълни команда', 'every month' => 'всеки месец', 'every odd month' => 'всеки нечетен месец', diff --git a/web/inc/i18n/bs.php b/web/inc/i18n/bs.php index 8f515153..22d997e5 100644 --- a/web/inc/i18n/bs.php +++ b/web/inc/i18n/bs.php @@ -195,7 +195,6 @@ $LANG['bs'] = array( 'SSL Home Directory' => 'SSL direktorij', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy podrška', 'Proxy Extensions' => 'Proxy ekstenzije', @@ -560,7 +559,6 @@ $LANG['bs'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/cn.php b/web/inc/i18n/cn.php index 9276cd83..9d58b381 100644 --- a/web/inc/i18n/cn.php +++ b/web/inc/i18n/cn.php @@ -10,147 +10,147 @@ */ $LANG['cn'] = array( - 'Packages' => '用户方案', - 'IP' => 'IP 地址', - 'Graphs' => '资源图表', - 'Statistics' => '统计信息', - 'Log' => '系统日志', - 'Server' => '服务器', - 'Services' => '系统服务', + 'Packages' => '预设方案', + 'IP' => 'IP 地址', + 'Graphs' => '资源图表', + 'Statistics' => '统计信息', + 'Log' => '系统日志', + 'Server' => '服务器', + 'Services' => '系统服务', 'Firewall' => '防火墙', - 'Updates' => '系统更新', - 'Log in' => '登录', - 'Log out' => '登出', + 'Updates' => '系统更新', + 'Log in' => '登录', + 'Log out' => '登出', - 'USER' => '用户账户', - 'WEB' => 'Web 服务', - 'DNS' => 'DNS 服务', - 'MAIL' => '邮箱服务', - 'DB' => '数据库', - 'CRON' => '定时任务', - 'BACKUP' => '数据备份', + 'USER' => '用户账户', + 'WEB' => 'Web 服务', + 'DNS' => 'DNS 服务', + 'MAIL' => '邮箱服务', + 'DB' => '数据库', + 'CRON' => '定时任务', + 'BACKUP' => '数据备份', - 'LOGIN' => '登录', - 'RESET PASSWORD' => '重置密码', - 'SEARCH' => '搜索', - 'PACKAGE' => '用户方案', - 'RRD' => '资源图表', - 'STATS' => '统计信息', - 'LOG' => '系统日志', - 'UPDATES' => '系统更新', - 'FIREWALL' => '防火墙', - 'SERVER' => '服务器', - 'MEMORY' => '内存', - 'DISK' => '磁盘', - 'NETWORK' => '网络', - 'Web Log Manager' => 'Web 日志管理', + 'LOGIN' => '登录', + 'RESET PASSWORD' => '重置密码', + 'SEARCH' => '搜索', + 'PACKAGE' => '预设方案', + 'RRD' => '资源图表', + 'STATS' => '统计信息', + 'LOG' => '系统日志', + 'UPDATES' => '系统更新', + 'FIREWALL' => '防火墙', + 'SERVER' => '服务器', + 'MEMORY' => '内存', + 'DISK' => '磁盘', + 'NETWORK' => '网络', + 'Web Log Manager' => 'Web 日志管理', - 'no notifications' => '没有通知', + 'no notifications' => '没有通知', - 'Add User' => '添加用户账户', - 'Add Domain' => '添加网站域名', + 'Add User' => '添加用户', + 'Add Domain' => '添加域名', 'Add Web Domain' => '添加网站域名', - 'Add DNS Domain' => '添加DNS域名', - 'Add DNS Record' => '添加DNS记录', - 'Add Mail Domain' => '添加邮箱域名', - 'Add Mail Account' => '添加邮箱账户', - 'Add Database' => '添加数据库', - 'Add Cron Job' => '添加定时任务', - 'Create Backup' => '创建数据备份', - 'Configure' => '配置', - 'Restore All' => '全部恢复', - 'Add Package' => '添加用户方案', - 'Add IP' => '添加IP地址', - 'Add Rule' => '添加防火墙规则', + 'Add DNS Domain' => '添加DNS域名', + 'Add DNS Record' => '添加DNS记录', + 'Add Mail Domain' => '添加邮箱域名', + 'Add Mail Account' => '添加邮箱账户', + 'Add Database' => '添加数据库', + 'Add Cron Job' => '添加定时任务', + 'Create Backup' => '创建备份', + 'Configure' => '配置', + 'Restore All' => '全部恢复', + 'Add Package' => '添加方案', + 'Add IP' => '添加IP地址', + 'Add Rule' => '添加规则', 'Ban IP Address' => '封锁IP地址', - 'Search' => '搜索', + 'Search' => '搜索', 'Add one more FTP Account' => '增加一个FTP账户', - 'Overall Statistics' => '整体统计信息', - 'Daily' => '按天', - 'Weekly' => '按周', - 'Monthly' => '按月', - 'Yearly' => '按年', - 'Add' => '添加', - 'Back' => '返回', - 'Save' => '保存', - 'Submit' => '提交', + 'Overall Statistics' => '整体统计信息', + 'Daily' => '按天', + 'Weekly' => '按周', + 'Monthly' => '按月', + 'Yearly' => '按年', + 'Add' => '添加', + 'Back' => '返回', + 'Save' => '保存', + 'Submit' => '提交', - 'toggle all' => '批量操作', - 'apply to selected' => '应用于选中项的操作', - 'rebuild' => '重建', - 'rebuild web' => '重建网站', - 'rebuild dns' => '重建DNS', - 'rebuild mail' => '重建邮箱', - 'rebuild db' => '重建数据库', - 'rebuild cron' => '重建定时任务', - 'update counters' => '更新使用情况', - 'suspend' => '暂停', - 'unsuspend' => '解除暂停', - 'delete' => '删除', - 'show per user' => '选中指定的用户显示', - 'login as' => '切换登录至账户', - 'logout' => '登出', - 'edit' => '编辑', - 'open webstats' => '查看网站统计', - 'view logs' => '查看日志', - 'list records' => '列出 %s 条记录', - 'add record' => '添加记录', - 'list accounts' => '列出 %s 个账户', - 'add account' => '添加账户', - 'open webmail' => '打开网页邮箱', - 'list fail2ban' => 'Fail2ban 封锁列表', - 'open %s' => '打开 %s', - 'download' => '下载', - 'restore' => '恢复', - 'configure restore settings' => '配置恢复', - 'stop' => '停止', - 'start' => '启动', - 'restart' => '重新启动', - 'update' => '更新', - 'generate' => '生成', + 'toggle all' => '批量操作', + 'apply to selected' => '应用于选中项的操作', + 'rebuild' => '重建', + 'rebuild web' => '重建网站', + 'rebuild dns' => '重建DNS', + 'rebuild mail' => '重建邮箱', + 'rebuild db' => '重建数据库', + 'rebuild cron' => '重建定时任务', + 'update counters' => '更新计数器', + 'suspend' => '暂停', + 'unsuspend' => '解除暂停', + 'delete' => '删除', + 'show per user' => '按用户显示', + 'login as' => '登录至账户', + 'logout' => '登出', + 'edit' => '编辑', + 'open webstats' => '打开网站统计', + 'view logs' => '查看日志', + 'list records' => '列出 %s 条记录', + 'add record' => '添加记录', + 'list accounts' => '列出 %s 个账户', + 'add account' => '添加账户', + 'open webmail' => '打开网页邮箱', + 'list fail2ban' => 'fail2ban 封锁名单', + 'open %s' => '打开 %s', + 'download' => '下载', + 'restore' => '恢复', + 'configure restore settings' => '配置恢复选项', + 'stop' => '停止', + 'start' => '启动', + 'restart' => '重新启动', + 'update' => '更新', + 'generate' => '生成', 'Generate CSR' => '生成CSR', - 'reread IP' => '重新读取IP地址', - 'enable autoupdate' => '点击启用自动更新', - 'disable autoupdate' => '点击停用自动更新', - 'turn on notifications' => '点击启用通知', - 'turn off notifications' => '点击停用通知', + 'reread IP' => '重新读取IP', + 'enable autoupdate' => '启用自动更新', + 'disable autoupdate' => '停用自动更新', + 'turn on notifications' => '启用通知', + 'turn off notifications' => '停用通知', 'configure' => '配置', - 'Adding User' => '添加用户账户', - 'Editing User' => '编辑用户账户', - 'Adding Domain' => '添加网站域名', - 'Editing Domain' => '编辑网站域名', - 'Adding DNS Domain' => '添加DNS域名', - 'Editing DNS Domain' => '编辑DNS域名', - 'Adding DNS Record' => '添加DNS记录', - 'Editing DNS Record' => '编辑DNS记录', - 'Adding Mail Domain' => '添加邮箱域名', - 'Editing Mail Domain' => '编辑邮箱域名', - 'Adding Mail Account' => '添加邮箱账户', - 'Editing Mail Account' => '编辑邮箱账户', - 'Adding database' => '添加数据库', - 'Editing Cron Job' => '编辑定时任务', - 'Adding Cron Job' => '添加定时任务', - 'Editing Database' => '编辑数据库', - 'Adding Package' => '添加用户方案', - 'Editing Package' => '编辑用户方案', - 'Adding IP address' => '添加IP地址', - 'Editing IP Address' => '编辑IP地址', - 'Editing Backup Exclusions' => '配置数据备份的排除项', + 'Adding User' => '添加用户', + 'Editing User' => '编辑用户', + 'Adding Domain' => '添加域名', + 'Editing Domain' => '编辑域名', + 'Adding DNS Domain' => '添加DNS域名', + 'Editing DNS Domain' => '编辑DNS域名', + 'Adding DNS Record' => '添加DNS记录', + 'Editing DNS Record' => '编辑DNS记录', + 'Adding Mail Domain' => '添加邮箱域名', + 'Editing Mail Domain' => '编辑邮箱域名', + 'Adding Mail Account' => '添加邮箱账户', + 'Editing Mail Account' => '编辑邮箱账户', + 'Adding database' => '添加数据库', + 'Editing Cron Job' => '编辑定时任务', + 'Adding Cron Job' => '添加定时任务', + 'Editing Database' => '编辑数据库', + 'Adding Package' => '添加方案', + 'Editing Package' => '编辑方案', + 'Adding IP address' => '添加IP地址', + 'Editing IP Address' => '编辑IP地址', + 'Editing Backup Exclusions' => '配置备份排除项目', 'Generating CSR' => '生成CSR', - 'Listing' => '列出', - 'Search Results' => '搜索结果', + 'Listing' => '列出', + 'Search Results' => '搜索结果', 'Adding Firewall Rule' => '添加防火墙规则', 'Editing Firewall Rule' => '编辑防火墙规则', - 'Adding IP Address to Banlist' => '添加IP地址以封锁', + 'Adding IP Address to Banlist' => '添加IP至封锁名单', - 'active' => '正常', - 'spnd' => '暂停', - 'suspended' => '已暂停', - 'running' => '运行中', - 'stopped' => '已停止', - 'outdated' => '可升级新版本', - 'updated' => '已是最新版本', + 'active' => '正常', + 'spnd' => '暂停', + 'suspended' => '已暂停', + 'running' => '运行中', + 'stopped' => '已停止', + 'outdated' => '可升级新版本', + 'updated' => '已是最新版本', 'yes' => '是', 'no' => '否', @@ -168,53 +168,51 @@ $LANG['cn'] = array( 'month' => '月', 'package' => '方案', 'Bandwidth' => '流量', - 'Disk' => '磁盘', + 'Disk' => '磁盘空间', 'Web' => '网站', 'Mail' => '邮箱', 'Databases' => '数据库', 'User Directories' => '用户目录', 'Template' => '模板', 'Web Template' => 'Web模板', - 'Backend Support' => '后端支持', //New Keyword for PHP-FPM in WEB page. - 'Backend Template' => '后端模板', + 'Backend Template' => 'Backend模板', 'Proxy Template' => '代理模板', 'DNS Template' => 'DNS模板', 'Web Domains' => '网站域名', 'SSL Domains' => 'SSL域名', 'Web Aliases' => '网站别名', - 'per domain' => '每个域名', + 'per domain' => '每域名', 'DNS Domains' => 'DNS域名', 'DNS domains' => 'DNS域名', - 'DNS records' => 'DNS记录', + 'DNS records' => 'DNS记录', 'Name Servers' => 'DNS服务器', 'Mail Domains' => '邮箱域名', 'Mail Accounts' => '邮箱账户', 'Cron Jobs' => '定时任务', 'SSH Access' => 'SSH权限', - 'IP Address' => 'IP地址', + 'IP Address' => 'IP地址', 'IP Addresses' => 'IP地址', 'Backups' => '备份', 'Backup System' => '备份系统', - 'backup exclusions' => '数据备份的排除项', + 'backup exclusions' => '备份排除项目', 'template' => '模板', 'SSL Support' => '启用SSL', - 'SSL Home Directory' => 'SSL主目录', - 'Lets Encrypt Support' => '采用 Let's Encrypt', - 'Lets Encrypt' => 'Let's Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => '证书将在5分钟内自动完成签发', + 'SSL Home Directory' => 'SSL站点主目录', + 'Lets Encrypt Support' => '采用 Let's Encrypt', + 'Lets Encrypt' => 'Let's Encrypt', + 'Your certificate will be automatically issued in 5 minutes' => '证书将在5分钟内自动签发完成', 'Proxy Support' => '反向代理', - 'Proxy Extensions' => '需代理的文件扩展名', + 'Proxy Extensions' => '代理的文件扩展名', 'Web Statistics' => '网站统计', 'Additional FTP Account' => '额外的FTP账户', - 'Path' => '路径', + 'Path' => '路径', 'SOA' => 'SOA', 'TTL' => 'TTL', 'Expire' => '过期', 'Records' => '记录', - 'Serial' => '序号', + 'Serial' => 'Serial', 'Catchall email' => '未知收件人聚合邮箱', - 'AntiVirus Support' => '邮件防病毒支持', + 'AntiVirus Support' => '防病毒支持', 'AntiSpam Support' => '防垃圾邮件支持', 'DKIM Support' => 'DKIM支持', 'Accounts' => '账户', @@ -222,16 +220,16 @@ $LANG['cn'] = array( 'Autoreply' => '自动回复', 'Forward to' => '转发到', 'Do not store forwarded mail' => '不保留已转发的邮件', - 'IMAP hostname' => 'IMAP 服务器', - 'IMAP port' => 'IMAP 端口', - 'IMAP security' => 'IMAP 安全类型', - 'IMAP auth method' => 'IMAP 身份验证', - 'SMTP hostname' => 'SMTP 服务器', - 'SMTP port' => 'SMTP 端口', - 'SMTP security' => 'SMTP 安全类型', - 'SMTP auth method' => 'SMTP 身份验证', - 'STARTTLS' => 'STARTTLS', - 'Normal password' => '普通密码', + 'IMAP hostname' => 'IMAP 服务器', + 'IMAP port' => 'IMAP 端口', + 'IMAP security' => 'IMAP 安全性', + 'IMAP auth method' => 'IMAP 身份验证', + 'SMTP hostname' => 'SMTP 服务器', + 'SMTP port' => 'SMTP 端口', + 'SMTP security' => 'SMTP 安全性', + 'SMTP auth method' => 'SMTP 身份验证', + 'STARTTLS' => 'STARTTLS', + 'Normal password' => '普通密码', 'database' => '数据库', 'User' => '用户名称', 'Host' => '主机', @@ -250,147 +248,144 @@ $LANG['cn'] = array( 'shared' => '共享', 'dedicated' => '独立', 'Owner' => '归属', - 'Users' => '用户', - 'Load Average' => '平均负载', - 'Memory Usage' => '内存使用情况', - 'APACHE2 Usage' => 'Apache2 使用情况', - 'HTTPD Usage' => 'HTTPD 使用情况', - 'NGINX Usage' => 'NGINX 使用情况', - 'MySQL Usage on localhost' => '数据库使用情况 MySQL (localhost)', - 'PostgreSQL Usage on localhost' => '数据库使用情况 PostgreSQL (localhost)', - 'Bandwidth Usage eth0' => '网络使用情况 (eth0)', - 'Bandwidth Usage eth1' => '网络使用情况 (eth1)', - 'Bandwidth Usage venet0' => '网络使用情况 (venet0)', - 'Bandwidth Usage venet1' => '网络使用情况 (venet1)', - 'Bandwidth Usage docker0' => '网络使用情况 (docker0)', - 'Bandwidth Usage docker1' => '网络使用情况 (docker1)', - 'Exim Usage' => 'Exim 使用情况', - 'FTP Usage' => 'FTP 使用情况', - 'SSH Usage' => 'SSH 使用情况', - 'reverse proxy' => '反向代理', - 'web server' => 'Web服务', - 'dns server' => 'DNS服务', - 'mail server' => '邮箱服务', - 'pop/imap server' => 'POP/IMAP服务', - 'email antivirus' => '邮件防病毒', - 'email antispam' => '防垃圾邮件', - 'database server' => '数据库服务', - 'backend server' => '后端服务', //New Keyword for PHP-FPM in SERVER page. - 'ftp server' => 'FTP服务', - 'job scheduler' => '执行定时任务', - 'firewall' => '防火墙服务', - 'brute-force monitor' => '防暴力攻击', - 'CPU' => 'CPU', - 'Memory' => '内存', - 'Uptime' => '已运行时间', - 'core package' => 'Vesta 核心系统', - 'php interpreter' => 'Vesta PHP解释器', - 'internal web server' => 'Vesta Web服务', - 'Version' => '版本', - 'Release' => '发行版本', - 'Architecture' => '架构', - 'Object' => '对象', - 'Username' => '用户名称', - 'Password' => '密码', - 'Email' => '邮箱', - 'Package' => '方案', - 'Language' => '语言', - 'First Name' => '名字', - 'Last Name' => '姓氏', - 'Send login credentials to email address' => '将登录信息发送到邮箱', - 'Default Template' => '默认模板', - 'Default Name Servers' => '默认DNS服务器', - 'Domain' => '域名', - 'DNS Support' => 'DNS支持', - 'Mail Support' => '邮箱支持', - 'Advanced options' => '高级选项', - 'Basic options' => '基本选项', - 'Aliases' => '别名', - 'SSL Certificate' => 'SSL证书', - 'SSL Key' => 'SSL密钥', - 'SSL Certificate Authority / Intermediate' => 'SSL CA证书 / 中级证书', + 'Users' => '用户', + 'Load Average' => '平均负载', + 'Memory Usage' => '内存用量', + 'APACHE2 Usage' => 'Apache2 用量', + 'HTTPD Usage' => 'HTTPD 用量', + 'NGINX Usage' => 'NGINX 用量', + 'MySQL Usage on localhost' => 'MySQL用量 (localhost)', + 'PostgreSQL Usage on localhost' => 'PostgreSQL用量 (localhost)', + 'Bandwidth Usage eth0' => '网络流量 (eth0)', + 'Bandwidth Usage eth1' => '网络流量 (eth1)', + 'Bandwidth Usage venet0' => '网络流量 (venet0)', + 'Bandwidth Usage venet1' => '网络流量 (venet1)', + 'Exim Usage' => 'Exim 用量', + 'FTP Usage' => 'FTP 用量', + 'SSH Usage' => 'SSH 用量', + 'reverse proxy' => '反向代理', + 'web server' => 'Web服务', + 'dns server' => 'DNS服务', + 'mail server' => '邮箱服务', + 'pop/imap server' => 'POP/IMAP服务', + 'email antivirus' => '邮箱防病毒', + 'email antispam' => '防垃圾邮件', + 'database server' => '数据库服务', + 'ftp server' => 'FTP服务', + 'job scheduler' => '执行定时任务', + 'firewall' => '防火墙服务', + 'brute-force monitor' => '监控暴力破解', + 'CPU' => 'CPU', + 'Memory' => '内存', + 'Uptime' => '已运行时间', + 'core package' => '核心系统', + 'php interpreter' => 'PHP解释器', + 'internal web server' => '内部Web服务', + 'Version' => '版本', + 'Release' => '发布号', + 'Architecture' => '架构', + 'Object' => '对象', + 'Username' => '用户名称', + 'Password' => '密码', + 'Email' => '电子邮箱', + 'Package' => '方案', + 'Language' => '语言', + 'First Name' => '名字', + 'Last Name' => '姓氏', + 'Send login credentials to email address' => '将登录信息发送到邮箱', + 'Default Template' => '默认模板', + 'Default Name Servers' => '默认DNS服务器', + 'Domain' => '域名', + 'DNS Support' => 'DNS支持', + 'Mail Support' => '邮箱支持', + 'Advanced options' => '高级选项', + 'Basic options' => '基本选项', + 'Aliases' => '别名', + 'SSL Certificate' => 'SSL证书', + 'SSL Key' => 'SSL密钥', + 'SSL Certificate Authority / Intermediate' => 'CA证书或中级证书', 'SSL CSR' => 'SSL CSR', - 'optional' => '可选', + 'optional' => '可选', 'internal' => '内部', - 'Statistics Authorization' => '统计授权', - 'Statistics Auth' => '统计验证', - 'Account' => '账户', - 'Prefix will be automaticaly added to username' => '用户名称将会自动添加 %s 前缀', - 'Send FTP credentials to email' => '将FTP登录信息发送到邮箱', - 'Expiration Date' => '到期日期', - 'YYYY-MM-DD' => 'YYYY-MM-DD', - 'Name servers' => 'DNS服务器', - 'Record' => '记录', - 'IP or Value' => 'IP或值', - 'Priority' => '优先级', + 'Statistics Authorization' => '统计授权', + 'Statistics Auth' => '统计验证', + 'Account' => '账户', + 'Prefix will be automaticaly added to username' => '用户名称将会自动添加 %s 前缀', + 'Send FTP credentials to email' => '将FTP登录信息发送到邮箱', + 'Expiration Date' => '到期日期', + 'YYYY-MM-DD' => 'YYYY-MM-DD', + 'Name servers' => 'DNS服务器', + 'Record' => '记录', + 'IP or Value' => 'IP或值', + 'Priority' => '优先级', 'Record Number' => '记录编号', - 'in megabytes' => '以MB为单位', - 'Message' => '信息', - 'use local-part' => '使用域内部分', - 'one or more email addresses' => '一个或更多邮箱地址', - 'Prefix will be automaticaly added to database name and database user' => '数据库名及用户名将会自动添加 %s 前缀', - 'Database' => '数据库名称', - 'Type' => '类型', - 'Minute' => '分', - 'Command' => '指令', - 'Package Name' => '方案名称', - 'Netmask' => '子网掩码', - 'Interface' => '网络接口', - 'Shared' => '共享', - 'Assigned user' => '指定用户', - 'Assigned domain' => '指定域名', + 'in megabytes' => '以MB为单位', + 'Message' => '信息', + 'use local-part' => '采用 local-part', + 'one or more email addresses' => '一个或更多邮箱地址', + 'Prefix will be automaticaly added to database name and database user' => '数据库名及用户名将会自动添加 %s 前缀', + 'Database' => '数据库名称', + 'Type' => '类型', + 'Minute' => '分', + 'Command' => '指令', + 'Package Name' => '方案名称', + 'Netmask' => '子网掩码', + 'Interface' => '网络接口', + 'Shared' => '共享', + 'Assigned user' => '指定用户', + 'Assigned domain' => '指定域名', 'NAT IP association' => 'NAT IP 关联', - 'shell' => 'shell', - 'web domains' => '网站域名', - 'web aliases' => '网站别名', - 'dns records' => 'DNS记录', - 'mail domains' => '邮箱域名', - 'mail accounts' => '邮箱账户', - 'accounts' => '账户', - 'databases' => '数据库', - 'cron jobs' => '定时任务', - 'backups' => '备份', - 'quota' => '配额', - 'day of week' => '星期几', - 'cmd' => '指令', - 'users' => '用户', - 'domains' => '域名', - 'aliases' => '别名', - 'records' => '记录', - 'jobs' => '任务', - 'username' => '用户名称', - 'password' => '密码', - 'type' => '类型', - 'charset' => '编码', - 'domain' => '域名', - 'ip' => 'IP', - 'ip address' => 'IP地址', - 'IP address' => 'IP地址', - 'netmask' => '子网掩码', - 'interface' => '网络接口', - 'assigned user' => '指定用户', - 'ns1' => 'ns1', - 'ns2' => 'ns2', - 'user' => '用户', - 'email' => '邮箱', - 'first name' => '名字', - 'last name' => '姓氏', - 'account' => '账户', - 'ssl certificate' => 'SSL证书', - 'ssl key' => 'SSL密钥', - 'stats user password' => '统计用户账户密码', - 'stats username' => '统计用户名称', - 'stats password' => '统计密码', - 'ftp user password' => 'FTP用户账户密码', - 'ftp user' => 'FTP用户', - 'Last 70 lines of %s.%s.log' => '%s.%s.log 的最新 70 条日志记录', + 'shell' => 'shell', + 'web domains' => '网站域名', + 'web aliases' => '网站别名', + 'dns records' => 'DNS记录', + 'mail domains' => '邮箱域名', + 'mail accounts' => '邮箱账户', + 'accounts' => '账户', + 'databases' => '数据库', + 'cron jobs' => '定时任务', + 'backups' => '备份', + 'quota' => '配额', + 'day of week' => '星期几', + 'cmd' => '指令', + 'users' => '用户', + 'domains' => '域名', + 'aliases' => '别名', + 'records' => '记录', + 'jobs' => '任务', + 'username' => '用户名称', + 'password' => '密码', + 'type' => '类型', + 'charset' => '编码', + 'domain' => '域名', + 'ip' => 'IP', + 'ip address' => 'IP地址', + 'IP address' => 'IP地址', + 'netmask' => '子网掩码', + 'interface' => '网络接口', + 'assigned user' => '指定用户', + 'ns1' => 'ns1', + 'ns2' => 'ns2', + 'user' => '用户', + 'email' => '邮箱', + 'first name' => '名字', + 'last name' => '姓氏', + 'account' => '账户', + 'ssl certificate' => 'SSL证书', + 'ssl key' => 'SSL密钥', + 'stats user password' => '统计用户账户密码', + 'stats username' => '统计用户名称', + 'stats password' => '统计密码', + 'ftp user password' => 'FTP用户账户密码', + 'ftp user' => 'FTP用户', + 'Last 70 lines of %s.%s.log' => '%s.%s.log 的最后 70 行', 'AccessLog' => '访问日志', 'ErrorLog' => '错误日志', 'Download AccessLog' => '下载访问日志', 'Download ErrorLog' => '下载错误日志', - 'Country' => '国家地区', - '2 letter code' => 'ISO 3166-1 α-2 二位字母代码 如: 中国CN / 美国US', - 'State / Province' => '州 / 省级', + 'Country' => '国家', + '2 letter code' => '2位国家简码 如: 中国CN / 美国US', + 'State / Province' => '州 / 省', 'City / Locality' => '市 / 地区', 'Organization' => '组织名称', 'Action' => '操作', @@ -400,14 +395,14 @@ $LANG['cn'] = array( 'Banlist' => '需封锁', 'ranges are acceptable' => '可使用范围 如: 21-22', 'CIDR format is supported' => '支持CIDR格式', - 'ACCEPT' => '放行', - 'DROP' => '阻止', + 'ACCEPT' => '接受', + 'DROP' => '拒绝', 'TCP' => 'TCP', 'UDP' => 'UDP', 'ICMP' => 'ICMP', 'SSH' => 'SSH', 'FTP' => 'FTP', - 'VESTA' => 'Vesta', + 'VESTA' => 'VESTA', 'Add one more Name Server' => '增加一个DNS服务器', 'web domain' => '网站域名', @@ -417,60 +412,60 @@ $LANG['cn'] = array( 'mail account' => '邮箱账户', 'cron job' => '定时任务', - 'cron' => '定时任务', + 'cron' => '任务', 'user dir' => '用户目录', - 'unlimited' => '无限', - '1 account' => '1 个账户', - '%s accounts' => '%s 个账户', - '1 domain' => '1 个域名', - '%s domains' => '%s 个域名', - '1 record' => '1 条记录', - '%s records' => '%s 条记录', - '1 mail account' => '1 个邮箱账户', - '%s mail accounts' => '%s 个邮箱账户', - '1 database' => '1 个数据库', - '%s databases' => '%s 个数据库', - '1 cron job' => '1 个定时任务', - '%s cron jobs' => '%s 个定时任务', - '1 archive' => '1 个存档', - '%s archives' => '%s 个存档', - '1 item' => '1 个项目', - '%s items' => '%s 个项目', - '1 package' => '1 个用户方案', - '%s packages' => '%s 个用户方案', - '1 IP address' => '1 个IP地址', - '%s IP addresses' => '%s 个IP地址', - '1 month' => '1 个月', - '%s months' => '%s 个月', - '1 log record' => '1 条日志记录', - '%s log records' => '%s 条日志记录', - '1 object' => '1 个对象', - '%s objects' => '%s 个对象', - 'no exclusions' => '没有被排除的项目', + 'unlimited' => '无限', + '1 account' => '1 个账户', + '%s accounts' => '%s 个账户', + '1 domain' => '1 个域名', + '%s domains' => '%s 个域名', + '1 record' => '1 条记录', + '%s records' => '%s 条记录', + '1 mail account' => '1 个邮箱账户', + '%s mail accounts' => '%s 个邮箱账户', + '1 database' => '1 个数据库', + '%s databases' => '%s 个数据库', + '1 cron job' => '1 个任务', + '%s cron jobs' => '%s 个任务', + '1 archive' => '1 个存档', + '%s archives' => '%s 个存档', + '1 item' => '1 个项目', + '%s items' => '%s 个项目', + '1 package' => '1 个方案', + '%s packages' => '%s 个方案', + '1 IP address' => '1 个IP地址', + '%s IP addresses' => '%s 个IP地址', + '1 month' => '1 个月', + '%s months' => '%s 个月', + '1 log record' => '1 条日志记录', + '%s log records' => '%s 条日志记录', + '1 object' => '1 个对象', + '%s objects' => '%s 个对象', + 'no exclusions' => '未排除', '1 rule' => '1 条规则', '%s rules' => '%s 条规则', 'There are no currently banned IP' => '目前没有被封锁的IP地址', - 'USER_CREATED_OK' => '用户 %s 已添加成功', - 'WEB_DOMAIN_CREATED_OK' => '网站域名 %s 已添加成功', - 'DNS_DOMAIN_CREATED_OK' => 'DNS域名 %s 已添加成功', - 'DNS_RECORD_CREATED_OK' => '记录 %s.%s 已添加成功', - 'MAIL_DOMAIN_CREATED_OK' => '邮箱域名 %s 已添加成功', - 'MAIL_ACCOUNT_CREATED_OK' => '邮箱账户 %s@%s 已添加成功', - 'DATABASE_CREATED_OK' => '数据库 %s 已添加成功', - 'CRON_CREATED_OK' => '定时任务已添加成功', - 'IP_CREATED_OK' => 'IP地址 %s 已添加成功', - 'PACKAGE_CREATED_OK' => '用户方案 %s 已添加成功', + 'USER_CREATED_OK' => '用户 %s 已添加成功', + 'WEB_DOMAIN_CREATED_OK' => '网站域名 %s 已添加成功', + 'DNS_DOMAIN_CREATED_OK' => 'DNS域名 %s 已添加成功', + 'DNS_RECORD_CREATED_OK' => '记录 %s.%s 已添加成功', + 'MAIL_DOMAIN_CREATED_OK' => '邮箱域名 %s 已添加成功', + 'MAIL_ACCOUNT_CREATED_OK' => '邮箱账户 %s@%s 已添加成功', + 'DATABASE_CREATED_OK' => '数据库 %s 已添加成功', + 'CRON_CREATED_OK' => '定时任务已添加成功', + 'IP_CREATED_OK' => 'IP地址 %s 已添加成功', + 'PACKAGE_CREATED_OK' => '方案 %s 已添加成功', 'SSL_GENERATED_OK' => 'SSL证书已生成成功', - 'RULE_CREATED_OK' => '防火墙规则已创建成功', + 'RULE_CREATED_OK' => '规则已创建成功', 'BANLIST_CREATED_OK' => 'IP地址已封锁成功', - 'Autoupdate has been successfully enabled' => '自动更新已启用成功', - 'Autoupdate has been successfully disabled' => '自动更新已停用成功', - 'Cronjob email reporting has been successfully enabled' => '定时任务的电子邮件通知已启用成功', - 'Cronjob email reporting has been successfully disabled' => '定时任务的电子邮件通知已停用成功', - 'Changes has been saved.' => '已保存更改', - 'Confirmation' => '确认', + 'Autoupdate has been successfully enabled' => '自动更新已成功启用', + 'Autoupdate has been successfully disabled' => '自动更新已成功关闭', + 'Cronjob email reporting has been successfully enabled' => '定时任务的电子邮件报告已成功启用', + 'Cronjob email reporting has been successfully disabled' => '定时任务的电子邮件报告已成功关闭', + 'Changes has been saved.' => '已保存更改', + 'Confirmation' => '确认', 'DELETE_USER_CONFIRMATION' => '确定要删除用户 %s 吗?', 'SUSPEND_USER_CONFIRMATION' => '确定要暂停用户 %s 吗?', 'UNSUSPEND_USER_CONFIRMATION' => '确定要解除暂停用户 %s 吗?', @@ -489,31 +484,31 @@ $LANG['cn'] = array( 'DELETE_CRON_CONFIRMATION' => '确定要删除定时任务吗?', 'SUSPEND_CRON_CONFIRMATION' => '确定要暂停定时任务吗?', 'UNSUSPEND_CRON_CONFIRMATION' => '确定要解除暂停定时任务吗?', - 'DELETE_BACKUP_CONFIRMATION' => '确定要删除 %s 数据备份吗?', - 'DELETE_EXCLUSION_CONFIRMATION' => '确定要删除 %s 排除项吗?', - 'DELETE_PACKAGE_CONFIRMATION' => '确定要删除用户方案 %s 吗?', - 'DELETE_IP_CONFIRMATION' => '确定要删除IP地址 %s 吗?', - 'DELETE_RULE_CONFIRMATION' => '确定要删除防火墙规则 #%s 吗?', - 'SUSPEND_RULE_CONFIRMATION' => '确定要暂停防火墙规则 #%s 吗?', - 'UNSUSPEND_RULE_CONFIRMATION' => '确定要解除暂停防火墙规则 #%s 吗?', - 'LEAVE_PAGE_CONFIRMATION' => '确定要离开当前页面吗?', + 'DELETE_BACKUP_CONFIRMATION' => '确定要删除 %s 备份吗?', + 'DELETE_EXCLUSION_CONFIRMATION' => '确定要删除 %s 例外吗?', + 'DELETE_PACKAGE_CONFIRMATION' => '确定要删除方案 %s 吗?', + 'DELETE_IP_CONFIRMATION' => '确定要删除IP地址 %s 吗?', + 'DELETE_RULE_CONFIRMATION' => '确定要删除规则 #%s 吗?', + 'SUSPEND_RULE_CONFIRMATION' => '确定要暂停规则 #%s 吗?', + 'UNSUSPEND_RULE_CONFIRMATION' => '确定要解除暂停规则 #%s 吗?', + 'LEAVE_PAGE_CONFIRMATION' => '确定要离开当前页吗?', 'RESTART_CONFIRMATION' => '确定要重新启动 %s 吗?', - 'Welcome' => '欢迎您', - 'LOGGED_IN_AS' => '以 %s 的身份登录', - 'Error' => '错误', - 'Invalid username or password' => '无效的用户名称或密码', - 'Invalid username or code' => '无效的用户名称或重置代码', - 'Passwords not match' => '密码错误', - 'Please enter valid email address.' => '请输入正确的邮箱', - 'Field "%s" can not be blank.' => '"%s" 不能为空', - 'Password is too short.' => '密码太短 (字符至少6个)', - 'Error code:' => '错误代码: %s', - 'SERVICE_ACTION_FAILED' => '"%s" "%s" 失败', + 'Welcome' => '欢迎', + 'LOGGED_IN_AS' => '以 %s 的身份登录', + 'Error' => '错误', + 'Invalid username or password' => '无效的用户名称或密码', + 'Invalid username or code' => '无效的用户名称或验证码.', + 'Passwords not match' => '密码错误', + 'Please enter valid email address.' => '请输入正确的邮箱', + 'Field "%s" can not be blank.' => '"%s" 不能为空', + 'Password is too short.' => '密码太短 (至少为6个数字+字母)', + 'Error code:' => '错误代码: %s', + 'SERVICE_ACTION_FAILED' => '"%s" "%s" 失败', 'IP address is in use' => 'IP地址在使用中', - 'BACKUP_SCHEDULED' => '您的要求已加入队列中,备份完成后会以电子邮件通知您', - 'BACKUP_EXISTS' => '已经有数据备份正在执行,请等待备份完成后再操作', - 'RESTORE_SCHEDULED' => '您的要求已加入队列中,恢复完成后会以电子邮件通知您', - 'RESTORE_EXISTS' => '已经有数据恢复正在执行,请等待恢复完成后再操作', + 'BACKUP_SCHEDULED' => '您的要求已加入队列中,备份完成后会以电子邮件通知您 ', + 'BACKUP_EXISTS' => '已经有一个备份正在执行,请等待备份完成后再操作', + 'RESTORE_SCHEDULED' => '您的要求已加入队列中,恢复完成后会以电子邮件通知您', + 'RESTORE_EXISTS' => '已经有一个恢复正在执行,请等待恢复完成后再操作', 'WEB_EXCLUSIONS' => '输入域名,每行一个。要排除所有域名请使用 *。要排除特定目录使用以下格式: domain.com:public_html/cache:public_html/tmp', 'DNS_EXCLUSIONS' => '输入域名,每行一个。要排除所有域名请使用 *', @@ -522,28 +517,28 @@ $LANG['cn'] = array( 'CRON_EXCLUSIONS' => '要排除所有任务请使用 *', 'USER_EXCLUSIONS' => '输入目录名称,每行一个。要排除所有目录请使用 *', - 'Welcome to Vesta Control Panel' => '欢迎来到 Vesta 管理系统', - 'MAIL_FROM' => 'Vesta 管理系统 ', - 'GREETINGS_GORDON_FREEMAN' => "您好,%s %s,\n\n", - 'GREETINGS' => "您好,\n\n", - 'ACCOUNT_READY' => "您的账户已创建成功,并可以开始使用了!\n\nhttps://%s/login/\n用户名称: %s\n密码: %s\n\n--\nVesta 管理系统\n", + 'Welcome to Vesta Control Panel' => '欢迎来到 Vesta 管理系统', + 'MAIL_FROM' => 'Vesta 管理系统 ', + 'GREETINGS_GORDON_FREEMAN' => "您好, %s %s,\n", + 'GREETINGS' => "您好,\n", + 'ACCOUNT_READY' => "您的账户已创建成功,并可以开始使用了!\n\nhttps://%s/login/\n用户名称: %s\n密码: %s\n\n--\nVesta Control Panel\n", - 'FTP login credentials' => 'FTP 登录信息', - 'FTP_ACCOUNT_READY' => "FTP 账户已创建成功,并可以开始使用了!\n\n主机名称: %s\n用户名称: %s_%s\n密码: %s\n\n--\nVesta 管理系统\n", + 'FTP login credentials' => 'FTP 登录信息', + 'FTP_ACCOUNT_READY' => "FTP账户已创建成功,并可以开始使用了!\n\n主机名称: %s\n用户名称: %s_%s\n密码: %s\n\n--\nVesta Control Panel\n", - 'Database Credentials' => '数据库登录信息', - 'DATABASE_READY' => "数据库已添加成功!\n\n数据库名称: %s\n用户名称: %s\n密码: %s\n%s\n\n--\nVesta 管理系统\n", + 'Database Credentials' => '数据库登录信息', + 'DATABASE_READY' => "数据库已添加成功!\n\n数据库名称: %s\n用户名称: %s\n密码: %s\n%s\n\n--\nVesta Control Panel\n", - 'forgot password' => '忘记密码', - 'Confirm' => '确认', - 'New Password' => '新密码', - 'Confirm Password' => '确认密码', - 'Reset' => '重置', - 'Reset Code' => '重置代码', - 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => '重置代码已发送到您的邮箱
', - 'MAIL_RESET_SUBJECT' => '重置密码在 %s', - 'PASSWORD_RESET_REQUEST' => '重置密码请点击链接:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s\n输入重置代码:\n%s\n\n如果您没有要求重置密码,请忽略此邮件\n\n--\nVesta 管理系统\n', + 'forgot password' => '忘记密码', + 'Confirm' => '确认', + 'New Password' => '新密码', + 'Confirm Password' => '确认密码', + 'Reset' => '重置', + 'Reset Code' => '重置代码', + 'RESET_NOTICE' => '', + 'RESET_CODE_SENT' => '密码重置代码已发送到您的邮箱
', + 'MAIL_RESET_SUBJECT' => '密码重置在 %s', + 'PASSWORD_RESET_REQUEST' => '重置密码请点击链接:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 输入密码重置代码:\n%s\n\n如果您没有要求重置密码,请忽略此邮件\n\n--\nVesta Control Panel\n', 'Jan' => '01月', 'Feb' => '02月', @@ -560,18 +555,17 @@ $LANG['cn'] = array( 'Configuring Server' => '配置服务器', 'Hostname' => '主机名称', - 'Time Zone' => '系统时区', + 'Time Zone' => '时区', 'Default Language' => '默认语言', 'Proxy Server' => '代理服务器', 'Web Server' => 'Web 服务器', - 'Backend Server' => '后端服务器', - 'Backend Pool Mode' => '后端池模式', + 'Backend Server' => 'Backend 服务器', + 'Backend Pool Mode' => 'Backend Pool 模式', 'DNS Server' => 'DNS 服务器', 'DNS Cluster' => 'DNS 集群', 'MAIL Server' => '邮箱服务器', - 'Antivirus' => '邮件防病毒', + 'Antivirus' => '防病毒引擎', 'AntiSpam' => '防垃圾邮件', - 'Use Web Domain SSL Certificate' => '采用网站域名SSL证书', 'Webmail URL' => '网页邮箱网址', 'MySQL Support' => 'MySQL 支持', 'phpMyAdmin URL' => '设置 phpMyAdmin 网址', @@ -586,22 +580,22 @@ $LANG['cn'] = array( 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', - 'FileSystem Disk Quota' => '磁盘配额', - 'Vesta Control Panel Plugins' => 'Vesta 插件', + 'FileSystem Disk Quota' => '文件系统磁盘配额', + 'Vesta Control Panel Plugins' => 'Vesta 管理系统的插件', 'preview' => '预览', 'Reseller Role' => '作为经销商', 'Web Config Editor' => '网络配置编辑器', 'Template Manager' => '模板管理', 'Backup Migration Manager' => '备份迁移管理', 'FileManager' => '文件管理', - 'show: CPU / MEM / NET / DISK' => '查看资源详细信息', + 'show: CPU / MEM / NET / DISK' => '查看: CPU / 内存 / 网络 / 磁盘', 'sort by' => '排序方式', 'Date' => '日期', 'Starred' => '星标', 'Name' => '名称', - 'save to favorites' => '添加星标', + 'save to favorites' => '收藏加星', 'File Manager' => '文件管理', 'size' => '大小', @@ -641,8 +635,8 @@ $LANG['cn'] = array( 'Create' => '创建', 'Compress' => '压缩', 'OK' => '确定', - 'YOU ARE COPYING' => '你正在复制', - 'YOU ARE REMOVING' => '你正在移除', + 'YOU ARE COPYING' => 'YOU ARE COPYING', + 'YOU ARE REMOVING' => 'YOU ARE REMOVING', 'Delete items' => '删除这些项目', 'Copy files' => '复制这些文件', 'Move files' => '移动这些文件', @@ -697,17 +691,17 @@ $LANG['cn'] = array( 'Switch to Left Tab' => '切换到左标签', 'Switch to Right Tab' => '切换到右标签', 'Switch Tab' => '切换标签', - 'Go to the Top of the File List' => '转到文件列表顶部', - 'Go to the Last File' => '转到最后一个文件', + 'Go to the Top of the File List' => '转至文件列表顶部', + 'Go to the Last File' => '转至最后一个文件', 'Open File / Enter Directory' => '打开文件 / 进入目录', 'Edit File' => '编辑文件', - 'Go to Parent Directory' => '转到父目录', + 'Go to Parent Directory' => '转至父目录', 'Select Current File' => '选中当前文件', 'Select Bunch of Files' => '选择多个文件', 'Add File to the Current Selection' => '将文件添加到当前选中区内', 'Select All Files' => '选择所有文件', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - '快捷键的灵感来自华丽的 GNU Midnight Commander 文件管理器', + '快捷键的灵感来自旖旎的 GNU Midnight Commander 文件管理器', 'Licence Key' => '许可密匙', 'Enter License Key' => '输入许可密匙', @@ -716,7 +710,7 @@ $LANG['cn'] = array( 'Disable and Cancel Licence' => '停用并取消许可', 'Licence Activated' => '许可已激活', 'Licence Deactivated' => '许可已停用', - 'Restrict users so that they cannot use SSH and access only their home directory.' => '限制用户,对他们禁用 SSH 且只能访问自己的主目录。', + 'Restrict users so that they cannot use SSH and access only their home directory.' => '限制用户,使他们通过 SSH 只能访问自己的主目录。', 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '功能全面的文件管理器,浏览,复制,编辑,查看和检索你的 Web 文件。', 'This is a commercial module, you would need to purchace license key to enable it.' => '这是商业模块,请购买许可密匙来启用它。', @@ -725,10 +719,10 @@ $LANG['cn'] = array( 'Run Command' => '运行指令于', 'every month' => '每个月', 'every odd month' => '每个奇数月', - 'every even month' => '每个偶数月', + 'every even month' => '每隔 2 月', 'every day' => '每日', 'every odd day' => '每个奇数日', - 'every even day' => '每个偶数日', + 'every even day' => '每隔 2 日', 'weekdays (5 days)' => '工作日 (5天)', 'weekend (2 days)' => '双休日 (2天)', 'Monday' => '周一 ', @@ -749,16 +743,16 @@ $LANG['cn'] = array( 'awstats' => 'AWStats', 'Vesta SSL' => 'Vesta SSL', - 'SUBJECT' => '使用者', + 'SUBJECT' => '颁发给', 'ALIASES' => '可选名称', - 'NOT_BEFORE' => '有效期自', - 'NOT_AFTER' => '有效期至', + 'NOT_BEFORE' => '有效期从', + 'NOT_AFTER' => '有效期到', 'SIGNATURE' => '签名算法', - 'PUB_KEY' => '密钥大小', + 'PUB_KEY' => '密钥位数', 'ISSUER' => '颁发者', 'Use server hostname' => '采用服务器主机名', - 'Use domain hostname' => '采用账户所在域名', + 'Use domain hostname' => '采用域名', 'Use STARTTLS' => '采用 STARTTLS 加密', 'Use SSL / TLS' => '采用 SSL / TLS 加密', 'No encryption' => '不加密', @@ -766,5 +760,5 @@ $LANG['cn'] = array( 'maximum characters length, including prefix' => '包含前缀最多 %s 个字符', - 'Email Credentials' => '电子邮件凭据', + 'Email Credentials' => '电子邮件证书', ); diff --git a/web/inc/i18n/cz.php b/web/inc/i18n/cz.php index 9237444e..f9f291bf 100644 --- a/web/inc/i18n/cz.php +++ b/web/inc/i18n/cz.php @@ -196,7 +196,6 @@ $LANG['cz'] = array( 'SSL Home Directory' => 'SSL home adresář', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy podpora', 'Proxy Extensions' => 'Proxy rozšíření', @@ -561,7 +560,6 @@ $LANG['cz'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/da.php b/web/inc/i18n/da.php index 92f1ee78..80e78a35 100644 --- a/web/inc/i18n/da.php +++ b/web/inc/i18n/da.php @@ -197,7 +197,6 @@ $LANG['da'] = array( 'SSL Home Directory' => 'SSL Home', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Support', 'Proxy Extensions' => 'Proxy Tilføjelser', @@ -562,7 +561,6 @@ $LANG['da'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/de.php b/web/inc/i18n/de.php index 2e6cf9f3..43fc857b 100644 --- a/web/inc/i18n/de.php +++ b/web/inc/i18n/de.php @@ -195,7 +195,6 @@ $LANG['de'] = array( 'SSL Home Directory' => 'SSL Homeverzeichnis', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Unterstützung', 'Proxy Extensions' => 'Proxy Erweiterungen', @@ -215,7 +214,7 @@ $LANG['de'] = array( 'Quota' => 'Kontingent', 'Autoreply' => 'Autoreply', 'Forward to' => 'Weiterleiten zu', - 'Do not store forwarded mail' => 'Weitergeleitete E-Mails nicht speichern', + 'Do not store forwarded mail' => 'Weiterleitungs Adresse nicht speichern', 'IMAP hostname' => 'IMAP hostname', 'IMAP port' => 'IMAP port', 'IMAP security' => 'IMAP security', @@ -560,7 +559,6 @@ $LANG['de'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/el.php b/web/inc/i18n/el.php index 66b6532a..7e193523 100644 --- a/web/inc/i18n/el.php +++ b/web/inc/i18n/el.php @@ -197,7 +197,6 @@ $LANG['el'] = array( 'SSL Home Directory' => 'Αρχικός Κατάλογος SSL', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Υποστήριξη Proxy', 'Proxy Extensions' => 'Πρόσθετα Proxy', @@ -562,7 +561,6 @@ $LANG['el'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index 09ae210f..ed5c1f2e 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -195,7 +195,6 @@ $LANG['en'] = array( 'SSL Home Directory' => 'SSL Home', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Support', 'Proxy Extensions' => 'Proxy Extensions', @@ -377,7 +376,6 @@ $LANG['en'] = array( 'ErrorLog' => 'ErrorLog', 'Download AccessLog' => 'Download AccessLog', 'Download ErrorLog' => 'Download ErrorLog', - 'Continent' => 'Continent', 'Country' => 'Country', '2 letter code' => '2 letter code', 'State / Province' => 'State / Province', @@ -561,7 +559,6 @@ $LANG['en'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/es.php b/web/inc/i18n/es.php index 3a8ae573..d9b9f5fb 100644 --- a/web/inc/i18n/es.php +++ b/web/inc/i18n/es.php @@ -8,7 +8,7 @@ * > huloza - https://github.com/huloza * > Estratos Consulting "estratos" - estratos.net * > Manuel Valle "Estilate" - estilate.com - * + * */ $LANG['es'] = array( @@ -21,7 +21,6 @@ $LANG['es'] = array( 'Services' => 'Servicios', 'Firewall' => 'Cortafuegos', 'Updates' => 'Actualizaciones', - 'Apps' => 'Aplicaciones', 'Log in' => 'Iniciar Sesión', 'Log out' => 'Salir', @@ -145,7 +144,7 @@ $LANG['es'] = array( 'Search Results' => 'Resultados de Busqueda', 'Adding Firewall Rule' => 'Añadiendo Regla al Cortafuegos', 'Editing Firewall Rule' => 'Editando Regla del Cortafuegos', - 'Adding IP Address to Banlist' => 'Agregando dirección IP a la lista negra', + 'Adding IP Address to Banlist' => 'Agregando direcciones IP a la lista negra', 'active' => 'activo', 'spnd' => 'suspendido', @@ -193,17 +192,16 @@ $LANG['es'] = array( 'Mail Accounts' => 'Cuentas de Correo', 'Cron Jobs' => 'Tareas Programadas', 'SSH Access' => 'Acceso SSH', - 'IP Address' => 'Dirección IP', - 'IP Addresses' => 'Direcciones IP', + 'IP Address' => 'IP Address', + 'IP Addresses' => 'Dirección IP', 'Backups' => 'Respaldos', 'Backup System' => 'Sistema de Respaldo', - 'backup exclusions' => 'configurar exclusiones', + 'backup exclusions' => 'respaldos excluídos', 'template' => 'plantilla', 'SSL Support' => 'Soportar SSL', 'SSL Home Directory' => 'Directorio local del SSL', 'Lets Encrypt Support' => 'Soportar Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Tu certificado será emitido automáticamente en 5 minutos', 'Proxy Support' => 'Soportar Proxy', 'Proxy Extensions' => 'Extensiones Proxy', @@ -249,8 +247,8 @@ $LANG['es'] = array( 'SYS' => 'SYS', 'Domains' => 'Dominios', 'Status' => 'Estado', - 'shared' => 'compartida', - 'dedicated' => 'dedicada', + 'shared' => 'compartido', + 'dedicated' => 'dedicado', 'Owner' => 'Dueño', 'Users' => 'Usuarios', 'Load Average' => 'Promedio de carga', @@ -289,18 +287,18 @@ $LANG['es'] = array( 'Object' => 'Objeto', 'Username' => 'Nombre de Usuario', 'Password' => 'Contraseña', - 'Email' => 'Correo electrónico', + 'Email' => 'Email', 'Package' => 'Plan', - 'Language' => 'Idioma', + 'Language' => 'Lenguaje', 'First Name' => 'Nombre', 'Last Name' => 'Apellido', 'Send login credentials to email address' => 'Correo para enviar datos de acceso al panel', - 'Default Template' => 'Plantilla Predeterminada', - 'Default Name Servers' => 'Servidor de Nombre Predeterminado', + 'Default Template' => 'Plantilla por Defecto', + 'Default Name Servers' => 'Servidor de Nombre por Defecto', 'Domain' => 'Dominio', 'DNS Support' => 'Soportar DNS', 'Mail Support' => 'Soportar Correo', - 'Advanced options' => 'Opciones avanzadas', + 'Advanced options' => 'Opciones Avanzadas', 'Basic options' => 'Opciones básicas', 'Aliases' => 'Alias', 'SSL Certificate' => 'Certificado SSL', @@ -333,7 +331,7 @@ $LANG['es'] = array( 'Package Name' => 'Nombre del Plan', 'Netmask' => 'Máscara de Red', 'Interface' => 'Interfaz', - 'Shared' => 'Compartida', + 'Shared' => 'Compartido', 'Assigned user' => 'Usuario asignado', 'Assigned domain' => 'Dominio asignado', 'NAT IP association' => 'Asociación NAT IP', @@ -396,7 +394,7 @@ $LANG['es'] = array( 'Comment' => 'Comentario', 'Banlist' => 'Lista Negra', 'ranges are acceptable' => 'rangos son aceptables', - 'CIDR format is supported' => 'se admite formato CIDR', + 'CIDR format is supported' => 'Se admite formato CIDR', 'ACCEPT' => 'ACEPTAR', 'DROP' => 'DENEGAR', 'TCP' => 'TCP', @@ -456,7 +454,7 @@ $LANG['es'] = array( 'MAIL_DOMAIN_CREATED_OK' => 'El Dominio de Correo %s ha sido creado exitosamente.', 'MAIL_ACCOUNT_CREATED_OK' => 'La Cuenta de Correo %s@%s ha sido creada exitosamente.', 'DATABASE_CREATED_OK' => 'La Base de Datos %s ha sido creada exitosamente.', - 'CRON_CREATED_OK' => 'La Tarea Programada ha sido creada exitosamente.', + 'CRON_CREATED_OK' => 'Una Tarea Programada ha sido creada exitosamente.', 'IP_CREATED_OK' => 'La Dirección IP %s ha sido creada exitosamente.', 'PACKAGE_CREATED_OK' => 'El Plan %s ha sido creado exitosamente.', 'SSL_GENERATED_OK' => 'El certificado SSl ha sido creado exitosamente.', @@ -468,33 +466,33 @@ $LANG['es'] = array( 'Cronjob email reporting has been successfully disabled' => 'Se han desactivado exitosamente las notificaciones por correo de las Tareas Programadas.', 'Changes has been saved.' => 'Los cambios han sido guardados exitosamente.', 'Confirmation' => 'Confirmación', - 'DELETE_USER_CONFIRMATION' => '¿Está seguro de que desea eliminar el usuario %s?', - 'SUSPEND_USER_CONFIRMATION' => '¿Está seguro de que desea suspender el usuario %s?', - 'UNSUSPEND_USER_CONFIRMATION' => '¿Está seguro de que desea habilitar el usuario %s?', - 'DELETE_DOMAIN_CONFIRMATION' => '¿Está seguro de que desea eliminar el dominio %s?', - 'SUSPEND_DOMAIN_CONFIRMATION' => '¿Está seguro de que desea suspender el dominio %s?', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => '¿Está seguro de que desea habilitar el dominio %s?', - 'DELETE_RECORD_CONFIRMATION' => '¿Está seguro de que desea eliminar el registro %s?', - 'SUSPEND_RECORD_CONFIRMATION' => '¿Está seguro de que desea suspender el registro %s?', - 'UNSUSPEND_RECORD_CONFIRMATION' => '¿Está seguro de que desea habilitar el registro %s?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro de que desea eliminar la cuenta de correo %s?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro de que desea suspender la cuenta de correo %s?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro de que desea habilitar la cuenta de correo %s?', - 'DELETE_DATABASE_CONFIRMATION' => '¿Está seguro de que desea eliminar la base de datos %s?', - 'SUSPEND_DATABASE_CONFIRMATION' => '¿Está seguro de que desea suspender la base de datos %s?', - 'UNSUSPEND_DATABASE_CONFIRMATION' => '¿Está seguro de que desea habilitar la base de datos %s?', - 'DELETE_CRON_CONFIRMATION' => '¿Está seguro de que desea eliminar la tarea programada %s?', - 'SUSPEND_CRON_CONFIRMATION' => '¿Está seguro de que desea suspender la tarea programada %s?', - 'UNSUSPEND_CRON_CONFIRMATION' => '¿Está seguro de que desea habilitar la tarea programada %s?', - 'DELETE_BACKUP_CONFIRMATION' => '¿Está seguro de que desea eliminar el resplado %s?', - 'DELETE_EXCLUSION_CONFIRMATION' => '¿Está seguro de que desea eliminar la exclusión %s?', - 'DELETE_PACKAGE_CONFIRMATION' => '¿Está seguro de que desea eliminar el plan %s?', - 'DELETE_IP_CONFIRMATION' => '¿Está seguro de que desea eliminar la dirección IP %s?', - 'DELETE_RULE_CONFIRMATION' => '¿Está seguro de que desea eliminar la regla #%s', - 'SUSPEND_RULE_CONFIRMATION' => '¿Está seguro de que desea suspender la regla #%s?', - 'UNSUSPEND_RULE_CONFIRMATION' => '¿Está seguro de que desea habilitar la regla #%s?', + 'DELETE_USER_CONFIRMATION' => '¿Está seguro que desea eliminar el usuario %s?', + 'SUSPEND_USER_CONFIRMATION' => '¿Está seguro que desea suspender el usuario %s?', + 'UNSUSPEND_USER_CONFIRMATION' => '¿Está seguro que desea habilitar el usuario %s?', + 'DELETE_DOMAIN_CONFIRMATION' => '¿Está seguro que desea eliminar el dominio %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => '¿Está seguro que desea suspender el dominio %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => '¿Está seguro que desea habilitar el dominio %s?', + 'DELETE_RECORD_CONFIRMATION' => '¿Está seguro que desea eliminar el registro %s?', + 'SUSPEND_RECORD_CONFIRMATION' => '¿Está seguro que desea suspender el registro %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => '¿Está seguro que desea habilitar el registro %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro que desea eliminar la cuenta de correo %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro que desea suspender la cuenta de correo %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '¿Está seguro que desea habilitar la cuenta de correo %s?', + 'DELETE_DATABASE_CONFIRMATION' => '¿Está seguro que desea eliminar la base de datos %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => '¿Está seguro que desea suspender la base de datos %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => '¿Está seguro que desea habilitar la base de datos %s?', + 'DELETE_CRON_CONFIRMATION' => '¿Está seguro que desea eliminar la tarea programada %s?', + 'SUSPEND_CRON_CONFIRMATION' => '¿Está seguro que desea suspender la tarea programada %s?', + 'UNSUSPEND_CRON_CONFIRMATION' => '¿Está seguro que desea habilitar la tarea programada %s?', + 'DELETE_BACKUP_CONFIRMATION' => '¿Está seguro que desea eliminar el resplado %s?', + 'DELETE_EXCLUSION_CONFIRMATION' => '¿Está seguro que desea eliminar la exclusión %s?', + 'DELETE_PACKAGE_CONFIRMATION' => '¿Está seguro que desea eliminar el plan %s?', + 'DELETE_IP_CONFIRMATION' => '¿Está seguro que desea eliminar la dirección IP %s?', + 'DELETE_RULE_CONFIRMATION' => '¿Está seguro que desea eliminar la regla #%s', + 'SUSPEND_RULE_CONFIRMATION' => '¿Está seguro que desea suspender la regla #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => '¿Está seguro que desea habilitar la regla #%s?', 'LEAVE_PAGE_CONFIRMATION' => '¿Está seguro de que quiere abandonar esta página?', - 'RESTART_CONFIRMATION' => '¿Está seguro de que desea reiniciar %s?', + 'RESTART_CONFIRMATION' => '¿Está seguro que desea reiniciar %s?', 'Welcome' => 'Bienvenido', 'LOGGED_IN_AS' => 'Has iniciado sesión exitosamente con el usuario %s.', 'Error' => 'Error', @@ -507,10 +505,10 @@ $LANG['es'] = array( 'Error code:' => 'Código de Error: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" ha fallado', 'IP address is in use' => 'La Dirección IP está en uso.', - 'BACKUP_SCHEDULED' => 'La tarea se ha añadido a la cola. Recibirá un correo de notificación cuando el respaldo esté listo para su descarga.', - 'BACKUP_EXISTS' => 'Se está realizando un respaldo en este momento. Por favor espere a que este termine.', + 'BACKUP_SCHEDULED' => 'La tarea se ha añadido a la cola. Recibirá un correo de notificación cuando el respaldo esté listo para su descarga.', + 'BACKUP_EXISTS' => 'Se está realizando un respaldo en este momento. Por favor espere a que éste termine.', 'RESTORE_SCHEDULED' => 'La tarea se ha añadido a la cola. Recibirá un correo de notificación cuando la restauración haya terminado.', - 'RESTORE_EXISTS' => 'Se está realizando una restauración en este momento. Por favor espere a que esta termine.', + 'RESTORE_EXISTS' => 'Se está realizando una restauración en este momento. Por favor espere a que ésta termine.', 'WEB_EXCLUSIONS' => 'Ingrese el nombre de dominio, uno por línea. Para excluir a todos utilice *. Para excluir directorios específicos utilice el siguiente formato: dominio.com:public_html/cache:public_html/tmp', 'DNS_EXCLUSIONS' => 'Ingrese el nombre de dominio, uno por línea. Para excluir a todos utilice *', @@ -558,7 +556,7 @@ $LANG['es'] = array( 'Configuring Server' => 'Configurar Servidor', 'Hostname' => 'Nombre del Servidor', 'Time Zone' => 'Zona Horaria', - 'Default Language' => 'Idioma Predeterminado', + 'Default Language' => 'Idioma por Defecto', 'Proxy Server' => 'Servidor Proxy', 'Web Server' => 'Servidor Web', 'Backend Server' => 'Backend Server', @@ -568,7 +566,6 @@ $LANG['es'] = array( 'MAIL Server' => 'Servidor de Correo', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Utilizar el certificado SSL de un dominio', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'Soportar MYSQL', 'phpMyAdmin URL' => 'phpMyAdmin URL', @@ -617,7 +614,7 @@ $LANG['es'] = array( 'EXTRACT' => 'EXTRAER', 'DOWNLOAD' => 'DESCARGAR', 'Are you sure?' => '¿Estás seguro?', - 'Hit' => 'Pulsa', + 'Hit' => 'Hit', 'to reload the page' => 'para recargar la página', 'Directory name cannot be empty' => 'El nombre del directorio no puede estar vacío', 'File name cannot be empty' => 'El nombre del archivo no puede estar vacío', @@ -640,12 +637,12 @@ $LANG['es'] = array( 'OK' => 'OK', 'YOU ARE COPYING' => 'ESTÁS COPIANDO', 'YOU ARE REMOVING' => 'ESTÁS ELIMINANDO', - 'Delete items' => 'Eliminar elementos', + 'Delete items' => 'Eliminando items', 'Copy files' => 'Copiar archivos', 'Move files' => 'Mover archivos', - 'Are you sure you want to copy' => 'Estás seguro de que deseas copiar', - 'Are you sure you want to move' => 'Estás seguro de que deseas mover', - 'Are you sure you want to delete' => 'Estás seguro de que deseas eliminar', + 'Are you sure you want to copy' => 'Estás seguro que deseas copiar', + 'Are you sure you want to move' => 'Estás seguro que deseas mover', + 'Are you sure you want to delete' => 'Estás seguro que deseas eliminar', 'into' => 'en', 'existing files will be replaced' => 'los archivos existentes serán reemplazados', 'Original name' => 'Nombre original', @@ -667,13 +664,13 @@ $LANG['es'] = array( 'Add New object' => 'Añadir Objeto Nuevo', 'Save Form' => 'Guardar Formulario', 'Cancel saving form' => 'Omitir guardar el formulario', - 'Go to USER list' => 'Ir a USUARIOS', + 'Go to USER list' => 'Ir a USUARIOS', // En mi opinión queda mejor "Ir a" que "Ir a Listado o Catalogo" 'Go to WEB list' => 'Ir a DOMINIOS / WEB', 'Go to DNS list' => 'Ir a DNS', 'Go to MAIL list' => 'Ir a CORREOS', 'Go to DB list' => 'Ir a BASES DE DATOS', - 'Go to CRON list' => 'Ir a TAREAS PROGRAMADAS', - 'Go to BACKUP list' => 'Ir a RESPALDOS', + 'Go to CRON list' => 'IR a TAREAS PROGRAMADAS', + 'Go to BACKUP list' => 'IR a RESPALDOS', 'Focus on search' => 'Desplegar Buscador', 'Display/Close shortcuts' => 'Mostrar/Ocultar atajos', 'Move backward through top menu' => 'Desplazarse hacia atrás en el menú superior', @@ -713,7 +710,7 @@ $LANG['es'] = array( 'Disable and Cancel Licence' => 'Deshabilitar y Cancelar Licencia', 'Licence Activated' => 'Licencia Activada', 'Licence Deactivated' => 'Licencia Desactivada', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restringe a los usuarios para que sólo puedan ingresar a su directorio local y prohíbe el acceso a SSH.', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restringue a los usuarios para que sólo puedan ingresar a su directorio local y prohíbe el acceso a SSH.', 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Navegar, copiar, editar, ver y descargar todos los archivos de tu página web utilizando el Administrador de Archivos.', 'This is a commercial module, you would need to purchace license key to enable it.' => 'Este es un módulo comercial, tendrás que adquirir una licencia para poder activarlo.', @@ -754,8 +751,8 @@ $LANG['es'] = array( 'PUB_KEY' => 'CLAVE PÚBLICA', 'ISSUER' => 'EMITIDO POR', - 'Use server hostname' => 'Usar el nombre del servidor', - 'Use domain hostname' => 'Usar el dominio', + 'Use server hostname' => 'Usar hostname del servidor', + 'Use domain hostname' => 'Usar hostname del dominio', 'Use STARTTLS' => 'Usar STARTTLS', 'Use SSL / TLS' => 'Usar SSL / TLS', 'No encryption' => 'Sin encriptación', @@ -763,6 +760,5 @@ $LANG['es'] = array( 'maximum characters length, including prefix' => 'usar un máximo de %s caracteres, incluyendo prefijo', - 'Email Credentials' => 'Datos de acceso a la cuenta de correo', - + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/fa.php b/web/inc/i18n/fa.php index 1778b5b8..926673cc 100644 --- a/web/inc/i18n/fa.php +++ b/web/inc/i18n/fa.php @@ -88,7 +88,6 @@ $LANG['fa'] = array( 'list records' => 'فهرست پیشینه های %s', 'add record' => 'افزودن پیشینه', 'list accounts' => 'فهرست حسابهای %s', - 'Apps' => 'برنامه ها', 'add account' => 'افزودن حساب', 'open webmail' => 'بازکردن وب میل', 'list fail2ban' => 'فهرست fail2ban', @@ -190,7 +189,6 @@ $LANG['fa'] = array( 'SSL Home Directory' => 'پوشه خانه SSL', 'Lets Encrypt Support' => 'پشتیبانی از Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'گواهینامه شما به صورت خودکار در طی 5 دقیقه صادر خواهد شد', 'Proxy Support' => 'پشتیبانی پراکسی', 'Proxy Extensions' => 'فرمت های پراکسی', @@ -544,7 +542,6 @@ $LANG['fa'] = array( 'MAIL Server' => 'سرور پستی', 'Antivirus' => 'ضد ویروس', 'AntiSpam' => 'ضد هرزنامه', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'نشانی وب میل', 'MySQL Support' => 'پشتیبانی MySQL', 'phpMyAdmin URL' => 'نشانی phpMyAdmin', diff --git a/web/inc/i18n/fi.php b/web/inc/i18n/fi.php index 8b7d33e2..aff1375b 100644 --- a/web/inc/i18n/fi.php +++ b/web/inc/i18n/fi.php @@ -2,7 +2,7 @@ /** * Vesta Finnish language file * OHakala (onni@koodimonni.fi) -* RJuho (juho.rasanen@setuppi.fi) +* RJuho (juho.rasanen@kotikone.fi) * theel0ja (theel0ja@theel0ja.info) */ @@ -40,9 +40,9 @@ $LANG['fi'] = array( 'MEMORY' => 'MUISTI', 'DISK' => 'LEVY', 'NETWORK' => 'VERKKO', - 'Web Log Manager' => 'Verkkolokimanageri', + 'Web Log Manager' => 'Web Log Manager', - 'no notifications' => 'ei ilmoituksia', + 'no notifications' => 'no notifications', 'Add User' => 'Lisää käyttäjä', 'Add Domain' => 'Lisää domaini', @@ -111,7 +111,7 @@ $LANG['fi'] = array( 'disable autoupdate' => 'älä päivitä automaattisesti', 'turn on notifications' => 'päälle ilmoitus', 'turn off notifications' => 'sammuta ilmoitus', - 'configure' => 'määritä', + 'configure' => 'configure', 'Adding User' => 'Lisätään käyttäjää', 'Editing User' => 'Muokataan käyttäjää', @@ -195,15 +195,14 @@ $LANG['fi'] = array( 'template' => 'pohjat', 'SSL Support' => 'SSL-tuki', 'SSL Home Directory' => 'SSL-kotihakemisto', - 'Lets Encrypt Support' => 'Lets Encrypt Tuki', + 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => 'Sertifikaattisi käsitellään viiden minuutin sisään', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy-tuki', 'Proxy Extensions' => 'Proxy-laajennukset', 'Web Statistics' => 'Web-tilastot', 'Additional FTP Account' => 'Ylimääräinen FTP-tili', - 'Path' => 'Polku', + 'Path' => 'Path', 'SOA' => 'SOA', 'TTL' => 'TTL', 'Expire' => 'Päättyy', @@ -218,19 +217,19 @@ $LANG['fi'] = array( 'Autoreply' => 'Automaattinen vastaus', 'Forward to' => 'Uudelleenohjaa', 'Do not store forwarded mail' => 'Älä säilytä uudelleenohjattuja viestejä', - 'IMAP hostname' => 'IMAP osoite', - 'IMAP port' => 'IMAP portti', - 'IMAP security' => 'IMAP turvallisuus', - 'IMAP auth method' => 'IMAP auth-menetelmä', - 'SMTP hostname' => 'SMTP osoite', - 'SMTP port' => 'SMTP portti', - 'SMTP security' => 'SMTP turvallisuus', - 'SMTP auth method' => 'SMTP auth-menetelmä', + 'IMAP hostname' => 'IMAP hostname', + 'IMAP port' => 'IMAP port', + 'IMAP security' => 'IMAP security', + 'IMAP auth method' => 'IMAP auth method', + 'SMTP hostname' => 'SMTP-hostname', + 'SMTP port' => 'SMTP-portti', + 'SMTP security' => 'SMTP-turvallisuus', + 'SMTP auth method' => 'SMTP auth method', 'STARTTLS' => 'STARTTLS', 'Normal password' => 'Normaali salasana', 'database' => 'tietokanta', 'User' => 'Käyttäjä', - 'Host' => 'Isäntä', + 'Host' => 'Host', 'Charset' => 'Merkistö', 'Min' => 'Min', 'Hour' => 'Tunti', @@ -244,7 +243,7 @@ $LANG['fi'] = array( 'Domains' => 'Domainit', 'Status' => 'Tila', 'shared' => 'jaetut', - 'dedicated' => 'omistautunut', + 'dedicated' => 'dedicated', 'Owner' => 'Omistaja', 'Users' => 'Käyttäjät', 'Load Average' => 'Keskimääräinen Käyttöaste', @@ -269,8 +268,8 @@ $LANG['fi'] = array( 'database server' => 'tietokantapalvelin', 'ftp server' => 'ftp-palvelin', 'job scheduler' => 'ajastettu työ', //no-idea E: @theel0ja: ajastettu työ would be good. - 'firewall' => 'palomuuri', - 'brute-force monitor' => 'raaka voima monitori', + 'firewall' => 'firewall', + 'brute-force monitor' => 'brute-force monitor', 'CPU' => 'Prosessori', 'Memory' => 'Muisti', 'Uptime' => 'Käyttöaika', @@ -283,7 +282,7 @@ $LANG['fi'] = array( 'Object' => 'Objekti', 'Username' => 'Käyttäjä', 'Password' => 'Salasana', - 'Email' => 'Sähköposti', + 'Email' => 'Email', 'Package' => 'Paketti', 'Language' => 'Kieli', 'First Name' => 'Etunimi', @@ -291,15 +290,15 @@ $LANG['fi'] = array( 'Send login credentials to email address' => 'Lähetä kirjautumistiedot sähköpostilla.', 'Default Template' => 'Oletuspohja', 'Default Name Servers' => 'Oletusnimipalvelimet', - 'Domain' => 'Domaini', + 'Domain' => 'Domain', 'DNS Support' => 'Tarvitsee DNS:n', 'Mail Support' => 'Tarvitsee sähköpostin', 'Advanced options' => 'Lisäasetukset', - 'Basic options' => 'Perusasetukset', + 'Basic options' => 'Basic options', 'Aliases' => 'Aliakset', 'SSL Certificate' => 'SSL-sertifikaatti', 'SSL Key' => 'SSL-avain', - 'SSL Certificate Authority / Intermediate' => 'SSL varmenteen tarjoaja', //no-idea + 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', //no-idea 'SSL CSR' => 'SSL CSR', 'optional' => 'valinnainen', 'internal' => 'sisäinen', @@ -312,12 +311,12 @@ $LANG['fi'] = array( 'YYYY-MM-DD' => 'YYYY-MM-DD', 'Name servers' => 'Nimipalvelimet', 'Record' => 'Tietue', - 'IP or Value' => 'IP tai Arvo', //no-idea + 'IP or Value' => 'IP or Value', //no-idea 'Priority' => 'Prioriteetti', 'Record Number' => 'Tietueen numero', 'in megabytes' => 'megatavuissa', 'Message' => 'Viesti', - 'use local-part' => 'käytä paikallista osaa', //no-idea + 'use local-part' => 'use local-part', //no-idea 'one or more email addresses' => 'yksi tai useampia sähköposteja', 'Prefix will be automaticaly added to database name and database user' => 'Etuliite %s lisätään automaattisesti tietokannan nimeen ja käyttäjään', 'Database' => 'Tietokanta', @@ -325,12 +324,12 @@ $LANG['fi'] = array( 'Minute' => 'Minuutti', 'Command' => 'Käsky', 'Package Name' => 'Paketin nimi', - 'Netmask' => 'Verkkopeite', //no-idea - 'Interface' => 'Käyttöliittymä', //no-idea + 'Netmask' => 'Netmask', //no-idea + 'Interface' => 'Interface', //no-idea 'Shared' => 'Jaettu', 'Assigned user' => 'Määritetty käyttäjä', 'Assigned domain' => 'Määritetty domain', - 'NAT IP association' => 'NAT IP yhteys', //no-idea + 'NAT IP association' => 'NAT IP association', //no-idea 'shell' => 'shell', 'web domains' => 'web-domainit', 'web aliases' => 'web-aliakset', @@ -352,12 +351,12 @@ $LANG['fi'] = array( 'username' => 'käyttäjänimi', 'password' => 'salasana', 'type' => 'tyyppi', - 'charset' => 'merkistö', + 'charset' => 'charset', 'domain' => 'domain', 'ip' => 'ip', 'ip address' => 'ip-osoite', 'IP address' => 'IP-osoite', - 'netmask' => 'verkkopeite', + 'netmask' => 'netmask', 'interface' => 'yhdyskäytävä', 'assigned user' => 'omistaja', 'ns1' => 'ns1', @@ -386,35 +385,35 @@ $LANG['fi'] = array( 'Organization' => 'Organisaatio', 'Action' => 'Toiminta', 'Protocol' => 'Protokolla', - 'Port' => 'Portti', + 'Port' => 'Port', 'Comment' => 'Kommentti', 'Banlist' => 'Bannilista', 'ranges are acceptable' => 'vaihteluvälit ovat hyväksyttäviä', 'CIDR format is supported' => 'CIDR muotoa tuetaan', - 'ACCEPT' => 'HYVÄKSY', - 'DROP' => 'TIPUTA', + 'ACCEPT' => 'ACCEPT', + 'DROP' => 'DROP', 'TCP' => 'TCP', 'UDP' => 'UDP', 'ICMP' => 'ICMP', 'SSH' => 'SSH', 'FTP' => 'FTP', 'VESTA' => 'VESTA', - 'Add one more Name Server' => 'Lisää vielä yksi nimipalvelin', + 'Add one more Name Server' => 'Add one more Name Server', - 'web domain' => 'web domaini', - 'dns domain' => 'dns domaini', - 'dns record' => 'dns tietue', - 'mail domain' => 'mail domaini', - 'mail account' => 'mail tili', - 'cron job' => 'cron-tehtävä', + 'web domain' => 'web domain', + 'dns domain' => 'dns domain', + 'dns record' => 'dns record', + 'mail domain' => 'mail domain', + 'mail account' => 'mail account', + 'cron job' => 'cron job', 'cron' => 'cron', - 'user dir' => 'käyttäjän hakemisto', + 'user dir' => 'user dir', - 'unlimited' => 'rajoittamaton', + 'unlimited' => 'unlimited', '1 account' => '1 tili', '%s accounts' => '%s tiliä', - '1 domain' => '1 domaini', + '1 domain' => '1 domain', '%s domains' => '%s domainia', '1 record' => '1 tietue', '%s records' => '%s tietuetta', @@ -424,10 +423,10 @@ $LANG['fi'] = array( '%s databases' => '%s tietokantaa', '1 cron job' => '1 cron-tehtävä', '%s cron jobs' => '%s cron-tehtävää', - '1 archive' => '1 arkisto', - '%s archives' => '%s arkistoa', - '1 item' => '1 kohde', - '%s items' => '%s kohdetta', + '1 archive' => '1 archive', + '%s archives' => '%s archives', + '1 item' => '1 item', + '%s items' => '%s items', '1 package' => '1 paketti', '%s packages' => '%s pakettia', '1 IP address' => '1 IP-osoite', @@ -455,11 +454,11 @@ $LANG['fi'] = array( 'PACKAGE_CREATED_OK' => 'Paketti %s lisättiin onnistuneesti.', 'SSL_GENERATED_OK' => 'Sertifikaatti lisättiin onnistuneesti.', 'RULE_CREATED_OK' => 'Sääntö lisättiin onnistuneesti.', - 'BANLIST_CREATED_OK' => 'IP-osoite on bannattu onnistuneesti', + 'BANLIST_CREATED_OK' => 'IP address has been banned successfully', 'Autoupdate has been successfully enabled' => 'Automaattinen päivitys otettu käyttöön', 'Autoupdate has been successfully disabled' => 'Automaattinen päivitys poistettu käytöstä', - 'Cronjob email reporting has been successfully enabled' => 'Ajoitettu sähköposti raportointi onnistuneesti aktivoitu', - 'Cronjob email reporting has been successfully disabled' => 'Ajoitettu sähköposti raportointi onnistuneesti poistettu käytöstä', + 'Cronjob email reporting has been successfully enabled' => 'Cronjob sähköposti raportointi on onnistuneesti mahdollistanut', + 'Cronjob email reporting has been successfully disabled' => 'Cronjob sähköposti raportointi on onnistuneesti poistettu', 'Changes has been saved.' => 'Muutokset tallennettu.', 'Confirmation' => 'Hyväksyntä', 'DELETE_USER_CONFIRMATION' => 'Haluatko varmasti poistaa käyttäjän %s?', @@ -531,7 +530,7 @@ $LANG['fi'] = array( 'Confirm Password' => 'Hyväksy salasana', 'Reset' => 'Nollaa', 'Reset Code' => 'Nollauskoodi', - 'RESET_NOTICE' => '', + 'RESET_NOTICE' => '', // should we add something here? 'RESET_CODE_SENT' => 'Salasanan nollauskoodi on lähetetty sähköpostiisi
', 'MAIL_RESET_SUBJECT' => 'Salana vaihdettiin %s', 'PASSWORD_RESET_REQUEST' => "Nollataksesi hallintapaneelin salasanan, seuraa tätä linkkiä:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nVaihtoehtoisesti voit mennä https://%s/reset/?action=code&user=%s ja syöttää nollauskoodin:\n%s\n\nJos et varta vasten pyytänyt tätä salasananvaihtoa, mene paniikkiin ja ota yhteyttä ylläpitoon.\n\n--\nVesta-hallintapaneeli\n", @@ -550,55 +549,54 @@ $LANG['fi'] = array( 'Dec' => 'Jou', 'Configuring Server' => 'Konfiguroidaan palvelinta', - 'Hostname' => 'Osoite', + 'Hostname' => 'Hostname', 'Time Zone' => 'Aikavyöhyke', 'Default Language' => 'Oletuskieli', 'Proxy Server' => 'Välityspalvelin', 'Web Server' => 'Web Server', - 'Backend Server' => 'Taustapalvelin', - 'Backend Pool Mode' => 'Taustapalvelin Allas Tila', + 'Backend Server' => 'Backend Server', + 'Backend Pool Mode' => 'Backend Pool Mode', 'DNS Server' => 'DNS-palvelin', 'DNS Cluster' => 'DNS-klusteri', 'MAIL Server' => 'MAIL-palvelin', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmailin URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', - 'PostgreSQL Support' => 'PostgreSQL Tuki', + 'PostgreSQL Support' => 'PostgreSQL Support', 'phpPgAdmin URL' => 'phpPgAdmin URL', 'Maximum Number Of Databases' => 'Maksimimäärä tietokantoja', - 'Current Number Of Databases' => 'Nykyisten tietokantojen lukumäärä', + 'Current Number Of Databases' => 'Current Number Of Databases', 'Local backup' => 'Paikallinen varmuuskopio', - 'Compression level' => 'Pakkausaste', + 'Compression level' => 'Compression level', 'Directory' => 'Hakemisto', - 'Remote backup' => 'Etävarmuuskopiointi', + 'Remote backup' => 'Remote backup', 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', - 'FileSystem Disk Quota' => 'FileSystem Levykiintiö', - 'Vesta Control Panel Plugins' => 'Vesta Hallintapaneeli Lisäosat', - 'preview' => 'esikatselu', - 'Reseller Role' => 'Jälleenmyyjän Rooli', - 'Web Config Editor' => 'Web-määrityseditori', - 'Template Manager' => 'Pohja Hallinta', - 'Backup Migration Manager' => 'Varmuuskopion Siirtymänhallinta', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', + 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', + 'preview' => 'preview', + 'Reseller Role' => 'Reseller Role', + 'Web Config Editor' => 'Web Config Editor', + 'Template Manager' => 'Template Manager', + 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'näytä: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', - 'sort by' => 'järjestä', + 'sort by' => 'sort by', 'Date' => 'Päivämäärä', - 'Starred' => 'Tähditetty', + 'Starred' => 'Starred', 'Name' => 'Nimi', - 'save to favorites' => 'tallenna suosikkeihin', + 'save to favorites' => 'save to favorites', 'File Manager' => 'Tiedostonhallinta', 'size' => 'koko', 'date' => 'päivämäärä', 'name' => 'nimi', - 'Initializing' => 'Alustetaan', + 'Initializing' => 'Initializing', 'UPLOAD' => 'LÄHETÄ', 'NEW FILE' => 'UUSI TIEDOSTO', 'NEW DIR' => 'UUSI HAKEMISTO', @@ -611,117 +609,117 @@ $LANG['fi'] = array( 'EXTRACT' => 'PURA', 'DOWNLOAD' => 'LATAA', 'Are you sure?' => 'Oletko varma?', // unused? - 'Hit' => 'Osuma', - 'to reload the page' => 'ladataksesi sivu uudelleen', - 'Directory name cannot be empty' => 'Hakemiston nimi ei voi olla tyhjä', - 'File name cannot be empty' => 'Tiedostonimi ei voi olla tyhjä', - 'No file selected' => 'Ei tiedostoa valittuna', - 'No file or folder selected' => 'Ei tiedostoa tai kansiota valittuna', - 'File type not supported' => 'Tiedostotyyppiä ei tueta', - 'Directory download not available in current version' => 'Hakemiston lataus ei ole saatavilla nykyisessä versiossa', - 'Directory not available' => 'Hakemisto ei ole käytettävissä', - 'Done' => 'Tehty', + 'Hit' => 'Hit', + 'to reload the page' => 'to reload the page', + 'Directory name cannot be empty' => 'Directory name cannot be empty', + 'File name cannot be empty' => 'File name cannot be empty', + 'No file selected' => 'No file selected', + 'No file or folder selected' => 'No file or folder selected', + 'File type not supported' => 'File type not supported', + 'Directory download not available in current version' => 'Directory download not available in current version', + 'Directory not available' => 'Directory not available', + 'Done' => 'Done', 'Close' => 'Sulje', 'Copy' => 'Kopioi', 'Cancel' => 'Peru', 'Rename' => 'Uudelleennimeä', 'Move' => 'Siirrä', - 'Change Rights' => 'Muuta Oikeuksia', + 'Change Rights' => 'Change Rights', 'Delete' => 'Poista', 'Extract' => 'Pura', 'Create' => 'Luo', 'Compress' => 'Pakkaa', 'OK' => 'OK', - 'YOU ARE COPYING' => 'OLET KOPIOIMASSA', // unused? - 'YOU ARE REMOVING' => 'OLET POISTAMASSA', - 'Delete items' => 'Poista kohteet', + 'YOU ARE COPYING' => 'YOU ARE COPYING', // unused? + 'YOU ARE REMOVING' => 'YOU ARE REMOVING', + 'Delete items' => 'Delete items', 'Copy files' => 'Kopioi tiedostoja', 'Move files' => 'Siirrä tiedostoja', - 'Are you sure you want to copy' => 'Haluatko varmasti kopioida', - 'Are you sure you want to move' => 'Haluatko varmasti siirtää', - 'Are you sure you want to delete' => 'Haluatko varmasti poistaa', - 'into' => 'osaksi', - 'existing files will be replaced' => 'olemassa olevat tiedostot korvataan', - 'Original name' => 'Alkuperäinen nimi', + 'Are you sure you want to copy' => 'Are you sure you want to copy', + 'Are you sure you want to move' => 'Are you sure you want to move', + 'Are you sure you want to delete' => 'Are you sure you want to delete', + 'into' => 'into', + 'existing files will be replaced' => 'existing files will be replaced', + 'Original name' => 'Original name', 'File' => 'Tiedosto', 'already exists' => 'on jo olemassa', 'Create file' => 'Luo tiedosto', 'Create directory' => 'Luo hakemisto', - 'read by owner' => 'read by owner', // no idea - 'write by owner' => 'write by owner', // no idea - 'execute/search by owner' => 'execute/search by owner', // no idea - 'read by group' => 'read by group',// no idea - 'write by group' => 'write by group', // no idea - 'execute/search by group' => 'execute/search by group', // no idea - 'read by others' => 'read by others', // no idea - 'write by others' => 'write by others', // no idea - 'execute/search by others' => 'execute/search by others', // no idea + 'read by owner' => 'read by owner', + 'write by owner' => 'write by owner', + 'execute/search by owner' => 'execute/search by owner', + 'read by group' => 'read by group', + 'write by group' => 'write by group', + 'execute/search by group' => 'execute/search by group', + 'read by others' => 'read by others', + 'write by others' => 'write by others', + 'execute/search by others' => 'execute/search by others', - 'Shortcuts' => 'Pikavalinnat', - 'Add New object' => 'Lisää uusi objekti', - 'Save Form' => 'Tallenna Lomake', - 'Cancel saving form' => 'Peruuta tallennuslomake', - 'Go to USER list' => 'Mene USER listaan', - 'Go to WEB list' => 'Mene WEB listaan', - 'Go to DNS list' => 'Mene DNS listaan', - 'Go to MAIL list' => 'Mene MAIL listaan', - 'Go to DB list' => 'Mene DB listaan', - 'Go to CRON list' => 'Mene CRON listaan', - 'Go to BACKUP list' => 'Mene BACKUP listaan', - 'Focus on search' => 'Keskity hakuun', - 'Display/Close shortcuts' => 'Näytä/Piilota pikavalinnat', - 'Move backward through top menu' => 'Siirrä taaksepäin ylävalikosta', - 'Move forward through top menu' => 'Siirry eteenpäin ylävalikosta', - 'Enter focused element' => 'Anna valittuun elementtiin', - 'Move up through elements list' => 'Siirry ylöspäin elementtien listassa', - 'Move down through elements list' => 'Siirry alaspäin elementtien listassa', + 'Shortcuts' => 'Shortcuts', + 'Add New object' => 'Add New object', + 'Save Form' => 'Save Form', + 'Cancel saving form' => 'Cancel saving form', + 'Go to USER list' => 'Go to USER list', + 'Go to WEB list' => 'Go to WEB list', + 'Go to DNS list' => 'Go to DNS list', + 'Go to MAIL list' => 'Go to MAIL list', + 'Go to DB list' => 'Go to DB list', + 'Go to CRON list' => 'Go to CRON list', + 'Go to BACKUP list' => 'Go to BACKUP list', + 'Focus on search' => 'Focus on search', + 'Display/Close shortcuts' => 'Display/Close shortcuts', + 'Move backward through top menu' => 'Move backward through top menu', + 'Move forward through top menu' => 'Move forward through top menu', + 'Enter focused element' => 'Enter focused element', + 'Move up through elements list' => 'Move up through elements list', + 'Move down through elements list' => 'Move down through elements list', 'Upload' => 'Lähetä', 'New File' => 'Uusi kansio', 'New Folder' => 'Uusi hakemisto', 'Download' => 'Lataa', 'Archive' => 'Arkisto', - 'Save File (in text editor)' => 'Tallenna tiedosto (tekstieditorissa)', - 'Close Popup / Cancel' => 'Sulje ponnahdusikkuna / Peruuta', - 'Move Cursor Up' => 'Siirrä Osoitin Ylös', - 'Move Cursor Down' => 'Siirrä Osoitin Alas', - 'Switch to Left Tab' => 'Vaihda Vasempaan Välilehteen', - 'Switch to Right Tab' => 'Vaihda Oikeaan Välilehteen', - 'Switch Tab' => 'Vaihda Välilehteä', - 'Go to the Top of the File List' => 'Siirry Tiedosto Luettelon Yläreunaan', - 'Go to the Last File' => 'Siirry Viimeiseen Tiedostoon', - 'Open File / Enter Directory' => 'Avaa Tiedosto / Anna hakemisto', - 'Edit File' => 'Muokkaa tiedostoa', - 'Go to Parent Directory' => 'Mene emohakemistoon', - 'Select Current File' => 'Valitse Nykyinen Tiedosto', - 'Select Bunch of Files' => 'Valitse Joukko Tiedostoja', - 'Add File to the Current Selection' => 'Lisää Tiedosto Nykyiseen Valintaan', + 'Save File (in text editor)' => 'Save File (in text editor)', + 'Close Popup / Cancel' => 'Close Popup / Cancel', + 'Move Cursor Up' => 'Move Cursor Up', + 'Move Cursor Down' => 'Move Cursor Down', + 'Switch to Left Tab' => 'Switch to Left Tab', + 'Switch to Right Tab' => 'Switch to Right Tab', + 'Switch Tab' => 'Switch Tab', + 'Go to the Top of the File List' => 'Go to the Top of the File List', + 'Go to the Last File' => 'Go to the Last File', + 'Open File / Enter Directory' => 'Open File / Enter Directory', + 'Edit File' => 'Edit File', + 'Go to Parent Directory' => 'Go to Parent Directory', + 'Select Current File' => 'Select Current File', + 'Select Bunch of Files' => 'Select Bunch of Files', + 'Add File to the Current Selection' => 'Add File to the Current Selection', 'Select All Files' => 'Valitse kaikki tiedostot', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'pikavalinnat inspiroi upea GNU Midnight Commander tiedostonhallinta', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', 'Licence Key' => 'Lisenssiavain', - 'Enter License Key' => 'Syötä Lisenssi Avain', + 'Enter License Key' => 'Enter License Key', 'Buy Licence' => 'Osta lisenssi', 'Buy Lifetime License' => 'Osta elinikäinen lisenssi', - 'Disable and Cancel Licence' => 'Poista Käytöstä ja Peruuta Lisenssi', + 'Disable and Cancel Licence' => 'Disable and Cancel Licence', 'Licence Activated' => 'Lisenssi aktivoitu', 'Licence Deactivated' => 'Lisenssi deaktivoitu', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Rajoita käyttäjiä siten, että he eivät voi käyttää SSH:ta ja heillä on pääsy vain kotikansioonsa.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Selaa, kopioi, muokkaa, tarkastele ja hae kaikista web palveluista täysin varustellulla File Managerilla.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'Tämä on kaupallinen moduuli, sinun on ostettava lisenssiavain, ottaaksesi se käyttöön.', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.', 'Minutes' => 'Minuutittain', // fuzzy 'Hourly' => 'Tunneittain', 'Run Command' => 'Aja Komento', 'every month' => 'joka kuukausi', 'every odd month' => 'joka toinen kuukausi', - 'every even month' => 'joka parillinen kuukausi', + 'every even month' => 'every even month', 'every day' => 'joka päivä', 'every odd day' => 'joka toinen päivä', - 'every even day' => 'joka parillinen päivä', - 'weekdays (5 days)' => 'arkisin (5 päivää)', - 'weekend (2 days)' => 'viikonloppu (2 päivää)', + 'every even day' => 'every even day', + 'weekdays (5 days)' => 'weekdays (5 days)', + 'weekend (2 days)' => 'weekend (2 days)', 'Monday' => 'Maanantai', 'Tuesday' => 'Tiistai', 'Wednesday' => 'Keskiviikko', @@ -733,7 +731,7 @@ $LANG['fi'] = array( 'every two hours' => 'joka toinen tunti', 'every minute' => 'joka minuutti', 'every two minutes' => 'joka toinen minuutti', - 'every' => 'joka', + 'every' => 'every', 'Generate' => 'Generoi', 'webalizer' => 'webalizer', @@ -748,16 +746,16 @@ $LANG['fi'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'Käytä palvelimen isäntänimeä', - 'Use domain hostname' => 'Käytä verkkotunnuksen isäntänimeä', - 'Use STARTTLS' => 'Käytä STARTTLS', - 'Use SSL / TLS' => 'Käytä SSL / TLS', - 'No encryption' => 'Ei salausta', - 'Do not use encryption' => 'Älä käytä salausta', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL / TLS' => 'Use SSL / TLS', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', - 'maximum characters length, including prefix' => 'maksimissaan %s merkkiä pitkä, mukaan lukien etuliite', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', - 'Email Credentials' => 'Sähköpostitiedot', + 'Email Credentials' => 'Email Credentials', // Texts below doesn't exist in en.php 'traffic' => 'tiedonsiirto', diff --git a/web/inc/i18n/fr.php b/web/inc/i18n/fr.php index 5a68a58a..c57e6266 100644 --- a/web/inc/i18n/fr.php +++ b/web/inc/i18n/fr.php @@ -195,7 +195,6 @@ $LANG['fr'] = array( 'SSL Home Directory' => 'Racine SSL', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Support Proxy', 'Proxy Extensions' => 'Extensions Proxy', @@ -560,7 +559,6 @@ $LANG['fr'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/hu.php b/web/inc/i18n/hu.php index c0ac0a41..af461107 100644 --- a/web/inc/i18n/hu.php +++ b/web/inc/i18n/hu.php @@ -199,7 +199,6 @@ $LANG['hu'] = array( 'SSL Home Directory' => 'SSL kezdőlap', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy támogatás', 'Proxy Extensions' => 'Proxy kiterjesztések', @@ -564,7 +563,6 @@ $LANG['hu'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/id.php b/web/inc/i18n/id.php index 7b43c044..ad3c18eb 100644 --- a/web/inc/i18n/id.php +++ b/web/inc/i18n/id.php @@ -1,20 +1,22 @@ 'Paket', 'IP' => 'IP', 'Graphs' => 'Grafik', - 'Statistics' => 'Statistik', + 'Statistics' => 'Statisktik', 'Log' => 'Log', 'Server' => 'Server', 'Services' => 'Layanan', 'Firewall' => 'Firewall', - 'Updates' => 'Perbarui', + 'Updates' => 'Updates', 'Log in' => 'Masuk', 'Log out' => 'Keluar', @@ -26,22 +28,22 @@ $LANG['id'] = array( 'CRON' => 'CRON', 'BACKUP' => 'CADANGAN', - 'LOGIN' => 'MASUK', - 'RESET PASSWORD' => 'RESET KATA SANDI', - 'SEARCH' => 'CARI', - 'PACKAGE' => 'PAKET', + 'LOGIN' => 'LOGIN', + 'RESET PASSWORD' => 'RESET PASSWORD', + 'SEARCH' => 'SEARCH', + 'PACKAGE' => 'PACKAGE', 'RRD' => 'RRD', 'STATS' => 'STATS', 'LOG' => 'LOG', - 'UPDATES' => 'PERBARUI', + 'UPDATES' => 'UPDATES', 'FIREWALL' => 'FIREWALL', 'SERVER' => 'SERVER', - 'MEMORY' => 'MEMORI', - 'DISK' => 'DISKA', - 'NETWORK' => 'JARINGAN', + 'MEMORY' => 'MEMORY', + 'DISK' => 'DISK', + 'NETWORK' => 'NETWORK', 'Web Log Manager' => 'Web Log Manager', - 'no notifications' => 'tidak ada notifikasi', + 'no notifications' => 'no notifications', 'Add User' => 'Tambah Pengguna', 'Add Domain' => 'Tambah Domain', @@ -58,7 +60,7 @@ $LANG['id'] = array( 'Add Package' => 'Tambah Paket', 'Add IP' => 'Tambah IP', 'Add Rule' => 'Tambah Aturan', - 'Ban IP Address' => 'Blokir Alamat IP', + 'Ban IP Address' => 'Memblokir IP', 'Search' => 'Cari', 'Add one more FTP Account' => 'Tambah satu lagi Pengguna FTP', 'Overall Statistics' => 'Seluruh Statistik', @@ -69,16 +71,16 @@ $LANG['id'] = array( 'Add' => 'Tambah', 'Back' => 'Kembali', 'Save' => 'Simpan', - 'Submit' => 'Submit', + 'Submit' => 'Masukkan', 'toggle all' => 'alihkan semua', - 'apply to selected' => 'terapkan yang dipilih', - 'rebuild' => 'bangun kembali', - 'rebuild web' => 'bangun kembali web', - 'rebuild dns' => 'bangun kembali dns', - 'rebuild mail' => 'bangun kembali mail', - 'rebuild db' => 'bangun kembali db', - 'rebuild cron' => 'bangun kembali cron', + 'apply to selected' => 'terapkan yg dipilih', + 'rebuild' => 'rancang ulang', + 'rebuild web' => 'rancang ulang web', + 'rebuild dns' => 'rancang ulang dns', + 'rebuild mail' => 'rancang ulang mail', + 'rebuild db' => 'rancang ulang db', + 'rebuild cron' => 'rancang ulang cron', 'update counters' => 'perbarui penghitung', 'suspend' => 'tangguhkan', 'unsuspend' => 'batalkan penangguhan', @@ -88,7 +90,7 @@ $LANG['id'] = array( 'logout' => 'keluar', 'edit' => 'sunting', 'open webstats' => 'buka webstats', - 'view logs' => 'lihat log', + 'view logs' => 'lihat catatan', 'list records' => 'daftar %s records', 'add record' => 'tambah record', 'list accounts' => 'daftar %s akun', @@ -108,12 +110,12 @@ $LANG['id'] = array( 'reread IP' => 'baca ulang IP', 'enable autoupdate' => 'mengaktifkan autoupdate', 'disable autoupdate' => 'menonaktifkan autoupdate', - 'turn on notifications' => 'mengaktifkan notifikasi.', - 'turn off notifications' => 'menonaktifkan notifikasi.', - 'configure' => 'konfigurasi', + 'turn on notifications' => 'mengaktifkan notifik.', + 'turn off notifications' => 'menonaktifkan notifik.', + 'configure' => 'configure', - 'Adding User' => 'Menambah Pengguna', - 'Editing User' => 'Menyunting Pengguna', + 'Adding User' => 'Menambah User', + 'Editing User' => 'Menyunting User', 'Adding Domain' => 'Menambah Domain', 'Editing Domain' => 'Menyunting Domain', 'Adding DNS Domain' => 'Menambah DNS Domain', @@ -145,7 +147,7 @@ $LANG['id'] = array( 'suspended' => 'ditangguhkan', 'running' => 'berjalan', 'stopped' => 'berhenti', - 'outdated' => 'kadaluarsa', + 'outdated' => 'kadarluasa', 'updated' => 'perbarui', 'yes' => 'ya', @@ -158,22 +160,22 @@ $LANG['id'] = array( 'minute' => 'menit', 'hour' => 'jam', 'day' => 'hari', - 'days' => 'hari', - 'hours' => 'jam', - 'minutes' => 'menit', - 'month' => 'bulan', + 'days' => ' hari', + 'hours' => ' jam', + 'minutes' => ' jam', + 'month' => ' month', 'package' => 'paket', 'Bandwidth' => 'Bandwidth', - 'Disk' => 'Diska', + 'Disk' => 'Cakram', 'Web' => 'Web', 'Mail' => 'Mail', 'Databases' => 'Basis Data', 'User Directories' => 'Direktori Pengguna', - 'Template' => 'Template', - 'Web Template' => 'Template Web', - 'Backend Template' => 'Template Backend', - 'Proxy Template' =>'Template Proxy', - 'DNS Template' => 'Template DNS', + 'Template' => 'Contoh', + 'Web Template' => 'Contoh Web', + 'Backend Template' => 'Contoh Backend', + 'Proxy Template' =>'Contoh Proxy', + 'DNS Template' => 'Contoh DNS', 'Web Domains' => 'Web Domains', 'SSL Domains' => 'SSL Domains', 'Web Aliases' => 'Web Aliases', @@ -183,21 +185,20 @@ $LANG['id'] = array( 'DNS records' => 'DNS records', 'Name Servers' => 'Name Servers', 'Mail Domains' => 'Mail Domains', - 'Mail Accounts' => 'Akun mail', + 'Mail Accounts' => 'Para Pengguna Mail', 'Cron Jobs' => 'Cron Jobs', 'SSH Access' => 'Akses SSH', - 'IP Address' => 'Alamat IP', + 'IP Address' => 'IP Address', 'IP Addresses' => 'Alamat IP', 'Backups' => 'Cadangkan', - 'Backup System' => 'Cadangkan Sistem', - 'backup exclusions' => 'pengecualian Cadangan', - 'template' => 'template', + 'Backup System' => 'Cadangkan System', + 'backup exclusions' => 'pengecualian', + 'template' => 'kerangka', 'SSL Support' => 'Dukungan SSL', - 'SSL Home Directory' => 'Direktori Home SSL', - 'Lets Encrypt Support' => 'Dukungan Lets Encrypt', + 'SSL Home Directory' => 'Direktori SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => 'Sertifikat anda akan otomatis diterbitkan dalam 5 menit', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Dukungan Proxy', 'Proxy Extensions' => 'Ekstensi Proxy', 'Web Statistics' => 'Statistik Web', @@ -205,7 +206,7 @@ $LANG['id'] = array( 'Path' => 'Path', 'SOA' => 'SOA', 'TTL' => 'TTL', - 'Expire' => 'Expire', + 'Expire' => 'Kadarluasa', 'Records' => 'Records', 'Serial' => 'Serial', 'Catchall email' => 'Catchall email', @@ -216,18 +217,18 @@ $LANG['id'] = array( 'Quota' => 'Kuota', 'Autoreply' => 'Balasan Otomatis', 'Forward to' => 'Teruskan ke', - 'Do not store forwarded mail' => 'Jangan simpan terusan surel', - 'IMAP hostname' => 'hostname IMAP', - 'IMAP port' => 'port IMAP', - 'IMAP security' => 'keamanan IMAP', - 'IMAP auth method' => 'metode otentikasi IMAP', - 'SMTP hostname' => 'hostname SMTP', - 'SMTP port' => 'port SMTP', - 'SMTP security' => 'keamanan SMTP', - 'SMTP auth method' => 'metode otentikasi SMTP', + 'Do not store forwarded mail' => 'Email terusan-nya jangan disimpan', + 'IMAP hostname' => 'IMAP hostname', + 'IMAP port' => 'IMAP port', + 'IMAP security' => 'IMAP security', + 'IMAP auth method' => 'IMAP auth method', + 'SMTP hostname' => 'SMTP hostname', + 'SMTP port' => 'SMTP port', + 'SMTP security' => 'SMTP security', + 'SMTP auth method' => 'SMTP auth method', 'STARTTLS' => 'STARTTLS', - 'Normal password' => 'kata sandi', - 'database' => 'basis data', + 'Normal password' => 'Normal password', + 'database' => 'basisdata', 'User' => 'Pengguna', 'Host' => 'Host', 'Charset' => 'Charset', @@ -238,7 +239,7 @@ $LANG['id'] = array( 'Day of week' => 'Hari dalam Minggu', 'local' => 'lokal', 'Run Time' => 'Run Time', - 'Backup Size' => 'Ukuran Cadangan', + 'Backup Size' => 'Ukuran Backup', 'SYS' => 'SYS', 'Domains' => 'Domains', 'Status' => 'Status', @@ -248,14 +249,14 @@ $LANG['id'] = array( 'Users' => 'Para Pengguna', 'Load Average' => 'Rata2 Pemuatan', 'Memory Usage' => 'Penggunaan Memori', - 'APACHE2 Usage' => 'Penggunaan APACHE2', + 'APACHE2 Usage' => 'APACHE2 Usage', 'HTTPD Usage' => 'Penggunaan HTTPD', 'NGINX Usage' => 'Penggunaan NGINX', 'MySQL Usage on localhost' => 'Penggunaan MySQL di localhost', 'PostgreSQL Usage on localhost' => 'Penggunaan PostgreSQL di localhost', 'Bandwidth Usage eth0' => 'Penggunaan Bandwidth eth0', 'Bandwidth Usage eth1' => 'Penggunaan Bandwidth eth1', - 'Exim Usage' => 'Penggunaan Exim', + 'Exim Usage' => 'Exim Usage', 'FTP Usage' => 'Penggunaan FTP', 'SSH Usage' => 'Penggunaan SSH', 'reverse proxy' => 'reverse proxy', @@ -265,60 +266,60 @@ $LANG['id'] = array( 'pop/imap server' => 'server pop/imap', 'email antivirus' => 'email antivirus', 'email antispam' => 'email antispam', - 'database server' => 'server basis data', + 'database server' => 'server basisdata', 'ftp server' => 'server ftp', 'job scheduler' => 'jadwal pekerjaan', 'firewall' => 'firewall', - 'brute-force monitor' => 'pantau brute-force', + 'brute-force monitor' => 'brute-force monitor', 'CPU' => 'CPU', 'Memory' => 'Memori', 'Uptime' => 'Uptime', 'core package' => 'paket inti', 'php interpreter' => 'php interpreter', - 'internal web server' => 'server web internal', + 'internal web server' => 'internal web server', 'Version' => 'Versi', 'Release' => 'Rilis', 'Architecture' => 'Arsitektur', 'Object' => 'Objek', 'Username' => 'Nama Pengguna', - 'Password' => 'Kata sandi', - 'Email' => 'Surel', + 'Password' => 'Katakunci', + 'Email' => 'Email', 'Package' => 'Paket', 'Language' => 'Bahasa', 'First Name' => 'Nama Depan', 'Last Name' => 'Nama Belakang', - 'Send login credentials to email address' => 'Kirim kredensial login ke alamat surel', - 'Default Template' => 'Template Standar', - 'Default Name Servers' => 'Name Servers Standar', + 'Send login credentials to email address' => 'Kirim mandat login ke alamat email', + 'Default Template' => 'Contoh Standar', + 'Default Name Servers' => 'Standar Name Servers', 'Domain' => 'Domain', 'DNS Support' => 'Dukungan DNS', 'Mail Support' => 'Dukungan Mail', 'Advanced options' => 'Opsi lanjutan', - 'Basic options' => 'Opsi Dasar', + 'Basic options' => 'Basic options', 'Aliases' => 'Alias', 'SSL Certificate' => 'Sertifikat SSL', 'SSL Key' => 'Kunci SSL', 'SSL Certificate Authority / Intermediate' => 'Otoritas Sertifikat SSL / Menengah', 'SSL CSR' => 'SSL CSR', 'optional' => 'opsi', - 'internal' => 'internal', + 'internal' => 'intern', 'Statistics Authorization' => 'Statistik Otoritas', 'Statistics Auth' => 'Statistik Otoritas', 'Account' => 'Pengguna', - 'Prefix will be automaticaly added to username' => 'Prefix %s akan otomatis ditambahkan ke nama pengguna', - 'Send FTP credentials to email' => 'Kirim kredensial FTP ke surel', - 'Expiration Date' => 'Tanggal Kadaluwarsa', + 'Prefix will be automaticaly added to username' => 'Awalan % s nantinya ditambahin otomatis ke nama pengguna', + 'Send FTP credentials to email' => 'Kirim mandat FTP ke email', + 'Expiration Date' => 'Tanggal Kadarluasa', 'YYYY-MM-DD' => 'YYYY-MM-DD', - 'Name servers' => 'Name server', + 'Name servers' => 'Name servers', 'Record' => 'Record', - 'IP or Value' => 'Alamat IP atau Nilai', + 'IP or Value' => 'IP or Nilai', 'Priority' => 'Prioritas', - 'Record Number' => 'Nomor Record', + 'Record Number' => 'Nomer Record', 'in megabytes' => 'dalam megabytes', - 'Message' => 'Pesan', - 'use local-part' => 'gunakan part lokal', - 'one or more email addresses' => 'satu atau lebih alamat surel', - 'Prefix will be automaticaly added to database name and database user' => 'Prefix %s akan otomatis ditambahkan ke nama basis data dan pengguna basis data', + 'Message' => 'PEsan', + 'use local-part' => 'gunakan local-part', + 'one or more email addresses' => 'satu atau lebih alamat email', + 'Prefix will be automaticaly added to database name and database user' => 'Awalan %s nantinya ditambahin otomatis ke nama dan pengguna basisdata', 'Database' => 'Basis Data', 'Type' => 'Jenis', 'Minute' => 'Menit', @@ -337,19 +338,19 @@ $LANG['id'] = array( 'mail domains' => 'mail domains', 'mail accounts' => 'mail accounts', 'accounts' => 'akun-akun', - 'databases' => 'basis data', + 'databases' => 'basisdata', 'cron jobs' => 'cron jobs', - 'backups' => 'cadangan', + 'backups' => 'cadangan-cadangan', 'quota' => 'kuota', 'day of week' => 'hari dalam seminggu', 'cmd' => 'cmd', - 'users' => 'pengguna', + 'users' => 'pengguna-pengguna', 'domains' => 'domains', 'aliases' => 'aliases', 'records' => 'records', 'jobs' => 'jobs', - 'username' => 'nama pengguna', - 'password' => 'kata sandi', + 'username' => 'namapengguna', + 'password' => 'katakunci', 'type' => 'tipe', 'charset' => 'charset', 'domain' => 'domain', @@ -361,17 +362,17 @@ $LANG['id'] = array( 'assigned user' => 'pengguna yg ditetapkan', 'ns1' => 'ns1', 'ns2' => 'ns2', - 'user' => 'pengguna', + 'user' => 'user', 'email' => 'email', 'first name' => 'nama depan', 'last name' => 'nama belakang', 'account' => 'akun', 'ssl certificate' => 'sertifikat ssl', 'ssl key' => 'kunci ssl', - 'stats user password' => 'stats nama pengguna kata sandi', - 'stats username' => 'stats nama pengguna', - 'stats password' => 'stats kata sandi', - 'ftp user password' => 'ftp nama pengguna kata sandi', + 'stats user password' => 'stats namapengguna katakunci', + 'stats username' => 'stats namapengguna', + 'stats password' => 'stats katakunci', + 'ftp user password' => 'ftp namapengguna katakunci', 'ftp user' => 'ftp pengguna', 'Last 70 lines of %s.%s.log' => '70 baris terakhir dari %s.%s.log', 'AccessLog' => 'AccessLog', @@ -379,26 +380,26 @@ $LANG['id'] = array( 'Download AccessLog' => 'Unduh AccessLog', 'Download ErrorLog' => 'Unduh ErrorLog', 'Country' => 'Negara', - '2 letter code' => '2 kode negara', - 'State / Province' => 'Provinsi', + '2 letter code' => '2 kode surat', + 'State / Province' => 'Propinsi', 'City / Locality' => 'Kota', 'Organization' => 'Organisasi', - 'Action' => 'Aksi', + 'Action' => 'Action', 'Protocol' => 'Protokol', 'Port' => 'Port', 'Comment' => 'Komentar', - 'Banlist' => 'list blokir', + 'Banlist' => 'Banlist', 'ranges are acceptable' => 'rentang yang diperbolehkan', - 'CIDR format is supported' => 'Format CIDR yang didukung', - 'ACCEPT' => 'TERIMA', - 'DROP' => 'BLOKIR', + 'CIDR format is supported' => 'Format CIDR didukung', + 'ACCEPT' => 'ACCEPT', + 'DROP' => 'DROP', 'TCP' => 'TCP', 'UDP' => 'UDP', 'ICMP' => 'ICMP', 'SSH' => 'SSH', 'FTP' => 'FTP', 'VESTA' => 'VESTA', - 'Add one more Name Server' => 'Tambah satu atau lebih Name Server', + 'Add one more Name Server' => 'Add one more Name Server', 'web domain' => 'web domain', 'dns domain' => 'dns domain', @@ -408,7 +409,7 @@ $LANG['id'] = array( 'cron job' => 'cron job', 'cron' => 'cron', - 'user dir' => 'direktori pengguna', + 'user dir' => 'user dir', 'unlimited' => 'tidak terbatas', '1 account' => '1 pengguna', @@ -440,75 +441,75 @@ $LANG['id'] = array( 'no exclusions' => 'tidak ada pengecualian', '1 rule' => '1 aturan', '%s rules' => '%s aturan', - 'There are no currently banned IP' => 'Saat ini tidak ada IP yang diblokir', + 'There are no currently banned IP' => 'Tidak dilarang IP', - 'USER_CREATED_OK' => 'Pengguna %s telah berhasil dibuat', - 'WEB_DOMAIN_CREATED_OK' => 'Domain %s telah berhasil dibuat.', - 'DNS_DOMAIN_CREATED_OK' => 'Domain DNS%s telah berhasil dibuat.', - 'DNS_RECORD_CREATED_OK' => 'Record %s.%s telah berhasil dibuat.', - 'MAIL_DOMAIN_CREATED_OK' => 'Domain Mail %s telah berhasil dibuat.', - 'MAIL_ACCOUNT_CREATED_OK' => 'Akun Mail %s@%s telah berhasil dibuat', - 'DATABASE_CREATED_OK' => 'Basis data %s telah berhasi dibuat', - 'CRON_CREATED_OK' => 'Cron job telah berhasil dibuat.', - 'IP_CREATED_OK' => 'Alamat IP %s telah berhasil dibuat.', - 'PACKAGE_CREATED_OK' => 'Paket %s telah berhasil dibuat.', - 'SSL_GENERATED_OK' => 'Sertifikat telah berhasil didapatkan.', - 'RULE_CREATED_OK' => 'Aturan Telah berhasil dibuat.', - 'BANLIST_CREATED_OK' => 'Alamat IP telah berhasil diblokir', - 'Autoupdate has been successfully enabled' => 'Autoupdate telah diaktifkan', + 'USER_CREATED_OK' => 'Pengguna %s udah berhasil dibikin', + 'WEB_DOMAIN_CREATED_OK' => 'Domain %s udah berhasil dibikin.', + 'DNS_DOMAIN_CREATED_OK' => 'Domain DNS%s udah berhasil dibikin.', + 'DNS_RECORD_CREATED_OK' => 'Record %s.%s udah berhasil dibikin.', + 'MAIL_DOMAIN_CREATED_OK' => 'Domain Mail %s udah berhasil dibikin.', + 'MAIL_ACCOUNT_CREATED_OK' => 'Akun Mail %s@%s udah berhasil dibikin', + 'DATABASE_CREATED_OK' => 'Database %s udah berhasil dibikin', + 'CRON_CREATED_OK' => 'Cron job udah berhasil dibuat.', + 'IP_CREATED_OK' => 'Alamat IP %s udah berhasil dibikin.', + 'PACKAGE_CREATED_OK' => 'Paket %s udah berhasil dibikin.', + 'SSL_GENERATED_OK' => 'Sertifikat udah berhasil dihasilkan.', + 'RULE_CREATED_OK' => 'Aturan udah berhasil dibikin.', + 'BANLIST_CREATED_OK' => 'IP address has been banned successfully', + 'Autoupdate has been successfully enabled' => 'Autoupdate sukses diaktifkan', 'Autoupdate has been successfully disabled' => 'Autoupdate telah dinonaktifkan', 'Cronjob email reporting has been successfully enabled' => 'Pelaporan cronjob telah berhasil diaktifkan', 'Cronjob email reporting has been successfully disabled' => 'Pelaporan cronjob telah berhasil dinonaktifkan', - 'Changes has been saved.' => 'Perubahan telah disimpan.', + 'Changes has been saved.' => 'Perubahan udah disimpan.', 'Confirmation' => 'Konfirmasi', - 'DELETE_USER_CONFIRMATION' => 'Apakah anda yakin akan menghapus pengguna %s ?', - 'SUSPEND_USER_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan pengguna %s ?', - 'UNSUSPEND_USER_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan pengguna %s?', - 'DELETE_DOMAIN_CONFIRMATION' => 'Apakah anda yakin akan menghapus Domain %s ?', - 'SUSPEND_DOMAIN_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan domain %s ?', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan domain %s ?', - 'DELETE_RECORD_CONFIRMATION' => 'Apakah anda yakin akan menghapus record %s ?', - 'SUSPEND_RECORD_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan record %s ?', - 'UNSUSPEND_RECORD_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan record %s ?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Apakah anda yakin akan menghapus surel %s?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan surel %s ?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan surel %s?', - 'DELETE_DATABASE_CONFIRMATION' => 'Apakah anda yakin akan menghapus basis data %s ?', - 'SUSPEND_DATABASE_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan basis data %s ?', - 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan basis data %s ?', - 'DELETE_CRON_CONFIRMATION' => 'Apakah anda yakin akan menghapus cron ?', - 'SUSPEND_CRON_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan cron ?', - 'UNSUSPEND_CRON_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan cron ?', - 'DELETE_BACKUP_CONFIRMATION' => 'Apakah anda yakin akan menghapus Cadangan %s ?', - 'DELETE_EXCLUSION_CONFIRMATION' => 'Apakah anda yakin akan menghapus Pengecualian %s ?', - 'DELETE_PACKAGE_CONFIRMATION' => 'Apakah anda yakin akan menghapus Paket %s ?', - 'DELETE_IP_CONFIRMATION' => 'Apakah anda yakin akan menghapus Alamat IP %s ?', - 'DELETE_RULE_CONFIRMATION' => 'Apakah anda yakin akan menghapus Aturan #%s ?', - 'SUSPEND_RULE_CONFIRMATION' => 'Apakah anda yakin akan menangguhkan Aturan #%s ?', - 'UNSUSPEND_RULE_CONFIRMATION' => 'Apakah anda yakin akan membatalkan penangguhan aturan #%s ?', - 'LEAVE_PAGE_CONFIRMATION' => 'Tinggalkan halaman?', - 'RESTART_CONFIRMATION' => 'Apakah anda yakin ingin me-restart %s?', + 'DELETE_USER_CONFIRMATION' => 'Yakin pengguna %s mau dihapus nih?', + 'SUSPEND_USER_CONFIRMATION' => 'Yakin pengguna %s mau ditangguhkan nih?', + 'UNSUSPEND_USER_CONFIRMATION' => 'Yakin mau batalin penangguhan pengguna %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'Domain %s beneran mau dihapus?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'Domain %s beneran mau ditangguhin?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'Penangguhan Domain %s mau dibatalin. Yakin?', + 'DELETE_RECORD_CONFIRMATION' => 'Record %s mau dihapus?', + 'SUSPEND_RECORD_CONFIRMATION' => 'Record %s mau ditangguhin?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'Batalin penagguhan record %s. Yakin?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'Beneran mau ngapus %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '%s mau ditangguhkan nih?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'Yakin mau batalin penangguhan %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'Basisdata mau dihhapus %s, Beneran?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'Basisdata %s beneran mau ditangguhin?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'Penangguhan Basisdata %s mau dibatalin. Yakin?', + 'DELETE_CRON_CONFIRMATION' => 'Yakin mau dihapus?', + 'SUSPEND_CRON_CONFIRMATION' => 'Yakin mau ditangguhin?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'Yakin mau batalin penangguhan?', + 'DELETE_BACKUP_CONFIRMATION' => 'Cadangan %s mau dihapus, serius?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'Pengecualian %s mau dihapus?', + 'DELETE_PACKAGE_CONFIRMATION' => 'Paket %s mau dihapus?', + 'DELETE_IP_CONFIRMATION' => 'Alamat IP %s beneran mau dihapus?', + 'DELETE_RULE_CONFIRMATION' => 'Aturan #%s beneran mau dihapus?', + 'SUSPEND_RULE_CONFIRMATION' => 'Aturan #%s beneran mau ditangguhin?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'Penangguhan aturan #%s mau dibatalin. Yakin?', + 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?', + 'RESTART_CONFIRMATION' => '%s mau me-restart?', 'Welcome' => 'Selamat Datang', 'LOGGED_IN_AS' => 'Masuk sebagai pengguna %s', - 'Error' => 'Galat', - 'Invalid username or password' => 'Nama pengguna atau kata sandi salah', + 'Error' => 'Kesalahan', + 'Invalid username or password' => 'Nama pengguna atau katakunci salah', 'Invalid username or code' => 'Kode atau nama pengguna salah', - 'Passwords not match' => 'Kata sandi tidak sama', - 'Please enter valid email address.' => 'Masukkan alamat surel yang valid.', - 'Field "%s" can not be blank.' => 'Field "%s" tidak boleh kosong.', - 'Password is too short.' => 'Kata sandi terlalu pendek (minimal 6 karakter)', - 'Error code:' => 'Kode galat: %s', + 'Passwords not match' => 'Katakunci ngga sama', + 'Please enter valid email address.' => 'Masukkan alamat email yg valid.', + 'Field "%s" can not be blank.' => 'Field "%s" ga boleh kosong.', + 'Password is too short.' => 'Katakunci kependekan (paling dikit 6 huruf)', + 'Error code:' => 'Kode kesalahan: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" gagal', - 'IP address is in use' => 'Alamat IP sudah digunakan', - 'BACKUP_SCHEDULED' => 'Tugas sudah ditambahkan ke antrian. email pemberitahuan akan dikirim ketika cadangan telah siap diunduh.', - 'BACKUP_EXISTS' => 'Proses mencadangkan sedang berjalan. silahkan tunggu hingga selesai.', - 'RESTORE_SCHEDULED' => 'Tugas sudah ditambahkan ke antrian. email pemberitahuan akan dikirim ketika cadangan telah siap diunduh.', - 'RESTORE_EXISTS' => 'Tugas pengembalian sedang berjalan. Silahkan tunggu hingga selesai.', + 'IP address is in use' => 'Alamat IP udah ada yang pake', + 'BACKUP_SCHEDULED' => 'Tugas udah ditambahin ke antrian. Nanti email pemberitahuan dikirim kalo backup-an sudah siap di unduh.', + 'BACKUP_EXISTS' => 'Backup lagi berjalan. Tunggu dulu sampe selesai.', + 'RESTORE_SCHEDULED' => 'Tugas udah ditambahin ke antrian. Nanti email pemberitahuan dikirim kalo backup-an sudah siap di unduh.', + 'RESTORE_EXISTS' => 'Tugas pengembalian lagi jalan. Tunggu ampe selesai baru jalanin lagi.', 'WEB_EXCLUSIONS' => 'Ketik nama domain, satu domain perbaris. Untuk pengecualian semua domain gunakan karakter *. Untuk pengecualian spesifik direktori gunakan format : domain.com:public_html/cache:public_html/tmp', 'DNS_EXCLUSIONS' => 'Ketik nama domain, satu domain perbaris. Untuk pengecualian semua domain gunakan karakter *.', 'MAIL_EXCLUSIONS' => 'Ketik nama domain, satu domain perbaris. Untuk pengecualian semua domain gunakan karakter *. Untuk pengecualian spesifik direktori gunakan format : domain.com:info:support:postmaster', - 'DB_EXCLUSIONS' => 'Ketik nama basis data, satu basis data per baris. Untuk pengecualian semua databases gunakan *', + 'DB_EXCLUSIONS' => 'Ketik nama database, satu database per baris. Untuk pengecualian semua databases gunakan *', 'CRON_EXCLUSIONS' => 'Untuk pengecualian semua JOBS gunakan *', 'USER_EXCLUSIONS' => 'Ketik nama direktori, satu direktori per baris. Untuk pengecualian semua direktori gunakan karakter *', @@ -516,37 +517,37 @@ $LANG['id'] = array( 'MAIL_FROM' => 'Panel Kontrol Vesta ', 'GREETINGS_GORDON_FREEMAN' => "Hai, %s %s,\n", 'GREETINGS' => "Hai,\n", - 'ACCOUNT_READY' => "Akun telah dibuat dan siap digunakan.\n\nhttps://%s/login/\nNama pengguna: %s\nKata sandi: %s\n\n--\nPanel Kontrol Vesta\n", + 'ACCOUNT_READY' => "Akun kamu sudah dibuat dan siap dipakai.\n\nhttps://%s/login/\nNamapengguna: %s\nKatakunci: %s\n\n--\nPanel Kontrol Vesta\n", - 'FTP login credentials' => 'Kredensial untuk masuk FTP', - 'FTP_ACCOUNT_READY' => "Akun FTP telah dibuat dan siap digunakan.\n\nHostname: %s\nNama pengguna: %s_%s\nKata sandi: %s\n\n--\nPanel Kontrol Vesta\n", + 'FTP login credentials' => 'Mandat untuk masuk FTP', + 'FTP_ACCOUNT_READY' => "Akun FTP kamu sudah dibuat dan siap dipakai.\n\nHostname: %s\nNamapengguna: %s_%s\nKatakunci: %s\n\n--\nPanel Kontrol Vesta\n", - 'Database Credentials' => 'Kredensial Basis Data', - 'DATABASE_READY' => "Basis data telah berhasil dibuat.\n\nBasis data: %s\nNama pengguna: %s\nKata sandi: %s\n%s\n\n--\nPanel Kontrol Vesta\n", + 'Database Credentials' => 'Database Credentials', + 'DATABASE_READY' => "Basisdata udah berhasil dibikinin.\n\nDatabase: %s\nPengguna: %s\nKatakunci: %s\n%s\n\n--\nPanel Kontrol Vesta\n", - 'forgot password' => 'lupa kata sandi', + 'forgot password' => 'lupa katakunci', 'Confirm' => 'Konfirmasi', - 'New Password' => 'Kata Sandi Baru', - 'Confirm Password' => 'Konfirmasi Kata Sandi', + 'New Password' => 'Katakunci', + 'Confirm Password' => 'Konfirmasi Katakunci', 'Reset' => 'Reset', 'Reset Code' => 'Reset Kode', 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => 'Kode kata sandi untuk me-reset sudah dikirim ke surel
', - 'MAIL_RESET_SUBJECT' => 'Kata sandi di-reset pada %s', - 'PASSWORD_RESET_REQUEST' => "Untuk me-reset kata sandi, silahkan klik tautan ini:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\natau ke https://%s/reset/?action=code&user=%s lalu masukan kode reset-nya:\n%s\n\nJika anda tidak meminta untuk me-reset kata sandi, silahkan abaikan pesan ini.\n\n--\nPanel Kontrol Vesta\n", + 'RESET_CODE_SENT' => 'Kode katakunci buat me-reset udah dikirim ke email
', + 'MAIL_RESET_SUBJECT' => 'Katakunci di-reset pada %s', + 'PASSWORD_RESET_REQUEST' => "Kalo mau reset katakunci panel kontrol, klik aja tautan ini:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, kalo ngga ke https://%s/reset/?action=code&user=%s terus masukin kode reset-nya:\n%s\n\nKalau emang kamu ga minta reset katakunci pesan ini abaikan aja, dan maaf ya....\n\n--\nPanel Kontrol Vesta\n", 'Jan' => 'Jan', 'Feb' => 'Feb', 'Mar' => 'Mar', 'Apr' => 'Apr', - 'May' => 'Mei', + 'May' => 'May', 'Jun' => 'Jun', 'Jul' => 'Jul', - 'Aug' => 'Agu', + 'Aug' => 'Aug', 'Sep' => 'Sep', - 'Oct' => 'Okt', + 'Oct' => 'Oct', 'Nov' => 'Nov', - 'Dec' => 'Des', + 'Dec' => 'Dec', 'Configuring Server' => 'Konfigurasi Server', 'Hostname' => 'Nama Host', @@ -555,43 +556,42 @@ $LANG['id'] = array( 'Proxy Server' => 'Proxy Server', 'Web Server' => 'Web Server', 'Backend Server' => 'Backend Server', - 'Backend Pool Mode' => 'Mode Backend Pool', + 'Backend Pool Mode' => 'Backend Pool Mode', 'DNS Server' => 'DNS Server', 'DNS Cluster' => 'DNS Cluster', 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Gunakan Sertifikat SSL Domain Web', 'Webmail URL' => 'Webmail URL', - 'MySQL Support' => 'Dukungan MySQL', + 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', - 'PostgreSQL Support' => 'Dukungan PostgreSQL', + 'PostgreSQL Support' => 'PostgreSQL Support', 'phpPgAdmin URL' => 'phpPgAdmin URL', - 'Maximum Number Of Databases' => 'Jumlah maximal basis data', - 'Current Number Of Databases' => 'Jumlah database saat ini', - 'Local backup' => 'Cadangan lokal', - 'Compression level' => 'Tingkat Kompresi', - 'Directory' => 'Direktori', + 'Maximum Number Of Databases' => 'Maximum Number Of Databases', + 'Current Number Of Databases' => 'Current Number Of Databases', + 'Local backup' => 'Local backup', + 'Compression level' => 'Compression level', + 'Directory' => 'Directory', 'Remote backup' => 'Remote backup', 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', - 'FileSystem Disk Quota' => 'Kuota Diska FileSystem', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', 'Vesta Control Panel Plugins' => 'Vesta Control Panel Plugins', 'preview' => 'pratinjau', 'Reseller Role' => 'Aturan Reseller', 'Web Config Editor' => 'Web Config Editor', 'Template Manager' => 'Template Manager', - 'Backup Migration Manager' => 'Manajer Migrasi Cadangan', + 'Backup Migration Manager' => 'Backup Migration Manager', 'FileManager' => 'FileManager', - 'show: CPU / MEM / NET / DISK' => 'tampilkan: CPU / MEM / NET / DISK', + 'show: CPU / MEM / NET / DISK' => 'show: CPU / MEM / NET / DISK', 'sort by' => 'sortir', 'Date' => 'Tanggal', 'Starred' => 'Bintangi', 'Name' => 'Nama', - 'save to favorites' => 'simpan ke favorit', + 'save to favorites' => 'save to favorites', 'File Manager' => 'File Manager', 'size' => 'ukuran', @@ -599,64 +599,64 @@ $LANG['id'] = array( 'name' => 'nama', 'Initializing' => 'Inisialisasi', 'UPLOAD' => 'UNGGAH', - 'NEW FILE' => 'BERKAS BARU', + 'NEW FILE' => 'FILE BARU', 'NEW DIR' => 'DIREKTORI BARU', 'DELETE' => 'HAPUS', 'RENAME' => 'GANTI', - 'MOVE' => 'PINDAH', - 'RIGHTS' => 'HAK', + 'MOVE' => 'MOVE', + 'RIGHTS' => 'RIGHTS', 'COPY' => 'SALIN', 'ARCHIVE' => 'ARSIP', 'EXTRACT' => 'EKSTRAK', 'DOWNLOAD' => 'UNDUH', - 'Are you sure?' => 'Apakah anda yakin ?', + 'Are you sure?' => 'Are you sure?', 'Hit' => 'Hit', 'to reload the page' => 'untuk memuat ulang halaman', - 'Directory name cannot be empty' => 'Nama Direktori tidak boleh kosong', - 'File name cannot be empty' => 'Nama berkas tidak boleh kosong', - 'No file selected' => 'Tidak ada berkas yang dipilih', - 'No file or folder selected' => 'Tidak ada berkas atau folder yg dipilih', - 'File type not supported' => 'Tipe berkas tidak didukung', - 'Directory download not available in current version' => 'Direktori Unduh tidak tersedia di versi ini', - 'Directory not available' => 'Direktori tidak tersedia', - 'Done' => 'Selesai', + 'Directory name cannot be empty' => 'Nama Directory ga boleh kosong', + 'File name cannot be empty' => 'Nama File ga boleh kosong', + 'No file selected' => 'Ga ada file yg dipilih', + 'No file or folder selected' => 'Ga ada file atau folder yg dipilih', + 'File type not supported' => 'Tipe file ga didukung', + 'Directory download not available in current version' => 'Unduh direktori ga tersedia di versi ini', + 'Directory not available' => 'Direktori ga tersedia', + 'Done' => 'Sudah Selesai', 'Close' => 'Tutup', 'Copy' => 'Salin', 'Cancel' => 'Batal', 'Rename' => 'Ganti nama', - 'Move' => 'Pindah', - 'Change Rights' => 'Ganti Hak', + 'Move' => 'Move', + 'Change Rights' => 'Change Rights', 'Delete' => 'Hapus', 'Extract' => 'Ekstrak', 'Create' => 'Buat', 'Compress' => 'Kompres', 'OK' => 'OK', - 'YOU ARE COPYING' => 'ANDA MENYALIN', - 'YOU ARE REMOVING' => 'ANDA MENGHAPUS', - 'Delete items' => 'Hapus item', - 'Copy files' => 'Salin berkas', - 'Move files' => 'Pindah berkas', - 'Are you sure you want to copy' => 'Apakah anda yakin ingin menyalin', - 'Are you sure you want to move' => 'Apakah anda yakin ingin memindahkan', - 'Are you sure you want to delete' => 'Aapakah anda Yakin ingin menghapus', + 'YOU ARE COPYING' => 'YOU ARE COPYING', + 'YOU ARE REMOVING' => 'YOU ARE REMOVING', + 'Delete items' => 'Delete items', + 'Copy files' => 'Copy files', + 'Move files' => 'Move files', + 'Are you sure you want to copy' => 'Yakin mau disalin', + 'Are you sure you want to move' => 'Are you sure you want to move', + 'Are you sure you want to delete' => 'Yakin mau dihapus', 'into' => 'ke', - 'existing files will be replaced' => 'berkas yang sudah ada akan diganti', - 'Original name' => 'Nama orisinal', - 'File' => 'Berkas', + 'existing files will be replaced' => 'file yg sudah ada akan diganti', + 'Original name' => 'Nama original', + 'File' => 'File', 'already exists' => 'sudah ada', - 'Create file' => 'Buat berkas', - 'Create directory' => 'Buat direktori', - 'read by owner' => 'dibaca oleh pemilik', - 'write by owner' => 'ditulis oleh pemilik', - 'execute/search by owner' => 'eksekusi/cari oleh pemilik', - 'read by group' => 'dibaca oleh grup', - 'write by group' => 'ditulis oleh grup', - 'execute/search by group' => 'ekseskusi/cari oleh grup', - 'read by others' => 'dibaca oleh lainnya', - 'write by others' => 'ditulis oleh lainnya', - 'execute/search by others' => 'ekseskusi/cari oleh lainnya', + 'Create file' => 'Bikin file', + 'Create directory' => 'Bikin direktori', + 'read by owner' => 'read by owner', + 'write by owner' => 'write by owner', + 'execute/search by owner' => 'execute/search by owner', + 'read by group' => 'read by group', + 'write by group' => 'write by group', + 'execute/search by group' => 'execute/search by group', + 'read by others' => 'read by others', + 'write by others' => 'write by others', + 'execute/search by others' => 'execute/search by others', - 'Shortcuts' => 'Pintasan', + 'Shortcuts' => 'Shortcuts', 'Add New object' => 'Tambah objek baru', 'Save Form' => 'Simpan Formulir', 'Cancel saving form' => 'Batalkan penyimpanan form', @@ -672,68 +672,68 @@ $LANG['id'] = array( 'Move backward through top menu' => 'Pindah ke sebelumnya lewat menu atas', 'Move forward through top menu' => 'Pindah ke setelahnya lewat menu atas', 'Enter focused element' => 'Masuk ke fokus elemen', - 'Move up through elements list' => 'Pindah ke atas melalui daftar elemen', - 'Move down through elements list' => 'Pindah ke bawah melalui daftar elemen', + 'Move up through elements list' => 'Move up through elements list', + 'Move down through elements list' => 'Move down through elements list', 'Upload' => 'Unggah', - 'New File' => 'Berkas baru', + 'New File' => 'File baru', 'New Folder' => 'Folder baru', 'Download' => 'Unduh', 'Archive' => 'Arsip', - 'Save File (in text editor)' => 'Simpan berkas (di penyunting teks)', + 'Save File (in text editor)' => 'Simpan File (di text editor)', 'Close Popup / Cancel' => 'Tutup Popup / Batal', - 'Move Cursor Up' => 'Pindahkan kursor keatas', - 'Move Cursor Down' => 'Pindahkan kursor kebawah', + 'Move Cursor Up' => 'Pindahkan kursur keatas', + 'Move Cursor Down' => 'Pindahkan kursur kebawah', 'Switch to Left Tab' => 'Pindah ke tab kiri', 'Switch to Right Tab' => 'Pindah ke tab kanan', 'Switch Tab' => 'Pindah Tab', - 'Go to the Top of the File List' => 'Pindah Ke atas dari Daftar Berkas', - 'Go to the Last File' => 'Pindah Berkas terakhir', - 'Open File / Enter Directory' => 'Buka Berkas/Masuk ke Direktori', - 'Edit File' => 'Sunting Berkas', - 'Go to Parent Directory' => 'Ke Direktori Induk', - 'Select Current File' => 'Pilih Berkas ini', - 'Select Bunch of Files' => 'Pilih banyak berkas', - 'Add File to the Current Selection' => 'Tambahkan Berkas diseleksi ini', - 'Select All Files' => 'Pilih semua berkas', + 'Go to the Top of the File List' => 'Pindah Ke atas dari Daftar File', + 'Go to the Last File' => 'Pindah File terakhir', + 'Open File / Enter Directory' => 'Buka File/Masuk ke Directory', + 'Edit File' => 'Edit File', + 'Go to Parent Directory' => 'Ke Parent Directory', + 'Select Current File' => 'Pilih File ini', + 'Select Bunch of Files' => 'Pilih Bunch of Files', + 'Add File to the Current Selection' => 'Tambahkan File di Seleksi ini', + 'Select All Files' => 'Pilih semua file', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'pintasan terinspirasi oleh magnificent GNU Midnight Commander file manager', + 'jalan pintas terinspirasi oleh magnificent GNU Midnight Commander file manager', - 'Licence Key' => 'Lisensi', - 'Enter License Key' => 'Masukan Lisensi', - 'Buy Licence' => 'Beli lisensi', - 'Buy Lifetime License' => 'Beli Lisensi seumur hidup', - 'Disable and Cancel Licence' => 'Nonaktifkan dan batalkan lisensi', - 'Licence Activated' => 'Lisensi telah aktif', - 'Licence Deactivated' => 'Lisensi telah di nonaktifkan', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Batasi pengguna agar tidak dapat menggunakan SSH dan hanya dapat mengakses direktori home.', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Jelajahi, salin, sunting, lihat dan dapatkan semua berkas web anda menggunakan File Manager.', - 'This is a commercial module, you would need to purchace license key to enable it.' => 'Ini modul komersial, anda perlu membayar lisensi untuk mengaktifkannya.', + 'Licence Key' => 'Licence Key', + 'Enter License Key' => 'Enter License Key', + 'Buy Licence' => 'Buy Licence', + 'Buy Lifetime License' => 'Buy Lifetime License', + 'Disable and Cancel Licence' => 'Disable and Cancel Licence', + 'Licence Activated' => 'Licence Activated', + 'Licence Deactivated' => 'Licence Deactivated', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'Restrict users so that they cannot use SSH and access only their home directory.', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.', + 'This is a commercial module, you would need to purchace license key to enable it.' => 'This is a commercial module, you would need to purchace license key to enable it.', - 'Minutes' => 'Permenit', - 'Hourly' => 'Perhari', - 'Run Command' => 'Jalankan Perintah', - 'every month' => 'setiap bulan', - 'every odd month' => 'setiap bulan ganjil', - 'every even month' => 'setiap bulan sekali', - 'every day' => 'setiap hari', - 'every odd day' => 'setiap hari ganjil', - 'every even day' => 'setiap hari sekali', - 'weekdays (5 days)' => 'hari kerja (5 hari)', - 'weekend (2 days)' => 'akhir pekan (2 hari)', - 'Monday' => 'Senin', - 'Tuesday' => 'Selasa', - 'Wednesday' => 'Rabu', - 'Thursday' => 'Kamis', - 'Friday' => 'Jumat', - 'Saturday' => 'Sabtu', - 'Sunday' => 'Minggu', - 'every hour' => 'setiap jam', - 'every two hours' => 'setiap dua jam', - 'every minute' => 'setiap menit', - 'every two minutes' => 'setiap dua menit', - 'every' => 'setiap', - 'Generate' => 'Hasilkan', + 'Minutes' => 'Minutes', + 'Hourly' => 'Hourly', + 'Run Command' => 'Run Command', + 'every month' => 'every month', + 'every odd month' => 'every odd month', + 'every even month' => 'every even month', + 'every day' => 'every day', + 'every odd day' => 'every odd day', + 'every even day' => 'every even day', + 'weekdays (5 days)' => 'weekdays (5 days)', + 'weekend (2 days)' => 'weekend (2 days)', + 'Monday' => 'Monday', + 'Tuesday' => 'Tuesday', + 'Wednesday' => 'Wednesday', + 'Thursday' => 'Thursday', + 'Friday' => 'Friday', + 'Saturday' => 'Saturday', + 'Sunday' => 'Sunday', + 'every hour' => 'every hour', + 'every two hours' => 'every two hours', + 'every minute' => 'every minute', + 'every two minutes' => 'every two minutes', + 'every' => 'every', + 'Generate' => 'Generate', 'webalizer' => 'webalizer', 'awstats' => 'awstats', @@ -747,14 +747,14 @@ $LANG['id'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'Gunakan hostname server', - 'Use domain hostname' => 'Gunakan hostname domain', - 'Use STARTTLS' => 'Gunakan STARTTLS', - 'Use SSL / TLS' => 'Gunakan SSL / TLS', - 'No encryption' => 'tidak ada enkripsi', - 'Do not use encryption' => 'Jangan gunakan enkripsi', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL / TLS' => 'Use SSL / TLS', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', - 'maximum characters length, including prefix' => 'maksimal jumlah karakter %s, termasuk prefix', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', - 'Email Credentials' => 'Kredensial surel', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/it.php b/web/inc/i18n/it.php index 91296d8b..ec7a83d5 100644 --- a/web/inc/i18n/it.php +++ b/web/inc/i18n/it.php @@ -196,7 +196,6 @@ $LANG['it'] = array( 'SSL Home Directory' => 'SSL Home', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Supporto Proxy', 'Proxy Extensions' => 'Estensioni Proxy', @@ -561,7 +560,6 @@ $LANG['it'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/ja.php b/web/inc/i18n/ja.php index c0e9e541..f2836948 100644 --- a/web/inc/i18n/ja.php +++ b/web/inc/i18n/ja.php @@ -195,7 +195,6 @@ $LANG['ja'] = array( 'SSL Home Directory' => 'SSLホームディレクトリ', 'Lets Encrypt Support' => "Let's Encryptのサポート", 'Lets Encrypt' => "Let's Encrypt", - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => '証明書は5分以内に自動的に発行されます', 'Proxy Support' => 'プロキシのサポート', 'Proxy Extensions' => 'プロキシ対象拡張子', @@ -560,7 +559,6 @@ $LANG['ja'] = array( 'MAIL Server' => 'メールサーバー', 'Antivirus' => 'アンチウイルス', 'AntiSpam' => 'アンチスパム', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'ウェブメールのURL', 'MySQL Support' => 'MySQLのサポート', 'phpMyAdmin URL' => 'phpMyAdminのURL', diff --git a/web/inc/i18n/ka.php b/web/inc/i18n/ka.php index f82e2305..0ebf2d11 100644 --- a/web/inc/i18n/ka.php +++ b/web/inc/i18n/ka.php @@ -195,7 +195,6 @@ $LANG['ka'] = array( 'SSL Home Directory' => 'SSL მთავარი დირექტორია', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'პროქსის მხარდაჭერა', 'Proxy Extensions' => 'პროქსის გაფართოებები', @@ -560,7 +559,6 @@ $LANG['ka'] = array( 'MAIL Server' => 'ელფოსტის სერვერი', 'Antivirus' => 'ანტივირუსი', 'AntiSpam' => 'ანტისპამი', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'ვებფოსტის URL', 'MySQL Support' => 'MySQL-ის მხარდაჭერა', 'phpMyAdmin URL' => 'phpMyAdmin-ის URL', @@ -746,14 +744,14 @@ $LANG['ka'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'სერვერის hostname-ის გამოყენება', - 'Use domain hostname' => 'დეომენის hostname-ის გამოყენება', - 'Use STARTTLS' => 'STARTTLS-ის გამოყენება', - 'Use SSL / TLS' => 'SSL / TLS-ის გამოყენება', - 'No encryption' => 'დაშიფრვის გარეშე', - 'Do not use encryption' => 'არ გამოიყენო დაშიფრვა', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL / TLS' => 'Use SSL / TLS', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', - 'maximum characters length, including prefix' => 'დასაშვებია მაქსიმუმ %s სიმბოლო, პრეფიქსის ჩათვლით', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', - 'Email Credentials' => 'რეკვიზიტების ელ-ფოსტით გაგზავნა', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ko.php b/web/inc/i18n/ko.php index e81ab4b0..5c98950f 100644 --- a/web/inc/i18n/ko.php +++ b/web/inc/i18n/ko.php @@ -26,11 +26,11 @@ $LANG['ko'] = array( 'BACKUP' => '백업', 'LOGIN' => '로그인', - 'RESET PASSWORD' => '비밀번호 재설정', + 'RESET PASSWORD' => '비밀번호 초기화', 'SEARCH' => '검색', 'PACKAGE' => '패키지', 'RRD' => 'RRD', - 'STATS' => '상태정보', + 'STATS' => 'STATS', 'LOG' => '기록', 'UPDATES' => '업데이트', 'FIREWALL' => '방화벽', @@ -59,7 +59,7 @@ $LANG['ko'] = array( 'Add Rule' => '규칙 추가', 'Ban IP Address' => 'IP 주소 차단', 'Search' => '검색', - 'Add one more FTP Account' => 'FTP 계정을 추가하기', + 'Add one more FTP Account' => 'FTP 계정을 하나 추가하기', 'Overall Statistics' => '전체 통계', 'Daily' => '매일', 'Weekly' => '매주', @@ -70,7 +70,7 @@ $LANG['ko'] = array( 'Save' => '저장', 'Submit' => '등록', - 'toggle all' => '모두 선택', + 'toggle all' => '모두 활성화', 'apply to selected' => '선택된 것에 적용', 'rebuild' => '리빌드', 'rebuild web' => '웹 리빌드', @@ -139,7 +139,7 @@ $LANG['ko'] = array( 'Editing Firewall Rule' => '방화벽 규칙 편집', 'Adding IP Address to Banlist' => 'IP 주소를 차단 목록에 추가', - 'active' => '활성화됨', + 'active' => '활성', 'spnd' => '정지됨', 'suspended' => '정지됨', 'running' => '작동중', @@ -192,11 +192,10 @@ $LANG['ko'] = array( 'backup exclusions' => '백업 예외', 'template' => '템플릿', 'SSL Support' => 'SSL 지원', - 'SSL Home Directory' => 'SSL 홈 디렉토리', + 'SSL Home Directory' => 'SSL 홈', 'Lets Encrypt Support' => 'Lets Encrypt 지원', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => '인증서는 5분 안에 자동으로 발급될 것입니다', + 'Your certificate will be automatically issued in 5 minutes' => '인증서는 5분 안에 자동으로 발급됩니다', 'Proxy Support' => '프록시 지원', 'Proxy Extensions' => '프록시 확장', 'Web Statistics' => '웹 통계', @@ -250,8 +249,8 @@ $LANG['ko'] = array( 'APACHE2 Usage' => 'APACHE2 사용', 'HTTPD Usage' => 'HTTPD 사용', 'NGINX Usage' => 'NGINX 사용', - 'MySQL Usage on localhost' => 'localhost에서 MySQL 사용', - 'PostgreSQL Usage on localhost' => 'localhost에서 PostgreSQL 사용', + 'MySQL Usage on localhost' => 'localhost에서의 MySQL 사용', + 'PostgreSQL Usage on localhost' => 'localhost에서의 PostgreSQL 사용', 'Bandwidth Usage eth0' => 'eth0 대역폭 사용', 'Bandwidth Usage eth1' => 'eth1 대역폭 사용', 'Exim Usage' => 'Exim 사용', @@ -268,7 +267,7 @@ $LANG['ko'] = array( 'ftp server' => 'FTP 서버', 'job scheduler' => '스케줄러 ', 'firewall' => '방화벽', - 'brute-force monitor' => '무차별 대입 공격 모니터', + 'brute-force monitor' => '무차별 공격 모니터', 'CPU' => 'CPU', 'Memory' => '메모리', 'Uptime' => '가동 시간', @@ -286,7 +285,7 @@ $LANG['ko'] = array( 'Language' => '언어', 'First Name' => '이름', 'Last Name' => '성', - 'Send login credentials to email address' => '이메일 주소로 로그인 정보 전송', + 'Send login credentials to email address' => '이메일 주소로 로그인 정보를 보내기', 'Default Template' => '기본 템플릿', 'Default Name Servers' => '기본 네임 서버', 'Domain' => '도메인', @@ -323,7 +322,7 @@ $LANG['ko'] = array( 'Minute' => '분', 'Command' => '명령어', 'Package Name' => '패키지 이름', - 'Netmask' => '넷마스크', + 'Netmask' => '넷마슴크', 'Interface' => '인터페이스', 'Shared' => '공유된', 'Assigned user' => '부여 된 사용자', @@ -357,7 +356,7 @@ $LANG['ko'] = array( 'IP address' => 'IP 주소', 'netmask' => '넷마스크', 'interface' => '인터페이스', - 'assigned user' => '부여된 사용자', + 'assigned user' => '부여 된 사용자', 'ns1' => 'NS1', 'ns2' => 'NS2', 'user' => '사용자', @@ -387,7 +386,7 @@ $LANG['ko'] = array( 'Port' => '포트', 'Comment' => '댓글', 'Banlist' => '차단 목록', - 'ranges are acceptable' => '허용할 수 있는 범위', + 'ranges are acceptable' => '허용 가능한 범위', 'CIDR format is supported' => 'CIDR 형식이 지원됩니다', 'ACCEPT' => '허용', 'DROP' => '드롭', @@ -475,18 +474,18 @@ $LANG['ko'] = array( 'DELETE_DATABASE_CONFIRMATION' => '정말로 %s 데이터베이스를 삭제 하시겠습니까?', 'SUSPEND_DATABASE_CONFIRMATION' => '정말로 %s 데이터베이스를 정지 시키시겠습니까?', 'UNSUSPEND_DATABASE_CONFIRMATION' => '정말로 %s 데이터베이스의 정지를 해제 하시겠습니까?', - 'DELETE_CRON_CONFIRMATION' => '정말로 Cron 작업을 삭제 하시겠습니까?', - 'SUSPEND_CRON_CONFIRMATION' => '정말로 Cron 작업을 정지 시키겠습니까?', - 'UNSUSPEND_CRON_CONFIRMATION' => '정말로 Cron 작업의 정지를 해제 하시겠습니까?', - 'DELETE_BACKUP_CONFIRMATION' => '%s 백업을 삭제 하시겠습니까?', - 'DELETE_EXCLUSION_CONFIRMATION' => '%s 예외를 삭제 하시겠습니까?', + 'DELETE_CRON_CONFIRMATION' => '정말로 Cron 작업을 삭제 하시려는게 맞습니까?', + 'SUSPEND_CRON_CONFIRMATION' => '정말로 Cron 작업을 정지 시키시려는게 맞습니까?', + 'UNSUSPEND_CRON_CONFIRMATION' => '정말로 Cron 작업의 정지를 해제 하시려는게 맞습니까?', + 'DELETE_BACKUP_CONFIRMATION' => '%s 백업을 삭제 하시려는게 맞습니까?', + 'DELETE_EXCLUSION_CONFIRMATION' => '%s 예외를 삭제 하시려는게 맞습니까?', 'DELETE_PACKAGE_CONFIRMATION' => '정말로 %s 패키지를 삭제 하시겠습니까?', 'DELETE_IP_CONFIRMATION' => '정말로 %s IP 주소를 삭제 하시겠습니까?', - 'DELETE_RULE_CONFIRMATION' => '정말로 #%s 규칙을 삭제 하시겠습니까?', - 'SUSPEND_RULE_CONFIRMATION' => '정말로 #%s 규칙을 정지 하시겠습니까?', - 'UNSUSPEND_RULE_CONFIRMATION' => '정말로 #%s 규칙의 정지를 해제 하시겠습니까?', + 'DELETE_RULE_CONFIRMATION' => '정말로 #%s 규칙을 삭제하시려는게 맞습니까?', + 'SUSPEND_RULE_CONFIRMATION' => '정말로 #%s 규칙을 정지 시키시려는게 맞습니까?', + 'UNSUSPEND_RULE_CONFIRMATION' => '정말로 #%s 규칙의 정지를 해제 시키시려는게 맞습니까?', 'LEAVE_PAGE_CONFIRMATION' => '페이지를 나가시겠습니까?', - 'RESTART_CONFIRMATION' => '%s을(를) 재시작 하시려는게 맞습니까?', + 'RESTART_CONFIRMATION' => '%s을/를 재시작 하시려는게 맞습니까?', 'Welcome' => '환영합니다', 'LOGGED_IN_AS' => '%s 사용자로 로그인 됨', 'Error' => 'Error', @@ -523,7 +522,7 @@ $LANG['ko'] = array( 'Database Credentials' => '데이터베이스 정보', 'DATABASE_READY' => "데이터베이스가 성공적으로 생성되었습니다.\n\데이터베이스: %s\n사용자: %s\n비밀번호: %s\n\n--\nVesta 제어판\n", - 'forgot password' => '비밀번호 잊음', + 'forgot password' => '비밀번호 잊기', 'Confirm' => '확인', 'New Password' => '새 비밀번호', 'Confirm Password' => '비밀번호 확인', @@ -532,7 +531,7 @@ $LANG['ko'] = array( 'RESET_NOTICE' => '', 'RESET_CODE_SENT' => '비밀번호 초기화 코드가 이메일 주소로 전송되었습니다
', 'MAIL_RESET_SUBJECT' => '%s에서의 비밀번호 초기화', - 'PASSWORD_RESET_REQUEST' => "제어판 비밀번호를 초기화 하기 위해서, 다음의 링크로 접속해주세요:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n또는, 다음의 주소로 간 뒤 https://%s/reset/?action=code&user=%s 다음의 초기화 코드를 입력해주세요:\n%s\n\n만약 비밀번호 초기화를 요청하지 않으셨다면, 이 메시지를 무시해주세요.\n\n--\nVesta 제어판\n", + 'PASSWORD_RESET_REQUEST' => "제어판 비밀번호를 초기화 하기 위해서, 다음의 링크로 접속해주세요:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n또는, 다음의 주소로 가주시고 https://%s/reset/?action=code&user=%s 다음의 초기화 코드를 입력해주세요:\n%s\n\n만약 비밀번호 초기화를 요청하지 않으셨다면, 이 메시지를 무시해주세요.\n\n--\nVesta 제어판\n", 'Jan' => '1월', 'Feb' => '2월', @@ -558,16 +557,15 @@ $LANG['ko'] = array( 'DNS Server' => 'DNS 서버', 'DNS Cluster' => 'DNS 클러스터', 'MAIL Server' => 'MAIL 서버', - 'Antivirus' => '바이러스 필터링', - 'AntiSpam' => '스팸 필터링', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', + 'Antivirus' => '안티바이러스', + 'AntiSpam' => '안티스팸', 'Webmail URL' => '웹메일 주소', 'MySQL Support' => 'MySQL 지원', 'phpMyAdmin URL' => 'phpMyAdmin 주소', 'PostgreSQL Support' => 'PostgreSQL 지원', 'phpPgAdmin URL' => 'phpPgAdmin 주소', - 'Maximum Number Of Databases' => '최대 데이터베이스 개수', - 'Current Number Of Databases' => '현재 데이터베이스 개수', + 'Maximum Number Of Databases' => '최대 데이터베이스 숫자', + 'Current Number Of Databases' => '현재 데이터베이스 숫자', 'Local backup' => '로컬 백업', 'Compression level' => '압축 수준', 'Directory' => '폴더', @@ -635,8 +633,8 @@ $LANG['ko'] = array( 'Delete items' => '항목 삭제', 'Copy files' => '항목 복사', 'Move files' => '항목 이동', - 'Are you sure you want to copy' => '정말 복사하시겠습니까', - 'Are you sure you want to move' => '정말 이동하시겠습니까', + 'Are you sure you want to copy' => '정말 복사하시겠습니까?', + 'Are you sure you want to move' => '정말 이동하시겠습니까?', 'Are you sure you want to delete' => '정말 삭제하시겠습니까', 'into' => '안에', 'existing files will be replaced' => '존재하는 파일들은 대체 될 것입니다', @@ -737,7 +735,7 @@ $LANG['ko'] = array( 'webalizer' => 'Webalizer', 'awstats' => 'Awstats', - 'Vesta SSL' => 'Vesta 인증서', + 'Vesta SSL' => 'Vesta SSL', 'SUBJECT' => '주체', 'ALIASES' => '별칭', 'NOT_BEFORE' => '유효 기간(시작)', @@ -756,5 +754,5 @@ $LANG['ko'] = array( 'maximum characters length, including prefix' => '최대 길이는 접두사를 포함하여 %s자입니다.', 'Email Credentials' => '이메일 자격증명', - + ); diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 3b4fde10..40274f5f 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -16,7 +16,6 @@ $LANG['nl'] = array( 'Services' => 'Processen', 'Firewall' => 'Firewall', 'Updates' => 'Updates', - 'Apps' => 'Applicaties', 'Log in' => 'Inloggen', 'Log out' => 'Uitloggen', @@ -198,7 +197,6 @@ $LANG['nl'] = array( 'SSL Home Directory' => 'SSL Map', 'Lets Encrypt Support' => 'Lets Encrypt Ondersteuning', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Het certificaat wordt automatisch aangemaakt in 5 minuten', 'Proxy Support' => 'Proxy Ondersteuning', 'Proxy Extensions' => 'Proxy Extensies', @@ -564,7 +562,6 @@ $LANG['nl'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', @@ -759,5 +756,5 @@ $LANG['nl'] = array( 'maximum characters length, including prefix' => 'maximaal %s karakters lang, inclusief prefix', - 'Email Credentials' => 'E-mailreferenties', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/no.php b/web/inc/i18n/no.php index 30cc9306..45c23f22 100644 --- a/web/inc/i18n/no.php +++ b/web/inc/i18n/no.php @@ -196,7 +196,6 @@ $LANG['no'] = array( 'SSL Home Directory' => 'SSL Hjem', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Støtte', 'Proxy Extensions' => 'Proxy Utvidelser', @@ -561,7 +560,6 @@ $LANG['no'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/pl.php b/web/inc/i18n/pl.php index a6376c1f..23c8016c 100644 --- a/web/inc/i18n/pl.php +++ b/web/inc/i18n/pl.php @@ -196,7 +196,6 @@ $LANG['pl'] = array( 'SSL Home Directory' => 'Folder główny SSL', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Wsparcie dla Proxy', 'Proxy Extensions' => 'Rozszerzenia Proxy', @@ -561,7 +560,6 @@ $LANG['pl'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/pt-BR.php b/web/inc/i18n/pt-BR.php index b6716ef0..686af900 100644 --- a/web/inc/i18n/pt-BR.php +++ b/web/inc/i18n/pt-BR.php @@ -195,7 +195,6 @@ $LANG['pt-BR'] = array( 'SSL Home Directory' => 'Diretório Home SSL', 'Lets Encrypt Support' => 'Suporte Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Seu certificado será gerado automaticamente em 5 minutos', 'Proxy Support' => 'Suporte ao Proxy', 'Proxy Extensions' => 'Extensões do Proxy', @@ -560,7 +559,6 @@ $LANG['pt-BR'] = array( 'MAIL Server' => 'Servidor de E-MAIL', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'Suporte MySQL', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/pt.php b/web/inc/i18n/pt.php index 57366dbc..ec1eb670 100644 --- a/web/inc/i18n/pt.php +++ b/web/inc/i18n/pt.php @@ -195,7 +195,6 @@ $LANG['pt'] = array( 'SSL Home Directory' => 'Diretório Home SSL', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Suporte ao Proxy', 'Proxy Extensions' => 'Extenções do Proxy', @@ -560,7 +559,6 @@ $LANG['pt'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/ro.php b/web/inc/i18n/ro.php index 4b4104bd..0a9e93e3 100644 --- a/web/inc/i18n/ro.php +++ b/web/inc/i18n/ro.php @@ -197,7 +197,6 @@ $LANG['ro'] = array( 'SSL Home Directory' => 'Director SSL', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Suport Proxy', 'Proxy Extensions' => 'Extensii Proxy', @@ -562,7 +561,6 @@ $LANG['ro'] = array( 'MAIL Server' => 'Server MAIL', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Foloseşte certificatul SSL din domeniul WEB', 'Webmail URL' => 'URL Webmail', 'MySQL Support' => 'Suport MySQL', 'phpMyAdmin URL' => 'URL phpMyAdmin', diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index ed8f116d..22a9b645 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -63,10 +63,10 @@ $LANG['ru'] = array( 'Search' => 'Поиск', 'Add one more FTP Account' => 'Добавить еще один FTP аккаунт', 'Overall Statistics' => 'Сводная статистика', - 'Daily' => 'День', - 'Weekly' => 'Неделя', - 'Monthly' => 'Месяц', - 'Yearly' => 'Год', + 'Daily' => 'Ежедневно', + 'Weekly' => 'Еженедельно', + 'Monthly' => 'Ежемесячно', + 'Yearly' => 'Ежегодно', 'Add' => 'Добавить', 'Back' => 'Назад', 'Save' => 'Сохранить', @@ -197,7 +197,6 @@ $LANG['ru'] = array( 'SSL Home Directory' => 'Директория SSL', 'Lets Encrypt Support' => 'Поддержка Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Сертификат будет автоматически создан в течение 5-ти минут', 'Proxy Support' => 'Поддержка Proxy', 'Proxy Extensions' => 'Обработка Proxy', @@ -562,7 +561,6 @@ $LANG['ru'] = array( 'MAIL Server' => 'MAIL Сервер', 'Antivirus' => 'Антивирус', 'AntiSpam' => 'АнтиСпам', - 'Use Web Domain SSL Certificate' => 'Использовать SSL сертификат веб домена', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'Поддержка MySQL', 'phpMyAdmin URL' => 'phpMyAdmin URL', @@ -581,6 +579,7 @@ $LANG['ru'] = array( 'Vesta Control Panel Plugins' => 'Плагины Vesta Control Panel', 'preview' => 'предпросмотр', 'Reseller Role' => 'Реселлер', + 'Reseller Role' => 'Реселлер', 'Web Config Editor' => 'Веб Редактор Конфигов', 'Template Manager' => 'Менеджер Шаблонов', 'Backup Migration Manager' => 'Менеджер Миграции Бэкапов', diff --git a/web/inc/i18n/se.php b/web/inc/i18n/se.php index fc70440e..87bb1910 100644 --- a/web/inc/i18n/se.php +++ b/web/inc/i18n/se.php @@ -195,7 +195,6 @@ $LANG['se'] = array( 'SSL Home Directory' => 'Hemmakatalog för SSL', 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Nginx-stöd', 'Proxy Extensions' => 'Nginx-tillägg', @@ -560,7 +559,6 @@ $LANG['se'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/sr.php b/web/inc/i18n/sr.php index 8c437ab9..50dc766d 100644 --- a/web/inc/i18n/sr.php +++ b/web/inc/i18n/sr.php @@ -1,7 +1,7 @@ 'BACKUP', 'LOGIN' => 'LOGIN', - 'RESET PASSWORD' => 'PROMENA PASSWORDA', + 'RESET PASSWORD' => 'PROMENA ŠIFRE', 'SEARCH' => 'PRETRAGA', 'PACKAGE' => 'PAKET', 'RRD' => 'RRD', @@ -119,7 +119,7 @@ $LANG['sr'] = array( 'Editing DNS Domain' => 'Izmena DNS-a za domen', 'Adding DNS Record' => 'Dodavanje DNS zapisa (DNS record)', 'Editing DNS Record' => 'Izmena DNS zapisa (DNS record)', - 'Adding Mail Domain' => 'Dodavanje Mail-a za domene', + 'Adding Mail Domain' => 'Dodavanje Mail-a za domee', 'Editing Mail Domain' => 'Izmena Mail-a za domen', 'Adding Mail Account' => 'Dodavanje Mail naloga', 'Editing Mail Account' => 'Izmena Mail naloga', @@ -195,7 +195,6 @@ $LANG['sr'] = array( 'SSL Home Directory' => 'SSL direktorijum', 'Lets Encrypt Support' => 'Lets Encrypt podrška', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Vaš sertifikat će biti automatski generisan za 5 minuta', 'Proxy Support' => 'Proxy podrška', 'Proxy Extensions' => 'Proxy ekstenzije', @@ -279,8 +278,8 @@ $LANG['sr'] = array( 'Release' => 'Distribucija', 'Architecture' => 'Arhitektura', 'Object' => 'Predmet', - 'Username' => 'Username', - 'Password' => 'Password', + 'Username' => 'Korisničko ime', + 'Password' => 'Šifra', 'Email' => 'Email', 'Package' => 'Paket', 'Language' => 'Jezik', @@ -304,7 +303,7 @@ $LANG['sr'] = array( 'Statistics Authorization' => 'Autorizacija za statistiku', 'Statistics Auth' => 'Autorizacija statistiku', 'Account' => 'Nalog', - 'Prefix will be automaticaly added to username' => 'Prefiks %s će automatski biti pridodat username-u', + 'Prefix will be automaticaly added to username' => 'Prefiks %s će automatski biti pridodat korisničkom imenu', 'Send FTP credentials to email' => 'Pošalji FTP login podatke na mail adresu', 'Expiration Date' => 'Datum isteka', 'YYYY-MM-DD' => 'YYYY-MM-DD', @@ -317,7 +316,7 @@ $LANG['sr'] = array( 'Message' => 'Poruka', 'use local-part' => 'unesi samo početni deo (bez @domen.com dela)', 'one or more email addresses' => 'jedna ili više email adresa', - 'Prefix will be automaticaly added to database name and database user' => 'Prefiks %s se automatski dodaje na ime baze i na username baze', + 'Prefix will be automaticaly added to database name and database user' => 'Prefiks %s se automatski dodaje na ime baze i na korisničko ime baze', 'Database' => 'Baza podataka', 'Type' => 'Tip', 'Minute' => 'Minut', @@ -347,8 +346,8 @@ $LANG['sr'] = array( 'aliases' => 'aliasa', 'records' => 'zapisa', 'jobs' => 'jobs', - 'username' => 'username', - 'password' => 'password', + 'username' => 'korisničko ime', + 'password' => 'šifra', 'type' => 'tip', 'charset' => 'charset', 'domain' => 'domen', @@ -367,10 +366,10 @@ $LANG['sr'] = array( 'account' => 'nalog', 'ssl certificate' => 'ssl certifikat', 'ssl key' => 'ssl ključ', - 'stats user password' => 'password za korisničku statistiku', - 'stats username' => 'stats username', - 'stats password' => 'stats password', - 'ftp user password' => 'ftp password', + 'stats user password' => 'šifra za korisničku statistiku', + 'stats username' => 'stats korisničko ime', + 'stats password' => 'stats šifra', + 'ftp user password' => 'ftp šifra', 'ftp user' => 'ftp username', 'Last 70 lines of %s.%s.log' => 'Zadnjih 70. redova od %s.%s.log', 'AccessLog' => 'AccessLog', @@ -490,12 +489,12 @@ $LANG['sr'] = array( 'Welcome' => 'Dobrodošli', 'LOGGED_IN_AS' => 'Ulogovani ste kao %s', 'Error' => 'Greška', - 'Invalid username or password' => 'Pogrešni login podaci', - 'Invalid username or code' => 'Pogrešan username ili kod', + 'Invalid username or password' => 'Pogrešani login podaci', + 'Invalid username or code' => 'Pogrešno korisničko ime ili kod', 'Passwords not match' => 'Passwordi se ne poklapaju', 'Please enter valid email address.' => 'Potrebno je uneti validnu email adresu.', 'Field "%s" can not be blank.' => 'Polja "%s" ne smeju biti prazna.', - 'Password is too short.' => 'Password je previše kratak (najmanje 6 znakova)', + 'Password is too short.' => 'Šifra je previše kratka (najmanje 6 znakova)', 'Error code:' => 'Greška koda: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" nije uspelo', 'IP address is in use' => 'IP adresa se već koristi', @@ -511,28 +510,28 @@ $LANG['sr'] = array( 'CRON_EXCLUSIONS' => 'Da bi izuzeo sve cron-job-ove unesi zvezdicu *', 'USER_EXCLUSIONS' => 'Unesi direktorijume, po jedan u svakoj liniji. Da bi izuzeo sve direktorijume unesi zvezdicu *', - 'Welcome to Vesta Control Panel' => 'Dobrodošli u myVesta kontrolni panel', - 'MAIL_FROM' => 'myVesta kontrolni panel ', - 'GREETINGS_GORDON_FREEMAN' => "Poštovani %s %s,\n", - 'GREETINGS' => "Poštovani,\n", - 'ACCOUNT_READY' => "Vaš hosting nalog je kreiran i spreman za korišćenje.\n\nhttps://%s/login/\nUsername: %s\nPassword: %s\n\n--\nmyVesta kontrolni panel\n", + 'Welcome to Vesta Control Panel' => 'Dobrodošli u Vesta kontrolni panel', + 'MAIL_FROM' => 'Vesta kontrolni panel ', + 'GREETINGS_GORDON_FREEMAN' => "Poštovanje, %s %s,\n", + 'GREETINGS' => "Poštovanje,\n", + 'ACCOUNT_READY' => "Vaš hosting nalog je kreiran i spreman za korišćenje.\n\nhttps://%s/login/\nKorisničko ime: %s\nŠifra: %s\n\n--\nVesta kontrolni panel\n", 'FTP login credentials' => 'FTP podaci', - 'FTP_ACCOUNT_READY' => "FTP nalog je kreiran. Koristite sledeće podatke kako biste se ulogovali:\n\nHostname: %s\nUsername: %s_%s\nPassword: %s\n\n--\nmyVesta kontrolni panel\n", + 'FTP_ACCOUNT_READY' => "FTP nalog je kreiran. Koristite sledeće podatke kako biste se ulogovali:\n\nHostname: %s\nKorisničko ime: %s_%s\nŠifra: %s\n\n--\nVesta kontrolni panel\n", 'Database Credentials' => 'Podaci baze podataka', - 'DATABASE_READY' => "Baza podataka je kreirana. Koristite sledeće podatke kako biste se ulogovali:\n\nDatabase: %s\nUsername: %s\nPassword: %s\n%s\n\n--\nmyVesta kontrolni panel\n", + 'DATABASE_READY' => "Baza podataka je kreirana. Koristite sledeće podatke kako biste se ulogovali:\n\nDatabase: %s\nKorisničko ime: %s\nŠifra: %s\n%s\n\n--\nVesta kontrolni panel\n", - 'forgot password' => 'zaboravljen password', + 'forgot password' => 'zaboravljena šifra', 'Confirm' => 'Potvrditi', - 'New Password' => 'Nov password', - 'Confirm Password' => 'Potvrdi password', + 'New Password' => 'Nova šifra', + 'Confirm Password' => 'Potvrdi šifru', 'Reset' => 'Reset', 'Reset Code' => 'Resetuj kod', 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => 'Kod resetovanog passworda je poslat na vašu email adresu
', - 'MAIL_RESET_SUBJECT' => 'Password je resetovan %s', - 'PASSWORD_RESET_REQUEST' => "Za resetovanje passworda sledite link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nIli, možete ići na https://%s/reset/?action=code&user=%s i uneti kod:\n%s\n\nAko niste tražili resetovanje passworda, ignorišite ovu poruku i prihvatite naše izvinjenje.\n\n--\nmyVesta kontrolni panel\n", + 'RESET_CODE_SENT' => 'Kod resetovane šifre je poslat na vašu email adresu
', + 'MAIL_RESET_SUBJECT' => 'Šifra je resetovana %s', + 'PASSWORD_RESET_REQUEST' => "Za resetovanje šifre sledite link:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nIli, možete ići na https://%s/reset/?action=code&user=%s i uneti kod:\n%s\n\nAko niste tražili resetovanje šifre, ignorišite ovu poruku i prihvatite naše izvinjenje.\n\n--\nVesta kontrolni panel\n", 'Jan' => 'Jan', 'Feb' => 'Feb', @@ -560,7 +559,6 @@ $LANG['sr'] = array( 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Koristi Web Domain SSL sertifikat', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'MySQL podrška', 'phpMyAdmin URL' => 'phpMyAdmin URL', @@ -756,7 +754,4 @@ $LANG['sr'] = array( 'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix', 'Email Credentials' => 'Email lozinka i podešavanja', - - 'restore selected' => 'vrati selektovano', - 'First select what to restore' => 'Prvo selektujte šta tačno želite da vratite' ); diff --git a/web/inc/i18n/th.php b/web/inc/i18n/th.php index 63350f02..96f23bb5 100644 --- a/web/inc/i18n/th.php +++ b/web/inc/i18n/th.php @@ -3,7 +3,6 @@ * Vesta language file * Language: Thai ( Thailand ) * thatphon05@gmail.com - * phinitnan_c@xtony.us */ $LANG['th'] = array( @@ -12,10 +11,10 @@ $LANG['th'] = array( 'IP' => 'IP', 'Graphs' => 'กราฟ', 'Statistics' => 'สถิติ', - 'Log' => 'บันทึกเหตุการณ์', - 'Server' => 'เซิร์ฟเวอร์', + 'Log' => 'Log', + 'Server' => 'เซิฟเวอร์', 'Services' => 'บริการ', - 'Firewall' => 'Firewall', + 'Firewall' => 'ไฟร์วอลล์', 'Updates' => 'อัพเดท', 'Log in' => 'เข้าสู่ระบบ', 'Log out' => 'ออกจากระบบ', @@ -23,47 +22,47 @@ $LANG['th'] = array( 'USER' => 'ผู้ใช้', 'WEB' => 'เว็บ', 'DNS' => 'DNS', - 'MAIL' => 'เมล', + 'MAIL' => 'เมล์', 'DB' => 'ฐานข้อมูล', 'CRON' => 'CRON', 'BACKUP' => 'สำรองข้อมูล', 'LOGIN' => 'เข้าสู่ระบบ', - 'RESET PASSWORD' => 'ตั้งรหัสผ่านใหม่', + 'RESET PASSWORD' => 'รีเซ็ตรหัสผ่าน', 'SEARCH' => 'ค้นหา', 'PACKAGE' => 'แพ็กเกจ', 'RRD' => 'RRD', - 'STATS' => 'สถิติ', - 'LOG' => 'บันทึกเหตุการณ์', + 'STATS' => 'STATS', + 'LOG' => 'ล็อก', 'UPDATES' => 'อัพเดท', - 'FIREWALL' => 'FIREWALL', - 'SERVER' => 'เซิร์ฟเวอร์', + 'FIREWALL' => 'ไฟร์วอลล์', + 'SERVER' => 'เซิฟเวอร์', 'MEMORY' => 'หน่วยความจำ', - 'DISK' => 'พื้นที่เก็บข้อมูล', + 'DISK' => 'พื้นที่จัดเก็บข้อมูล', 'NETWORK' => 'เครือข่าย', - 'Web Log Manager' => 'ตัวจัดการบันทึกเหตุการณ์เว็บ', + 'Web Log Manager' => 'ตัวจัดการ Web Log', 'no notifications' => 'ไม่มีการแจ้งเตือน', 'Add User' => 'เพิ่มผู้ใช้', 'Add Domain' => 'เพิ่มโดเมน', - 'Add Web Domain' => 'เพิ่มโดเมนสำหรับเว็บ', - 'Add DNS Domain' => 'เพิ่มโดเมนสำหรับ DNS', - 'Add DNS Record' => 'เพิ่มรายการ DNS', - 'Add Mail Domain' => 'เพิ่มโดเมนสำหรับเมล', - 'Add Mail Account' => 'เพิ่มบัญชีเมล', + 'Add Web Domain' => 'เพิ่ม Web Domain', + 'Add DNS Domain' => 'เพิ่ม DNS Domain', + 'Add DNS Record' => 'เพิ่ม DNS Record', + 'Add Mail Domain' => 'เพิ่ม Mail Domain', + 'Add Mail Account' => 'เพิ่มบัญชีเมล์', 'Add Database' => 'เพิ่มฐานข้อมูล', - 'Add Cron Job' => 'เพิ่มงาน CRON', - 'Create Backup' => 'สร้างข้อมูลสำรอง', - 'Configure' => 'ตั้งค่า', + 'Add Cron Job' => 'เพิ่ม Cron Job', + 'Create Backup' => 'สร้างการสำรองข้อมูล', + 'Configure' => 'ปรับแต่ง', 'Restore All' => 'คืนค่าทั้งหมด', 'Add Package' => 'เพิ่มแพ็กเกจ', - 'Add IP' => 'เพิ่ม IP', - 'Add Rule' => 'เพิ่มกฎ', - 'Ban IP Address' => 'แบนหมายเลข IP', + 'Add IP' => 'เพิ่ม IP Address', + 'Add Rule' => 'เพิ่ม Rule', + 'Ban IP Address' => 'แบน IP Address', 'Search' => 'ค้นหา', - 'Add one more FTP Account' => 'เพิ่ม FTP อีกหนึ่งบัญชี', - 'Overall Statistics' => 'สถิติภาพรวม', + 'Add one more FTP Account' => 'เพิ่มอีกบัญชี', + 'Overall Statistics' => 'สถิติโดยรวม', 'Daily' => 'รายวัน', 'Weekly' => 'รายสัปดาห์', 'Monthly' => 'รายเดือน', @@ -74,28 +73,28 @@ $LANG['th'] = array( 'Submit' => 'ส่งข้อมูล', 'toggle all' => 'เลือกทั้งหมด', - 'apply to selected' => 'นำไปใช้กับรายการที่เลือก', - 'rebuild' => 'ใช้การตั้งค่าล่าสุด', - 'rebuild web' => 'ใช้การตั้งค่าเว็บล่าสุด', - 'rebuild dns' => 'ใช้การตั้งค่า DNS ล่าสุด', - 'rebuild mail' => 'ใช้การตั้งค่าเมลล่าสุด', - 'rebuild db' => 'ใช้การตั้งค่าฐานข้อมูลล่าสุด', - 'rebuild cron' => 'ใช้การตั้งค่า CRON ล่าสุด', + 'apply to selected' => 'นำไปใช้กับที่เลือก', + 'rebuild' => 'สร้างใหม่', + 'rebuild web' => 'สร้างเว็บใหม่', + 'rebuild dns' => 'สร้าง DNS ใหม่', + 'rebuild mail' => 'สร้างเมล์ใหม่', + 'rebuild db' => 'สร้างฐานข้อมูลใหม่', + 'rebuild cron' => 'สร้าง Cron ใหม่', 'update counters' => 'อัพเดทตัวนับ', 'suspend' => 'ระงับการใช้งาน', - 'unsuspend' => 'ยกเลิกระงับการใช้งาน', + 'unsuspend' => 'เปิดใช้งาน', 'delete' => 'ลบ', - 'show per user' => 'แสดงผลต่อผู้ใช้', - 'login as' => 'เข้าสู่ระบบในนาม', + 'show per user' => 'แสดงต่อผู้ใช้', + 'login as' => 'เข้าสู่ระบบด้วย', 'logout' => 'ออกจากระบบ', 'edit' => 'แก้ไข', 'open webstats' => 'เปิดสถิติเว็บ', - 'view logs' => 'ดูบันทึกเหตุการณ์', - 'list records' => 'แสดงรายการ', - 'add record' => 'เพิ่มรายการ', - 'list accounts' => 'แสดงบัญชี', + 'view logs' => 'ดู Logs', + 'list records' => 'รายการ %s records', + 'add record' => 'เพิ่ม Record', + 'list accounts' => 'รายการ %s บัญชี', 'add account' => 'เพิ่มบัญชี', - 'open webmail' => 'เปิดเว็บเมล', + 'open webmail' => 'เปิด Webmail', 'list fail2ban' => 'รายการ fail2ban', 'open %s' => 'เปิด %s', 'download' => 'ดาวน์โหลด', @@ -107,48 +106,48 @@ $LANG['th'] = array( 'update' => 'อัพเดท', 'generate' => 'สร้าง', 'Generate CSR' => 'สร้าง CSR', - 'reread IP' => 'อ่าน IP ซ้ำ', + 'reread IP' => 'อ่าน IP ใหม่', 'enable autoupdate' => 'เปิดการอัพเดทอัตโนมัติ', 'disable autoupdate' => 'ปิดการอัพเดทอัตโนมัติ', - 'turn on notifications' => 'เปิดการแจ้งเตือน', - 'turn off notifications' => 'ปิดการแจ้งเตือน', + 'turn on notifications' => 'เปิดใช้งานการแจ้งเตือน', + 'turn off notifications' => 'ปิดใช้งานการแจ้งเตือน', 'configure' => 'ปรับแต่ง', 'Adding User' => 'เพิ่มผู้ใช้', 'Editing User' => 'แก้ไขผู้ใช้', 'Adding Domain' => 'เพิ่มโดเมน', 'Editing Domain' => 'แก้ไขโดเมน', - 'Adding DNS Domain' => 'เพิ่ม DNS สำหรับโดเมน', - 'Editing DNS Domain' => 'แก้ไข DNS สำหรับโดเมน', - 'Adding DNS Record' => 'เพิ่มรายการ DNS', - 'Editing DNS Record' => 'แก้ไขรายการ DNS', - 'Adding Mail Domain' => 'เพิ่มโดเมนสำหรับเมล', - 'Editing Mail Domain' => 'แก้ไขโดเมนสำหรับเมล', - 'Adding Mail Account' => 'เพิ่มบัญชีเมล', - 'Editing Mail Account' => 'แก้ไขบัญชีเมล', + 'Adding DNS Domain' => 'เพิ่ม DNS Domain', + 'Editing DNS Domain' => 'แก้ไข DNS Domain', + 'Adding DNS Record' => 'เพิ่ม DNS Record', + 'Editing DNS Record' => 'แก้ไข DNS Record', + 'Adding Mail Domain' => 'เพิ่ม Mail Domain', + 'Editing Mail Domain' => 'แก้ไข Mail Domain', + 'Adding Mail Account' => 'เพิ่มบัญชีเมล์', + 'Editing Mail Account' => 'แก้ไขบัญชีเมล์', 'Adding database' => 'เพิ่มฐานข้อมูล', - 'Editing Cron Job' => 'แก้ไขงาน CRON', - 'Adding Cron Job' => 'เพิ่มงาน CRON', + 'Editing Cron Job' => 'แก้ไข Cron Job', + 'Adding Cron Job' => 'เพิ่ม Cron Job', 'Editing Database' => 'แก้ไขฐานข้อมูล', 'Adding Package' => 'เพิ่มแพ็กเกจ', 'Editing Package' => 'แก้ไขแพ็กเกจ', - 'Adding IP address' => 'เพิ่มที่อยู่ IP', - 'Editing IP Address' => 'แก้ไขที่อยู่ IP', + 'Adding IP address' => 'เพิ่ม IP address', + 'Editing IP Address' => 'แก้ไข IP Address', 'Editing Backup Exclusions' => 'แก้ไขการยกเว้นสำรองข้อมูล', 'Generating CSR' => 'สร้าง CSR', 'Listing' => 'รายการ', - 'Search Results' => 'ผลลัพธ์การค้นหา', - 'Adding Firewall Rule' => 'การเพิ่มกฎ Firewall', - 'Editing Firewall Rule' => 'การแก้ไขกฎ Firewall', - 'Adding IP Address to Banlist' => 'เพิ่มที่อยู่ IP ในรายการแบน', + 'Search Results' => 'ผลลัพธ์ของการค้นหา', + 'Adding Firewall Rule' => 'การเพิ่ม Firewall Rule', + 'Editing Firewall Rule' => 'การแก้ไข Firewall Rule', + 'Adding IP Address to Banlist' => 'การแบน IP Address', 'active' => 'เปิดใช้งาน', 'spnd' => 'ระงับการใช้งาน', 'suspended' => 'ระงับการใช้งานแล้ว', 'running' => 'กำลังทำงาน', 'stopped' => 'หยุดทำงานแล้ว', - 'outdated' => 'ตกรุ่นแล้ว', - 'updated' => 'อัพเดทแล้ว', + 'outdated' => 'ตกรุ่น', + 'updated' => 'อัพเดท', 'yes' => 'ใช่', 'no' => 'ไม่ใช่', @@ -165,40 +164,39 @@ $LANG['th'] = array( 'minutes' => 'นาที', 'month' => 'เดือน', 'package' => 'แพ็กเกจ', - 'Bandwidth' => 'ปริมาณรับส่งข้อมูล', + 'Bandwidth' => 'แบนด์วิดธ์', 'Disk' => 'พื้นที่จัดเก็บข้อมูล', 'Web' => 'เว็บ', - 'Mail' => 'เมล', + 'Mail' => 'เมล์', 'Databases' => 'ฐานข้อมูล', 'User Directories' => 'ไดเร็กทอรี่ของผู้ใช้', - 'Template' => 'ตัวแบบ', - 'Web Template' => 'ตัวแบบเว็บ', - 'Backend Template' => 'ตัวเแบบ Backend', - 'Proxy Template' =>'ตัวแบบ Proxy', - 'DNS Template' => 'ตัวแบบ DNS', - 'Web Domains' => 'โดเมนสำหรับเว็บ', - 'SSL Domains' => 'โดเมนสำหรับ SSL', - 'Web Aliases' => 'ชื่อแทนเว็บ', - 'per domain' => 'ต่อโดเมน', - 'DNS Domains' => 'โดเมนสำหรับ DNS', - 'DNS domains' => 'โดเมนสำหรับ DNS', - 'DNS records' => 'รายการ DNS', + 'Template' => 'Template', + 'Web Template' => 'Web Template', + 'Backend Template' => 'Backend Template', + 'Proxy Template' =>'Proxy Template', + 'DNS Template' => 'DNS Template', + 'Web Domains' => 'Web Domains', + 'SSL Domains' => 'SSL Domains', + 'Web Aliases' => 'Web Aliases', + 'per domain' => 'ต่อ Domain', + 'DNS Domains' => 'DNS Domains', + 'DNS domains' => 'DNS domains', + 'DNS records' => 'DNS records', 'Name Servers' => 'Name Servers', - 'Mail Domains' => 'โดเมนสำหรับเมล', - 'Mail Accounts' => 'บัญชีเมล', - 'Cron Jobs' => 'งาน CRON', - 'SSH Access' => 'การเข้าใช้ SSH', - 'IP Address' => 'ที่อยู่ IP', - 'IP Addresses' => 'ที่อยู่ IP', + 'Mail Domains' => 'Mail Domains', + 'Mail Accounts' => 'บัญชีเมล์', + 'Cron Jobs' => 'Cron Jobs', + 'SSH Access' => 'การเข้าถึง SSH', + 'IP Address' => 'IP Address', + 'IP Addresses' => 'IP Addresses', 'Backups' => 'สำรองข้อมูล', 'Backup System' => 'ระบบสำรองข้อมูล', 'backup exclusions' => 'ยกเว้นการสำรองข้อมูล', - 'template' => 'ตัวแบบ', + 'template' => 'template', 'SSL Support' => 'สนับสนุน SSL', - 'SSL Home Directory' => 'ไดเร็กทอรี่หลักของ SSL', + 'SSL Home Directory' => 'หน้าแรกของ SSL', 'Lets Encrypt Support' => 'สนับสนุน Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'ใบรับรองของคุณจะได้รับการออกโดยอัตโนมัติภายใน 5 นาที', 'Proxy Support' => 'สนับสนุน Proxy', 'Proxy Extensions' => 'ส่วนขยาย Proxy', @@ -208,17 +206,17 @@ $LANG['th'] = array( 'SOA' => 'SOA', 'TTL' => 'TTL', 'Expire' => 'หมดอายุ', - 'Records' => 'รายการ', + 'Records' => 'Records', 'Serial' => 'Serial', - 'Catchall email' => 'อีเมล Catchall', - 'AntiVirus Support' => 'สนับสนุนการป้องกันไวรัส', - 'AntiSpam Support' => 'สนับสนุนการป้องกันเมลขยะ', + 'Catchall email' => 'Catchall email', + 'AntiVirus Support' => 'สนับสนุน AntiVirus', + 'AntiSpam Support' => 'สนับสนุน AntiSpam', 'DKIM Support' => 'สนับสนุน DKIM', 'Accounts' => 'บัญชี', 'Quota' => 'โควตา', 'Autoreply' => 'ตอบกลับอัตโนมัติ', 'Forward to' => 'ส่งต่อไปยัง', - 'Do not store forwarded mail' => 'ไม่เก็บเมลที่ส่งต่อแล้วไว้', + 'Do not store forwarded mail' => 'อย่าเก็บเมล์ที่ส่งต่อไว้', 'IMAP hostname' => 'IMAP hostname', 'IMAP port' => 'IMAP port', 'IMAP security' => 'IMAP security', @@ -242,7 +240,7 @@ $LANG['th'] = array( 'Run Time' => 'เวลาทำงาน', 'Backup Size' => 'ขนาดสำรองข้อมูล', 'SYS' => 'SYS', - 'Domains' => 'โดเมน', + 'Domains' => 'Domains', 'Status' => 'สถานะ', 'shared' => 'shared', 'dedicated' => 'dedicated', @@ -255,72 +253,72 @@ $LANG['th'] = array( 'NGINX Usage' => 'การใช้ NGINX', 'MySQL Usage on localhost' => 'การใช้ MySQL บน localhost', 'PostgreSQL Usage on localhost' => 'การใช้ PostgreSQL บน localhost', - 'Bandwidth Usage eth0' => 'ขนาดการรับส่งข้อมูลของ eth0', - 'Bandwidth Usage eth1' => 'ขนาดการรับส่งข้อมูลของ eth1', + 'Bandwidth Usage eth0' => 'การใช้ แบนด์วิดธ์ ของ eth0', + 'Bandwidth Usage eth1' => 'การใช้ แบนด์วิดธ์ ของ eth1', 'Exim Usage' => 'การใช้ Exim', 'FTP Usage' => 'การใช้ FTP', 'SSH Usage' => 'การใช้ SSH', 'reverse proxy' => 'reverse proxy', - 'web server' => 'เซิร์ฟเวอร์เว็บ', - 'dns server' => 'เซิร์ฟเวอร์ dns', - 'mail server' => 'เซิร์ฟเวอร์เมล', - 'pop/imap server' => 'เซิร์ฟเวอร์ pop/imap', - 'email antivirus' => 'การป้องกันไวรัสอีเมล', - 'email antispam' => 'การป้องกันอีเมลขยะ', - 'database server' => 'เซิร์ฟเวอร์ฐานข้อมูล', - 'ftp server' => 'เซิร์ฟเวอร์ ftp', + 'web server' => 'web server', + 'dns server' => 'dns server', + 'mail server' => 'mail server', + 'pop/imap server' => 'pop/imap server', + 'email antivirus' => 'email antivirus', + 'email antispam' => 'email antispam', + 'database server' => 'database server', + 'ftp server' => 'ftp server', 'job scheduler' => 'job scheduler', 'firewall' => 'firewall', - 'brute-force monitor' => 'ดักจับ brute-force', + 'brute-force monitor' => 'ตรวจสอบการ brute-force', 'CPU' => 'CPU', 'Memory' => 'หน่วยความจำ', - 'Uptime' => 'ระบบทำงานมาแล้ว', + 'Uptime' => 'เวลาทำงาน', 'core package' => 'แพ็กเกจหลัก', - 'php interpreter' => 'ตัวแปลภาษา php', + 'php interpreter' => 'ตัวแปลคำสั่ง php', 'internal web server' => 'เว็บเซิร์ฟเวอร์ภายใน', 'Version' => 'เวอร์ชั่น', - 'Release' => 'ลำดับที่', + 'Release' => 'เวอร์ชั่นการปล่อย', 'Architecture' => 'สถาปัตยกรรม', 'Object' => 'วัตถุ', 'Username' => 'ชื่อผู้ใช้', 'Password' => 'รหัสผ่าน', - 'Email' => 'อีเมล', + 'Email' => 'อีเมล์', 'Package' => 'แพ็กเกจ', 'Language' => 'ภาษา', 'First Name' => 'ชื่อ', 'Last Name' => 'นามสกุล', 'Send login credentials to email address' => 'ชื่ออีเมล์สำหรับส่งข้อมูลการเข้าสู่ระบบ', - 'Default Template' => 'ตัวแบบเริ่มต้น', - 'Default Name Servers' => 'Name Servers เริ่มต้น', + 'Default Template' => 'Template มาตรฐาน', + 'Default Name Servers' => 'Name Servers มาตรฐาน', 'Domain' => 'โดเมน', 'DNS Support' => 'สนับสนุน DNS', - 'Mail Support' => 'สนับสนุนเมล', + 'Mail Support' => 'สนับสนุนเมล์', 'Advanced options' => 'ตัวเลือกขั้นสูง', 'Basic options' => 'ตัวเลือกพื้นฐาน', - 'Aliases' => 'ชื่อแทน', + 'Aliases' => 'Aliases', 'SSL Certificate' => 'SSL Certificate', 'SSL Key' => 'SSL Key', 'SSL Certificate Authority / Intermediate' => 'SSL Certificate Authority / Intermediate', 'SSL CSR' => 'SSL CSR', 'optional' => 'ทางเลือกเพิ่มเติม', 'internal' => 'ภายใน', - 'Statistics Authorization' => 'กำหนดสิทธิการเข้าดูสถิติ', - 'Statistics Auth' => 'ลงทะเบียนเข้าดูสถิติ', + 'Statistics Authorization' => 'การตรวจสอบสถิติ', + 'Statistics Auth' => 'รับรองความถูกต้องของสถิติ', 'Account' => 'บัญชี', - 'Prefix will be automaticaly added to username' => 'จะมีการใส่คำนำหน้าลงในชื่อผู้ใช้โดยอัตโนมัติ', - 'Send FTP credentials to email' => 'ชื่ออีเมล์สำหรับส่งรหัสผ่าน FTP', + 'Prefix will be automaticaly added to username' => 'คำนำหน้า %s จะถูกเพิ่มลงในชื่อผู้ใช้โดยอัตโนมัติ', + 'Send FTP credentials to email' => 'ชื่ออีเมล์สำหรับส่งข้อมูล FTP', 'Expiration Date' => 'วันหมดอายุ', 'YYYY-MM-DD' => 'ปี-เดือน-วัน', 'Name servers' => 'Name servers', - 'Record' => 'รายการ', + 'Record' => 'Record', 'IP or Value' => 'IP หรือ ค่า', 'Priority' => 'ลำดับความสำคัญ', - 'Record Number' => 'หมายเลขรายการ', + 'Record Number' => 'ตัวเลข record', 'in megabytes' => 'หน่วย megabytes', 'Message' => 'ข้อความ', 'use local-part' => 'ใช้ส่วนภายใน', 'one or more email addresses' => 'อย่างน้อย 1 ที่อยู่อีเมล์', - 'Prefix will be automaticaly added to database name and database user' => 'จะมีการเพิ่มคำนำหน้าชื่อฐานข้อมูลและชื่อผู้ใช้ฐานข้อมูลโดยอัตโนมัติ', + 'Prefix will be automaticaly added to database name and database user' => 'คำนำหน้า %s จะถูกเพิ่มชื่อในฐานข้อมูลและฐานข้อมูลผู้ใช้โดยอัตโนมัติ', 'Database' => 'ฐานข้อมูล', 'Type' => 'ชนิด', 'Minute' => 'นาที', @@ -329,35 +327,35 @@ $LANG['th'] = array( 'Netmask' => 'Netmask', 'Interface' => 'Interface', 'Shared' => 'แชร์', - 'Assigned user' => 'ผู้ใช้ที่กำหนดไว้', - 'Assigned domain' => 'โดเมนที่กำหนดไว้', + 'Assigned user' => 'กำหนดผู้ใช้แล้ว', + 'Assigned domain' => 'โดเมนที่กำหนด', 'NAT IP association' => 'NAT IP association', 'shell' => 'shell', - 'web domains' => 'โดเมนสำหรับเว็บ', - 'web aliases' => 'ชื่อแทนเว็บ', - 'dns records' => 'รายการ dns', - 'mail domains' => 'โดเมนสำหรับเมล', - 'mail accounts' => 'บัญชีเมล', + 'web domains' => 'web domains', + 'web aliases' => 'web aliases', + 'dns records' => 'dns records', + 'mail domains' => 'mail domains', + 'mail accounts' => 'บัญชีเมล์', 'accounts' => 'บัญชี', 'databases' => 'ฐานข้อมูล', - 'cron jobs' => 'งาน cron', + 'cron jobs' => 'cron jobs', 'backups' => 'สำรองข้อมูล', 'quota' => 'โควต้า', - 'day of week' => 'วันของสัปดาห์', - 'cmd' => 'คำสั่ง', + 'day of week' => 'วันในสัปดาห์', + 'cmd' => 'cmd', 'users' => 'ผู้ใช้', 'domains' => 'โดนเมน', - 'aliases' => 'ชื่อแทน', - 'records' => 'รายการ', - 'jobs' => 'งาน', + 'aliases' => 'aliases', + 'records' => 'records', + 'jobs' => 'jobs', 'username' => 'ชื่อผู้ใช้', 'password' => 'รหัสผ่าน', 'type' => 'ชนิด', 'charset' => 'charset', 'domain' => 'โดเมน', 'ip' => 'ip', - 'ip address' => 'ที่อยู่ ip', - 'IP address' => 'ที่อยู่ IP', + 'ip address' => 'ip address', + 'IP address' => 'IP address', 'netmask' => 'netmask', 'interface' => 'interface', 'assigned user' => 'กำหนดผู้ใช้แล้ว', @@ -370,11 +368,11 @@ $LANG['th'] = array( 'account' => 'บัญชี', 'ssl certificate' => 'ssl certificate', 'ssl key' => 'ssl key', - 'stats user password' => 'รหัสผ่านของผู้ใช้สถิติ', - 'stats username' => 'ชื่อผู้ใช้สถิติ', - 'stats password' => 'รหัสผ่านสถิติ', - 'ftp user password' => 'รหัสผ่านของผู้ใช้สำหรับ ftp', - 'ftp user' => 'ผู้ใช้ ftp', + 'stats user password' => 'stats user password', + 'stats username' => 'stats username', + 'stats password' => 'stats password', + 'ftp user password' => 'FTP ชื่อผู้ใช้ รหัสผ่าน', + 'ftp user' => 'ผู้ใช้ FTP', 'Last 70 lines of %s.%s.log' => '70 บรรทัดสุดท้ายของ %s.%s.log', 'AccessLog' => 'AccessLog', 'ErrorLog' => 'ErrorLog', @@ -385,13 +383,13 @@ $LANG['th'] = array( 'State / Province' => 'ถนน / แขวง', 'City / Locality' => 'เมือง / ท้องถิ่น', 'Organization' => 'องค์กร', - 'Action' => 'ดำเนินการ', + 'Action' => 'การกระทำ', 'Protocol' => 'โปรโตคอล', 'Port' => 'Port', 'Comment' => 'หมายเหตุ', 'Banlist' => 'รายชื่อที่โดนแบน', 'ranges are acceptable' => 'ช่วงที่ยอมรับได้', - 'CIDR format is supported' => 'สนับสนุนรูปแบบ CIDR', + 'CIDR format is supported' => 'การสนับสนุน CIDR', 'ACCEPT' => 'ยอมรับ', 'DROP' => 'บล็อค', 'TCP' => 'TCP', @@ -402,12 +400,12 @@ $LANG['th'] = array( 'VESTA' => 'VESTA', 'Add one more Name Server' => 'เพิ่ม Name Server อีก', - 'web domain' => 'โดเมนสำหรับเว็บ', - 'dns domain' => 'โดเมนสำหรบ dns', - 'dns record' => 'รายการ dns', - 'mail domain' => 'โดเมนสำหรับเมล', + 'web domain' => 'web domain', + 'dns domain' => 'dns domain', + 'dns record' => 'dns record', + 'mail domain' => 'mail domain', 'mail account' => 'บัญชีเมล์', - 'cron job' => 'งาน cron', + 'cron job' => 'cron job', 'cron' => 'cron', 'user dir' => 'ไดเร็กทอรี่ของผู้ใช้', @@ -417,91 +415,91 @@ $LANG['th'] = array( '%s accounts' => '%s บัญชี', '1 domain' => '1 โดเมน', '%s domains' => '%s โดเมน', - '1 record' => '1 รายการ', - '%s records' => '%s รายการ', - '1 mail account' => '1 บัญชีเมล', - '%s mail accounts' => '%s บัญชีเมล', + '1 record' => '1 record', + '%s records' => '%s records', + '1 mail account' => '1 บัญชีเมล์', + '%s mail accounts' => '%s บัญชีเมล์', '1 database' => '1 ฐานข้อมูล', '%s databases' => '%s ฐานข้อมูล', - '1 cron job' => '1 งาน cron', - '%s cron jobs' => '%s งาน cron', - '1 archive' => '1 ข้อมูลสำรอง', - '%s archives' => '%s ข้อมูลสำรอง', + '1 cron job' => '1 cron job', + '%s cron jobs' => '%s cron jobs', + '1 archive' => '1 เก็บถาวร', + '%s archives' => '%s เก็บถาวร', '1 item' => '1 รายการ', '%s items' => '%s รายการ', '1 package' => '1 แพ็กเกจ', - '%s packages' => '%s แพ็กเกจ', - '1 IP address' => '1 ที่อยู่ IP', - '%s IP addresses' => '%s ที่อยู่ IP', + '%s packages' => '%s packages', + '1 IP address' => '1 IP address', + '%s IP addresses' => '%s IP addresses', '1 month' => '1 เดือน', '%s months' => '%s เดือน', - '1 log record' => '1 บันทึกเหตุการณ์', - '%s log records' => '%s บันทึกเหตุการณ์', + '1 log record' => '1 log record', + '%s log records' => '%s log record', '1 object' => '1 วัตถุ', '%s objects' => '%s วัตถุ', 'no exclusions' => 'ไม่มีการยกเว้น', - '1 rule' => '1 กฎ', - '%s rules' => '%s กฎ', + '1 rule' => '1 rule', + '%s rules' => '%s rules', 'There are no currently banned IP' => 'ไม่มี IP ที่ถูกแบน', - 'USER_CREATED_OK' => 'สร้างผู้ใช้ %s แล้ว', - 'WEB_DOMAIN_CREATED_OK' => 'สร้างโดเมน %s แล้ว', - 'DNS_DOMAIN_CREATED_OK' => 'สร้างโดเมนสำหรับ DNS %s แล้ว', - 'DNS_RECORD_CREATED_OK' => 'สร้างรายการ %s.%s แล้ว', - 'MAIL_DOMAIN_CREATED_OK' => 'สร้างโดเมนสำหรับเมล %s แล้ว', - 'MAIL_ACCOUNT_CREATED_OK' => 'สร้างบัญชีเมล %s@%s แล้ว', - 'DATABASE_CREATED_OK' => 'สร้างฐานข้อมูล %s แล้ว', - 'CRON_CREATED_OK' => 'สร้างงาน Cron แล้ว', - 'IP_CREATED_OK' => 'สร้างที่อยู่ IP %s แล้ว', - 'PACKAGE_CREATED_OK' => 'สร้างแพ็กเกจ %s แล้ว', - 'SSL_GENERATED_OK' => 'สร้าง SSL Certificate แล้ว', - 'RULE_CREATED_OK' => 'สร้างกฎแล้ว', - 'BANLIST_CREATED_OK' => 'สร้างรายการแบนหมายเลข IP แล้ว', + 'USER_CREATED_OK' => 'สร้างผู้ใช้ %s สำเร็จแล้ว', + 'WEB_DOMAIN_CREATED_OK' => 'สร้างโดนเมน %s สำเร็จแล้ว', + 'DNS_DOMAIN_CREATED_OK' => 'สร้าง DNS domain %s สำเร็จแล้ว', + 'DNS_RECORD_CREATED_OK' => 'สร้าง Record %s.%s ได้ถูกสร้างสำเร็จแล้ว', + 'MAIL_DOMAIN_CREATED_OK' => 'สร้าง Mail domain %s สำเร็จแล้ว', + 'MAIL_ACCOUNT_CREATED_OK' => 'สร้างบัญชีเมล์ %s@%s สำเร็จแล้ว', + 'DATABASE_CREATED_OK' => 'สร้างฐานข้อมูล %s สำเร็จแล้ว', + 'CRON_CREATED_OK' => 'สร้าง Cron job ได้ถูกสร้างแล้ว', + 'IP_CREATED_OK' => 'สร้าง IP address %s สำเร็จแล้ว', + 'PACKAGE_CREATED_OK' => 'สร้างแพ็กเกจ %s สำเร็จแล้ว', + 'SSL_GENERATED_OK' => 'สร้างใบรับรองสำเร็จแล้ว', + 'RULE_CREATED_OK' => 'สร้าง Rule สำเร็จแล้ว', + 'BANLIST_CREATED_OK' => 'สร้าง IP address สำเร็จแล้ว', 'Autoupdate has been successfully enabled' => 'เปิดใช้งานการอัพเดทอัตโนมัติสำเร็จแล้ว', 'Autoupdate has been successfully disabled' => 'ปิดใช้งานการอัพเดทอัตโนมัติสำเร็จแล้ว', - 'Cronjob email reporting has been successfully enabled' => 'เปิดการรายงานทางอีเมลของ Cronjob แล้ว', - 'Cronjob email reporting has been successfully disabled' => 'ปิดการรายงานทางอีเมลของ Cronjob แล้ว', + 'Cronjob email reporting has been successfully enabled' => 'การรายงานทางอีเมลของ Cronjob ได้รับการเปิดใช้งานเรียบร้อยแล้ว', + 'Cronjob email reporting has been successfully disabled' => 'การรายงานทางอีเมลของ Cronjob ได้รับการปิดใช้งานเรียบร้อยแล้ว', 'Changes has been saved.' => 'บันทึกการเปลี่ยนแปลงแล้ว', 'Confirmation' => 'การยืนยัน', - 'DELETE_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบผู้ใช้ %s', - 'SUSPEND_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับผู้ใช้ %s', - 'UNSUSPEND_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานผู้ใช้ %s', - 'DELETE_DOMAIN_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบโดเมน %s', - 'SUSPEND_DOMAIN_CONFIRMATION' => 'แน่ใจหรือไม่ว่าคุณต้องการ ระงับโดเมน %s', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานโดเมน %s', - 'DELETE_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบรายการ %s', - 'SUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับรายการ %s', - 'UNSUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานรายการ %s', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือว่าต้องการ ลบเมล %s', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับเมล %s', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานเมล %s', - 'DELETE_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบฐานข้อมูล %s', - 'SUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับฐานข้อมูล %s', - 'UNSUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานฐานข้อมูล %s', - 'DELETE_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบงาน cron', - 'SUSPEND_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับงาน cron', - 'UNSUSPEND_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน cron', - 'DELETE_BACKUP_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบการสำรองข้อมูล %s', - 'DELETE_EXCLUSION_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ %s ในการยกเว้น', - 'DELETE_PACKAGE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบแพ็กเกจ %s', - 'DELETE_IP_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบที่อยู่ IP %s', - 'DELETE_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบกฎ #%s', - 'SUSPEND_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับกฎ #%s', - 'UNSUSPEND_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานกฎ #%s', - 'LEAVE_PAGE_CONFIRMATION' => 'ออกจากหน้านี้', - 'RESTART_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการเริ่มต้นใหม่ %s', + 'DELETE_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบผู้ใช้ %s?', + 'SUSPEND_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับผู้ใช้ %s?', + 'UNSUSPEND_USER_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานผู้ใช้ %s?', + 'DELETE_DOMAIN_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบโดเมน %s?', + 'SUSPEND_DOMAIN_CONFIRMATION' => 'แน่ใจหรือไม่ว่าคุณต้องการ ระงับโดเมน %s?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานโดเมน %s?', + 'DELETE_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ Record %s?', + 'SUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ Record %s?', + 'UNSUSPEND_RECORD_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน Record %s?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือว่าต้องการ ลบเมล์ %s?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับเมล์ %s?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานเมล์ %s?', + 'DELETE_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบฐานข้อมูล %s?', + 'SUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับฐานข้อมูล %s?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งานฐานข้อมูล %s?', + 'DELETE_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ cron job?', + 'SUSPEND_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ cron job?', + 'UNSUSPEND_CRON_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน cron job?', + 'DELETE_BACKUP_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบการสำรองข้อมูล %s?', + 'DELETE_EXCLUSION_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ %s ในการยกเว้น?', + 'DELETE_PACKAGE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบแพ็กเกจ %s?', + 'DELETE_IP_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ IP address %s?', + 'DELETE_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ลบ rule #%s?', + 'SUSPEND_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ ระงับ rule #%s?', + 'UNSUSPEND_RULE_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการ เปิดการใช้งาน rule #%s?', + 'LEAVE_PAGE_CONFIRMATION' => 'ออกจากหน้านี้?', + 'RESTART_CONFIRMATION' => 'คุณแน่ใจหรือไม่ว่าต้องการเริ่มต้นใหม่ %s?', 'Welcome' => 'ยินดีต้อนรับ', 'LOGGED_IN_AS' => 'เข้าสู่ระบบในฐานะผู้ใช้ %s', 'Error' => 'เกิดข้อผิดพลาด', 'Invalid username or password' => 'ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง', 'Invalid username or code' => 'ชื่อผู้ใช้หรือรหัสไม่ถูกต้อง', 'Passwords not match' => 'รหัสผ่านทั้งสองไม่ตรงกัน', - 'Please enter valid email address.' => 'กรุณาใส่เมลที่ถูกต้อง', + 'Please enter valid email address.' => 'กรุณาใส่เมล์ที่ถูกต้อง', 'Field "%s" can not be blank.' => 'ช่อง "%s" ไม่สามารถเว้นว่างไว้', 'Password is too short.' => 'รหัสผ่านสั้นเกินไป (ต่ำสุด 6 ตัวอักษร)', 'Error code:' => 'รหัสข้อผิดพลาด: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" ล้มเหลว', - 'IP address is in use' => 'ที่อยู่ IP ถูกใช้งานอยู่', + 'IP address is in use' => 'IP address กำลังใช้งานอยู่', 'BACKUP_SCHEDULED' => 'มีการเพิ่มงานลงในคิวแล้ว คุณจะได้รับอีเมลแจ้งเตือนเมื่อการสำรองข้อมูลของคุณพร้อมสำหรับการดาวน์โหลด', 'BACKUP_EXISTS' => 'มีการสำรองข้อมูลอยู่ โปรดรอให้การสำรองข้อมูลในปัจจุบันเสร็จสิ้น', 'RESTORE_SCHEDULED' => 'มีการเพิ่มงานลงในคิวแล้ว คุณจะได้รับการแจ้งเตือนทางอีเมลเมื่อการคืนค่าเสร็จสิ้น', @@ -523,7 +521,7 @@ $LANG['th'] = array( 'FTP login credentials' => 'ข้อมูลการเข้าสู่ระบบ FTP', 'FTP_ACCOUNT_READY' => "มีการสร้างบัญชี FTP และพร้อมใช้งานแล้ว\n\nโฮสต์: %s\nชื่อผู้ใช้: %s_%s\nรหัสผ่าน: %s\n\n--\nVesta Control Panel\n", - 'Database Credentials' => 'ข้อมูลการใช้งานฐานข้อมูล', + 'Database Credentials' => 'ข้อมูลของฐานข้อมูล', 'DATABASE_READY' => "สร้างฐานข้อมูลเรียบร้อยแล้ว\n\nDatabase: %s\nชื่อ: %s\nรหัสผ่าน: %s\n%s\n\n--\nVesta Control Panel\n", 'forgot password' => 'ลืมรหัสผ่าน', @@ -532,7 +530,7 @@ $LANG['th'] = array( 'Confirm Password' => 'ยืนยันรหัสผ่าน', 'Reset' => 'รีเซ็ต', 'Reset Code' => 'รหัสสำหรับรีเซ็ต', - 'RESET_NOTICE' => 'แจ้งการ', + 'RESET_NOTICE' => '', 'RESET_CODE_SENT' => 'รหัสสำหรับรีเซ็ตรหัสผ่านถูกส่งไปยังที่อยู่อีเมลของคุณแล้ว
', 'MAIL_RESET_SUBJECT' => 'ตั้งค่ารหัสผ่านใหม่ที่ %s', 'PASSWORD_RESET_REQUEST' => "หากต้องการรีเซ็ตรหัสผ่านของแผงควบคุมโปรดไปที่ลิงก์นี้:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\nAlternatively, คุณอาจจะไปที่ https://%s/reset/?action=code&user=%s และใส่รหัสรีเซ็ตดังต่อไปนี้:\n%s\n\nหากคุณไม่ได้ขอรหัสผ่านใหม่โปรดละเว้นข้อความนี้และยอมรับคำขอโทษของเรา\n\n--\nVesta Control Panel\n", @@ -550,42 +548,41 @@ $LANG['th'] = array( 'Nov' => 'พ.ย.', 'Dec' => 'ธ.ค.', - 'Configuring Server' => 'การกำหนดค่าเซิร์ฟเวอร์', + 'Configuring Server' => 'การกำหนดค่าเซิฟเวอร์', 'Hostname' => 'Hostname', 'Time Zone' => 'เขตเวลา', 'Default Language' => 'ภาษาเริ่มต้น', - 'Proxy Server' => 'เซิร์ฟเวอร์ Proxy', - 'Web Server' => 'เซิร์ฟเวอร์เว็บ', - 'Backend Server' => 'เซิร์ฟเวอร์ Backend', - 'Backend Pool Mode' => 'โหมด Backend Pool', - 'DNS Server' => 'เซิร์ฟเวอร์ DNS', + 'Proxy Server' => 'Proxy Server', + 'Web Server' => 'Web Server', + 'Backend Server' => 'Backend Server', + 'Backend Pool Mode' => 'Backend Pool Mode', + 'DNS Server' => 'DNS Server', 'DNS Cluster' => 'DNS Cluster', - 'MAIL Server' => 'เซิร์ฟเวอร์เมล', - 'Antivirus' => 'ป้องกันไวรัส', - 'AntiSpam' => 'ป้องกันเมลขยะ', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', + 'MAIL Server' => 'MAIL Server', + 'Antivirus' => 'Antivirus', + 'AntiSpam' => 'AntiSpam', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'สนับสนุน MySQL', - 'phpMyAdmin URL' => 'phpMyAdmin URL', + 'phpMyAdmin URL' => 'ที่อยู่ของ phpMyAdmin', 'PostgreSQL Support' => 'สนับสนุน PostgreSQL', - 'phpPgAdmin URL' => 'phpPgAdmin URL', + 'phpPgAdmin URL' => 'ที่อยู่ของ phpPgAdmin', 'Maximum Number Of Databases' => 'จำนวนฐานข้อมูลสูงสุด', 'Current Number Of Databases' => 'จำนวนฐานข้อมูลปัจจุบัน', - 'Local backup' => 'สำรองข้อมูลภายใน', + 'Local backup' => 'สำรองข้อมูลท้องถิ่น', 'Compression level' => 'ระดับการบีบอัด', 'Directory' => 'ไดเร็กทอรี่', - 'Remote backup' => 'การสำรองข้อมูลภายนอก', + 'Remote backup' => 'การสำรองข้อมูลระยะไกล', 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', - 'FileSystem Disk Quota' => 'โควต้าการเก็บข้อมูลในระบบ', + 'FileSystem Disk Quota' => 'FileSystem Disk Quota', 'Vesta Control Panel Plugins' => 'ปลั๊กอิน Vesta Control Panel', 'preview' => 'ดูตัวอย่าง', 'Reseller Role' => 'บทบาท Reseller', 'Web Config Editor' => 'เครื่องมือแก้ไขการตั้งค่าเว็บ', 'Template Manager' => 'ตัวจัดการ Template', 'Backup Migration Manager' => 'ตัวจัดการการย้ายข้อมูลสำรอง', - 'FileManager' => 'ตัวจัดการไฟล์', + 'FileManager' => 'FileManager', 'show: CPU / MEM / NET / DISK' => 'แสดง: CPU / MEM / NET / DISK', 'sort by' => 'จัดเรียงโดย', @@ -595,7 +592,7 @@ $LANG['th'] = array( 'save to favorites' => 'บันทึกในรายการโปรด', - 'File Manager' => 'ตัวจัดการไฟล์', + 'File Manager' => 'File Manager', 'size' => 'ขนาด', 'date' => 'วันที่', 'name' => 'ชื่อ', @@ -611,8 +608,8 @@ $LANG['th'] = array( 'ARCHIVE' => 'เก็บถาวร', 'EXTRACT' => 'แตกไฟล์', 'DOWNLOAD' => 'ดาวน์โหลด', - 'Are you sure?' => 'คุณแน่ใจหรือไม่', - 'Hit' => 'จำนวนการเข้าถึง', + 'Are you sure?' => 'คุณแน่ใจ?', + 'Hit' => 'Hit', 'to reload the page' => 'เพื่อโหลดหน้าเว็บใหม่', 'Directory name cannot be empty' => 'ชื่อไดเร็กทอรี่ต้องไม่ว่างเปล่า', 'File name cannot be empty' => 'ชื่อไฟล์ต้องไม่ว่างเปล่า', @@ -632,7 +629,7 @@ $LANG['th'] = array( 'Extract' => 'แตกไฟล์', 'Create' => 'สร้าง', 'Compress' => 'บีบอัด', - 'OK' => 'ตกลง', + 'OK' => 'โอเค', 'YOU ARE COPYING' => 'คุณกำลังคัดลอก', 'YOU ARE REMOVING' => 'คุณกำลังลบ', 'Delete items' => 'ลบรายการ', @@ -670,7 +667,7 @@ $LANG['th'] = array( 'Go to CRON list' => 'ไปที่รายการ CRON', 'Go to BACKUP list' => 'ไปที่รายการ สำรองข้อมูล', 'Focus on search' => 'มุ่งเน้นการค้นหา', - 'Display/Close shortcuts' => 'แสดง/ปิดทางลัด', + 'Display/Close shortcuts' => 'แสดง/ปิด shortcuts', 'Move backward through top menu' => 'เลื่อนกลับไปที่เมนูด้านบน', 'Move forward through top menu' => 'เลื่อนไปข้างหน้าผ่านเมนูด้านบน', 'Enter focused element' => 'ใส่องค์ประกอบที่เน้น', @@ -699,16 +696,16 @@ $LANG['th'] = array( 'Add File to the Current Selection' => 'เพิ่มไฟล์ในการเลือกปัจจุบัน', 'Select All Files' => 'เลือกไฟล์ทั้งหมด', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => - 'ทางลัดต่างๆ ได้แรงบันดาลใจจากตัวจัดการไฟล์ magnificent GNU Midnight Commander', + 'shortcuts are inspired by magnificent GNU Midnight Commander file manager', 'Licence Key' => 'License Key', 'Enter License Key' => 'กรอก License Key', 'Buy Licence' => 'ซื้อ License', 'Buy Lifetime License' => 'ซื้อ License แบบถาวร', - 'Disable and Cancel Licence' => 'ปิดการใช้งาน และยกเลิก License', + 'Disable and Cancel License' => 'ปิดการใช้งาน และยกเลิก License', 'Licence Activated' => 'เปิดใช้งาน License แล้ว', 'Licence Deactivated' => 'ปิดการใช้งาน License แล้ว', - 'Restrict users so that they cannot use SSH and access only their home directory.' => 'จำกัดผู้ใช้เพื่อไม่ให้ใช้ SSH และเข้าถึงไดเร็กทอรี่ของตนเองเท่านั้น', + 'Restrict users so that they cannot use SSH and access only their home directory.' => 'จำกัดผู้ใช้เพื่อไม่ให้ใช้ SSH และเข้าถึงไดเร็กทอรี่บ้านเท่านั้น', 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'เรียกดู, คัดลอก, แก้ไข, ดู, และเรียกค้นหาไฟล์โดเมนทั้งหมดของเว็บโดยใช้ตัวจัดการไฟล์ที่มีคุณลักษณะครบถ้วน', 'This is a commercial module, you would need to purchace license key to enable it.' => 'สิ่งนี้ไม่ใช่โมดูลฟรี, คุณจะต้องซื้อ License Key เพื่อเปิดใช้งาน', @@ -749,14 +746,14 @@ $LANG['th'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'ใช้ hostname ของเซิร์ฟเวอร์', - 'Use domain hostname' => 'ใช้ hostname ของโดเมน', + 'Use server hostname' => 'ใช้ server hostname', + 'Use domain hostname' => 'ใช้ domain hostname', 'Use STARTTLS' => 'ใช้ STARTTLS', 'Use SSL / TLS' => 'ใช้ SSL / TLS', - 'No encryption' => 'ไม่มีการเข้ารหัส', - 'Do not use encryption' => 'ไม่ใช้การเข้ารหัส', + 'No encryption' => 'ไม่มี encryption', + 'Do not use encryption' => 'ไม่ใช้ encryption', 'maximum characters length, including prefix' => 'ความยาว charset สูงสุด %s ตัว, รวมถึงคำนำหน้า', - 'Email Credentials' => 'ข้อมูลการใช้อีเมล', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/tr.php b/web/inc/i18n/tr.php index 4b1ff8a4..7f2875b9 100644 --- a/web/inc/i18n/tr.php +++ b/web/inc/i18n/tr.php @@ -3,7 +3,6 @@ * Vesta turkish language file * 2014.11.01 Özgür Bozkurt (info@ozgurbozkurt.com/ozgur@forum.vestacp.com) * 2016.06.27 Selim Can CABA (info@selimcancaba.com) - * 2023.02.04 Umut Korkmaz (umutkorkmaaz@gmail.com) */ $LANG['tr'] = array( @@ -27,22 +26,22 @@ $LANG['tr'] = array( 'CRON' => 'CRON', 'BACKUP' => 'YEDEK', - 'LOGIN' => 'GİRİŞ', - 'RESET PASSWORD' => 'PAROLAYI SIFIRLA', - 'SEARCH' => 'ARA', - 'PACKAGE' => 'PAKET', + 'LOGIN' => 'LOGIN', + 'RESET PASSWORD' => 'RESET PASSWORD', + 'SEARCH' => 'SEARCH', + 'PACKAGE' => 'PACKAGE', 'RRD' => 'RRD', - 'STATS' => 'ISTATISTIKLER', + 'STATS' => 'STATS', 'LOG' => 'LOG', - 'UPDATES' => 'GÜNCELLEMELER', - 'FIREWALL' => 'GÜVENLİK DUVARI', - 'SERVER' => 'SUNUCU', - 'MEMORY' => 'BELLEK', + 'UPDATES' => 'UPDATES', + 'FIREWALL' => 'FIREWALL', + 'SERVER' => 'SERVER', + 'MEMORY' => 'MEMORY', 'DISK' => 'DISK', - 'NETWORK' => 'AĞ', + 'NETWORK' => 'NETWORK', 'Web Log Manager' => 'Web Log Manager', - 'no notifications' => 'bildirim yok', + 'no notifications' => 'no notifications', 'Add User' => 'Kullanıcı Ekle', 'Add Domain' => 'Alan Adı Ekle', @@ -85,7 +84,7 @@ $LANG['tr'] = array( 'unsuspend' => 'devam ettir', 'delete' => 'sil', 'show per user' => 'kullanıcı başına göster', - 'login as' => 'giriş yap:', + 'login as' => 'giriş yapıldı:', 'logout' => 'oturumu kapat', 'edit' => 'düzenle', 'open webstats' => 'webstats aç', @@ -111,7 +110,7 @@ $LANG['tr'] = array( 'disable autoupdate' => 'otomatik güncellemeyi pasif hale getir', 'turn on notifications' => 'duyuruları aç', 'turn off notifications' => 'duyuruları kapat', - 'configure' => 'yapılandır', + 'configure' => 'configure', 'Adding User' => 'Kullanıcı Ekleme', 'Editing User' => 'Kullanıcı Düzenleme', @@ -187,23 +186,22 @@ $LANG['tr'] = array( 'Mail Accounts' => 'Posta Hesapları', 'Cron Jobs' => 'Zamanlanmış Görevler', 'SSH Access' => 'SSH Erişimi', - 'IP Address' => 'IP Adresi', + 'IP Address' => 'IP Address', 'IP Addresses' => 'IP Adresleri', 'Backups' => 'Yedekler', 'Backup System' => 'Yedekleme Sistemi', 'backup exclusions' => 'yedekleme istisnaları', 'template' => 'template', - 'SSL Support' => 'SSL Desteği', - 'SSL Home Directory' => 'SSL Dizini', - 'Lets Encrypt Support' => 'Lets Encrypt Desteği', + 'SSL Support' => 'SSL Support', + 'SSL Home Directory' => 'SSL Home', + 'Lets Encrypt Support' => 'Lets Encrypt Support', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => 'Sertifikanız 5 dakika içinde otomatik olarak verilecektir.', + 'Your certificate will be automatically issued in 5 minutes' => 'Your certificate will be automatically issued in 5 minutes', 'Proxy Support' => 'Proxy Desteği', 'Proxy Extensions' => 'Proxy Uzantıları', 'Web Statistics' => 'Web İstatistikleri', 'Additional FTP Account' => 'İlave FTP Hesabı', - 'Path' => 'Ana dizin', + 'Path' => 'Path', 'SOA' => 'SOA', 'TTL' => 'TTL', 'Expire' => 'Sonlanış', @@ -218,19 +216,19 @@ $LANG['tr'] = array( 'Autoreply' => 'Otomatik Cevap', 'Forward to' => 'Şuraya yönlendir', 'Do not store forwarded mail' => 'Yönlendirilmiş postaları depolama', - 'IMAP hostname' => 'IMAP sunucusu', + 'IMAP hostname' => 'IMAP hostname', 'IMAP port' => 'IMAP port', - 'IMAP security' => 'IMAP güvenliği', - 'IMAP auth method' => 'IMAP giriş metodu', - 'SMTP hostname' => 'SMTP sunucusu', + 'IMAP security' => 'IMAP security', + 'IMAP auth method' => 'IMAP auth method', + 'SMTP hostname' => 'SMTP hostname', 'SMTP port' => 'SMTP port', - 'SMTP security' => 'SMTP güvenliği', - 'SMTP auth method' => 'SMTP giriş metodu', + 'SMTP security' => 'SMTP security', + 'SMTP auth method' => 'SMTP auth method', 'STARTTLS' => 'STARTTLS', - 'Normal password' => 'Normal parola', + 'Normal password' => 'Normal password', 'database' => 'veritabanı', 'User' => 'Kullanıcı', - 'Host' => 'Sunucu', + 'Host' => 'Host', 'Charset' => 'Karakter Seti', 'Min' => 'Dak', 'Hour' => 'Saat', @@ -249,14 +247,14 @@ $LANG['tr'] = array( 'Users' => 'Kullanıcılar', 'Load Average' => 'Sistem Yükü', 'Memory Usage' => 'Hafıza Kullanımı', - 'APACHE2 Usage' => 'APACHE2 Kullanımı', + 'APACHE2 Usage' => 'APACHE2 Usage', 'HTTPD Usage' => 'HTTPD Kullanımı', 'NGINX Usage' => 'NGINX Kullanımı', 'MySQL Usage on localhost' => 'Localhost Üzerindeki MySQL Kullanımı', 'PostgreSQL Usage on localhost' => 'Localhost Üzerindeki PostgreSQL Kullanımı', 'Bandwidth Usage eth0' => 'eth0 Trafik Kullanımı', 'Bandwidth Usage eth1' => 'eth1 Trafik Kullanımı', - 'Exim Usage' => 'Exim Kullanımı', + 'Exim Usage' => 'Exim Usage', 'FTP Usage' => 'FTP Kullanımı', 'SSH Usage' => 'SSH Kullanımı', 'reverse proxy' => 'reverse proxy', @@ -295,7 +293,7 @@ $LANG['tr'] = array( 'DNS Support' => 'DNS Desteği', 'Mail Support' => 'Mail Desteği', 'Advanced options' => 'Gelişmiş seçenekler', - 'Basic options' => 'Basit seçenekler', + 'Basic options' => 'Basic options', 'Aliases' => 'Takma adlar (Alias)', 'SSL Certificate' => 'SSL Sertifikası', 'SSL Key' => 'SSL Anahtarı (Key)', @@ -399,7 +397,7 @@ $LANG['tr'] = array( 'SSH' => 'SSH', 'FTP' => 'FTP', 'VESTA' => 'VESTA', - 'Add one more Name Server' => 'Bir Name Server daha ekle', + 'Add one more Name Server' => 'Add one more Name Server', 'web domain' => 'web domain', 'dns domain' => 'dns domain', @@ -451,17 +449,17 @@ $LANG['tr'] = array( 'MAIL_ACCOUNT_CREATED_OK' => '%s@%s mail hesabı başarıyla oluşturuldu', 'DATABASE_CREATED_OK' => '%s veritabanı başarıyla oluşturuldu.', 'CRON_CREATED_OK' => 'Zamanlanmış görev başarıyla oluşturuldu.', - 'IP_CREATED_OK' => '%s IP adresi başarıyla oluşturuldu.', + 'IP_CREATED_OK' => '%s ip adresi başarıyla oluşturuldu.', 'PACKAGE_CREATED_OK' => '%s paketi başarıyla oluşturuldu.', 'SSL_GENERATED_OK' => 'Sertifika başarıyla oluşturuldu.', 'RULE_CREATED_OK' => 'Kural başarıyla oluşturuldu.', - 'BANLIST_CREATED_OK' => 'IP adresi başarıyla engellendi', + 'BANLIST_CREATED_OK' => 'IP address has been banned successfully', 'Autoupdate has been successfully enabled' => 'Otomatik güncelleme başarıyla aktifleştirildi', 'Autoupdate has been successfully disabled' => 'Otomatik güncelleme başarıyla pasifleştirildi', 'Cronjob email reporting has been successfully enabled' => 'Zamanlanmış görev e-posta raporlama başarıyla aktif hale getirildi', 'Cronjob email reporting has been successfully disabled' => 'Zamanlanmış görev e-posta raporlama başarıyla pasif hale getirildi', 'Changes has been saved.' => 'Değişiklikler kaydedildi.', - 'Confirmation' => 'Onayla', + 'Confirmation' => 'Onaylama', 'DELETE_USER_CONFIRMATION' => '%s kullanıcısını silmek istediğinize emin misiniz?', 'SUSPEND_USER_CONFIRMATION' => '%s kullanıcısını askıya almak istediğinize emin misiniz?', 'UNSUSPEND_USER_CONFIRMATION' => '%s kullanıcısını devam ettirmek istediğinize emin misiniz?', @@ -490,7 +488,7 @@ $LANG['tr'] = array( 'LEAVE_PAGE_CONFIRMATION' => 'Leave Page?', 'RESTART_CONFIRMATION' => '%s yeniden başlatılacak. Onaylıyor musunuz?', 'Welcome' => 'Hoşgeldiniz', - 'LOGGED_IN_AS' => '%s kullanıcısı olarak oturum açıldı', + 'LOGGED_IN_AS' => '%s kullanıcısı olarak oturum aç', 'Error' => 'Hata', 'Invalid username or password' => 'Geçersiz kullanıcı adı veya şifre', 'Invalid username or code' => 'Geçersiz kullanıcı adı veya kod', @@ -550,30 +548,29 @@ $LANG['tr'] = array( 'Dec' => 'Ara', 'Configuring Server' => 'Sunucu Yapılandırma', - 'Hostname' => 'Sunucu Adı', + 'Hostname' => 'Hostadı', 'Time Zone' => 'Zaman Dilimi', 'Default Language' => 'Varsayılan Dil', - 'Proxy Server' => 'Proxy Sunucusu', - 'Web Server' => 'Web Sunucusu', - 'Backend Server' => 'Backend Sunucusu', + 'Proxy Server' => 'Proxy Server', + 'Web Server' => 'Web Server', + 'Backend Server' => 'Backend Server', 'Backend Pool Mode' => 'Backend Pool Mode', - 'DNS Server' => 'DNS Sunucusu', + 'DNS Server' => 'DNS Server', 'DNS Cluster' => 'DNS Cluster', - 'MAIL Server' => 'MAIL Sunucusu', + 'MAIL Server' => 'MAIL Server', 'Antivirus' => 'Antivirus', 'AntiSpam' => 'AntiSpam', - 'Use Web Domain SSL Certificate' => 'Web Alan Adının SSL Sertifikasını Kullan', 'Webmail URL' => 'Webmail URL', - 'MySQL Support' => 'MySQL Desteği', + 'MySQL Support' => 'MySQL Support', 'phpMyAdmin URL' => 'phpMyAdmin URL', - 'PostgreSQL Support' => 'PostgreSQL Desteği', + 'PostgreSQL Support' => 'PostgreSQL Support', 'phpPgAdmin URL' => 'phpPgAdmin URL', - 'Maximum Number Of Databases' => 'Maksimum Veritabanı Sayısı', - 'Current Number Of Databases' => 'Mevcut Veritabanı Sayısı', - 'Local backup' => 'Yerel Yedek', - 'Compression level' => 'Sıkıştırma seviyesi', - 'Directory' => 'Dizin', - 'Remote backup' => 'Uzak Yedek', + 'Maximum Number Of Databases' => 'Maximum Number Of Databases', + 'Current Number Of Databases' => 'Current Number Of Databases', + 'Local backup' => 'Local backup', + 'Compression level' => 'Compression level', + 'Directory' => 'Directory', + 'Remote backup' => 'Remote backup', 'ftp' => 'FTP', 'sftp' => 'SFTP', 'SFTP Chroot' => 'SFTP Chroot', @@ -592,7 +589,7 @@ $LANG['tr'] = array( 'Starred' => 'Yıldızlı', 'Name' => 'İsim', - 'save to favorites' => 'favorilere kaydet', + 'save to favorites' => 'save to favorites', 'File Manager' => 'Dosya Yöneticisi', 'size' => 'boyut', @@ -604,13 +601,13 @@ $LANG['tr'] = array( 'NEW DIR' => 'YENİ KLASÖR', 'DELETE' => 'SİL', 'RENAME' => 'YENİDEN ADLANDIR', - 'MOVE' => 'TAŞI', - 'RIGHTS' => 'IZINLER', + 'MOVE' => 'MOVE', + 'RIGHTS' => 'RIGHTS', 'COPY' => 'KOPYALA', 'ARCHIVE' => 'ARŞİVLE', 'EXTRACT' => 'ÇIKART', 'DOWNLOAD' => 'İNDİR', - 'Are you sure?' => 'Emin misin?', + 'Are you sure?' => 'Are you sure?', 'Hit' => 'Hit', 'to reload the page' => 'sayfayı yenilemek için', 'Directory name cannot be empty' => 'Dizin adı boş olamaz', @@ -625,20 +622,20 @@ $LANG['tr'] = array( 'Copy' => 'Kopyala', 'Cancel' => 'Vazgeç', 'Rename' => 'Yeniden Adlandır', - 'Move' => 'Taşı', - 'Change Rights' => 'İzinleri Değiştir', + 'Move' => 'Move', + 'Change Rights' => 'Change Rights', 'Delete' => 'Sil', 'Extract' => 'Çıkart', 'Create' => 'Oluştur', 'Compress' => 'Sıkıştır', 'OK' => 'TAMAM', - 'YOU ARE COPYING' => 'KOPYALAMA YAPIYORSUNUZ', - 'YOU ARE REMOVING' => 'SİLME İŞLEMİ YAPIYORSUNUZ', - 'Delete items' => 'Öğeleri sil', - 'Copy files' => 'Dosyaları kopyala', - 'Move files' => 'Dosyaları taşı', + 'YOU ARE COPYING' => 'YOU ARE COPYING', + 'YOU ARE REMOVING' => 'YOU ARE REMOVING', + 'Delete items' => 'Delete items', + 'Copy files' => 'Copy files', + 'Move files' => 'Move files', 'Are you sure you want to copy' => 'Kopyalamak istediğinizden emin misiniz', - 'Are you sure you want to move' => 'Taşımak istediğinizden emin misiniz', + 'Are you sure you want to move' => 'Are you sure you want to move', 'Are you sure you want to delete' => 'Silmek istediğinizden emin misiniz', 'into' => 'into', 'existing files will be replaced' => 'varolan dosyalar değiştirilir', @@ -657,7 +654,7 @@ $LANG['tr'] = array( 'write by others' => 'write by others', 'execute/search by others' => 'execute/search by others', - 'Shortcuts' => 'Kısayollar', + 'Shortcuts' => 'Shortcuts', 'Add New object' => 'Yeni Nesne Ekle', 'Save Form' => 'Formu Kaydet', 'Cancel saving form' => 'Formu kaydetmekten vazgeç', @@ -673,8 +670,8 @@ $LANG['tr'] = array( 'Move backward through top menu' => 'Üst menüden arasında geriye doğru git', 'Move forward through top menu' => 'Üst menüden arasında ileriye doğru git', 'Enter focused element' => 'Odaklanmış elemanı gir', - 'Move up through elements list' => 'Öğeler listesinde yukarı git', - 'Move down through elements list' => 'Öğeler listesinde aşağı git', + 'Move up through elements list' => 'Move up through elements list', + 'Move down through elements list' => 'Move down through elements list', 'Upload' => 'Yükle', 'New File' => 'Yeni Dosya', @@ -691,7 +688,7 @@ $LANG['tr'] = array( 'Go to the Top of the File List' => 'Dosya Listesinin Tepesine git', 'Go to the Last File' => 'Son Dosyaya git', 'Open File / Enter Directory' => 'Dosya Aç/Dizin Gir', - 'Edit File' => 'Dosya düzenle', + 'Edit File' => 'Edit File', 'Go to Parent Directory' => 'Üst Dizine Git', 'Select Current File' => 'Şuanki Dosyayı Seç', 'Select Bunch of Files' => 'Dosya Demetini Seç', @@ -734,7 +731,7 @@ $LANG['tr'] = array( 'every minute' => 'her dakika', 'every two minutes' => 'her iki dakikada bir', 'every' => 'her', - 'Generate' => 'Oluştur', + 'Generate' => 'Generate', 'webalizer' => 'webalizer', 'awstats' => 'awstats', @@ -748,14 +745,14 @@ $LANG['tr'] = array( 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'Sunucu adını kullan', - 'Use domain hostname' => 'Alan adını kullan', - 'Use STARTTLS' => 'STARTTLS Kullan', - 'Use SSL / TLS' => 'SSL / TLS Kullan', - 'No encryption' => 'Şifreleme yok', - 'Do not use encryption' => 'Şifreleme kullanma', + 'Use server hostname' => 'Use server hostname', + 'Use domain hostname' => 'Use domain hostname', + 'Use STARTTLS' => 'Use STARTTLS', + 'Use SSL / TLS' => 'Use SSL / TLS', + 'No encryption' => 'No encryption', + 'Do not use encryption' => 'Do not use encryption', - 'maximum characters length, including prefix' => 'önek dahil maksimum %s karakter uzunluğu', + 'maximum characters length, including prefix' => 'maximum %s characters length, including prefix', - 'Email Credentials' => 'E-posta Kimlik Bilgileri', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/tw.php b/web/inc/i18n/tw.php index 145f465d..02b5a29a 100644 --- a/web/inc/i18n/tw.php +++ b/web/inc/i18n/tw.php @@ -2,13 +2,16 @@ /** * Vesta language file * This language file is translate by + * Peter Dave Hello Blog (https://www.peterdavehello.org) + * Peter Dave Hello GitHub (https://github.com/PeterDaveHello) + * Peter Dave Hello Twitter (https://twitter.com/PeterDaveHello) + * Clark's Computer Knowledge Journal (https://www.clark-chen.com) * Clark's Hosting Service (https://host.clark-chen.com) * Clark Chen (clark@clark-chen.com) */ $LANG['tw'] = array( - 'Packages' => '方案設定', - 'IP' => 'IP 管理', + 'IP' => 'IP管理', 'Graphs' => '資源使用圖表', 'Statistics' => '統計資料', 'Log' => '系統紀錄', @@ -30,7 +33,7 @@ $LANG['tw'] = array( 'LOGIN' => '登入', 'RESET PASSWORD' => '重設密碼', 'SEARCH' => '搜尋', - 'PACKAGE' => '方案', + 'PACKAGE' => '套件', 'RRD' => 'RRD', 'STATS' => '狀態', 'LOG' => '日誌', @@ -42,7 +45,7 @@ $LANG['tw'] = array( 'NETWORK' => '網路', 'Web Log Manager' => 'Web 日誌管理員', - 'no notifications' => '沒有通知', + 'no notifications' => 'no notifications', 'Add User' => '新增使用者', 'Add Domain' => '新增網域', @@ -55,7 +58,7 @@ $LANG['tw'] = array( 'Add Cron Job' => '新增任務排程', 'Create Backup' => '建立備份', 'Configure' => '設定', - 'Restore All' => '全部還原', + 'Restore All' => '全部回復', 'Add Package' => '新增方案', 'Add IP' => '新增 IP', 'Add Rule' => '新增規則', @@ -63,9 +66,9 @@ $LANG['tw'] = array( 'Search' => '搜尋', 'Add one more FTP Account' => '新增 FTP 帳號', 'Overall Statistics' => '整理統計資料', - 'Daily' => '每天', - 'Weekly' => '每週', - 'Monthly' => '每月', + 'Daily' => '天', + 'Weekly' => '周', + 'Monthly' => '月', 'Yearly' => '每年', 'Add' => '新增', 'Back' => '返回', @@ -80,16 +83,16 @@ $LANG['tw'] = array( 'rebuild mail' => '重建信箱', 'rebuild db' => '重建資料庫', 'rebuild cron' => '重建任務排程', - 'update counters' => '更新計數器', - 'suspend' => '停用', - 'unsuspend' => '解除停用', + 'update counters' => '更新計數器', + 'suspend' => '封鎖', + 'unsuspend' => '解除封鎖', 'delete' => '刪除', - 'show per user' => '依選擇的使用者', + 'show per user' => '依照選擇的使用者', 'login as' => '登入帳號', 'logout' => '登出', 'edit' => '編輯', 'open webstats' => '開啟網站統計資料', - 'view logs' => '檢視系統紀錄', + 'view logs' => '查看系統紀錄', 'list records' => '列出 %s 紀錄', 'add record' => '新增紀錄', 'list accounts' => '列出 %s 帳號', @@ -98,29 +101,29 @@ $LANG['tw'] = array( 'list fail2ban' => '列出登入失敗遭封鎖名單', 'open %s' => '開啟 %s', 'download' => '下載', - 'restore' => '還原', - 'configure restore settings' => '配置還原設定', + 'restore' => '回復', + 'configure restore settings' => '配置回復設定', 'stop' => '停止', 'start' => '啟動', 'restart' => '重新啟動', 'update' => '更新', 'generate' => '產生', 'Generate CSR' => '產生憑證簽署請求 (CSR)', - 'reread IP' => '重新取得 IP', + 'reread IP' => '重新取得IP', 'enable autoupdate' => '啟用自動更新', 'disable autoupdate' => '停用自動更新', 'turn on notifications' => '啟用通知', 'turn off notifications' => '停用通知', - 'configure' => '配置', + 'configure' => 'configure', 'Adding User' => '新增使用者', 'Editing User' => '編輯使用者', 'Adding Domain' => '新增網域', 'Editing Domain' => '編輯網域', - 'Adding DNS Domain' => '新增 DNS 網域', - 'Editing DNS Domain' => '編輯 DNS 網域', - 'Adding DNS Record' => '新增 DNS 紀錄', - 'Editing DNS Record' => '編輯 DNS 紀錄', + 'Adding DNS Domain' => '新增DNS網域', + 'Editing DNS Domain' => '編輯DNS網域', + 'Adding DNS Record' => '新增DNS紀錄', + 'Editing DNS Record' => '編輯DNS紀錄', 'Adding Mail Domain' => '新增信箱網域', 'Editing Mail Domain' => '編輯信箱網域', 'Adding Mail Account' => '新增信箱帳號', @@ -131,10 +134,10 @@ $LANG['tw'] = array( 'Editing Database' => '編輯資料庫', 'Adding Package' => '新增方案', 'Editing Package' => '編輯方案', - 'Adding IP address' => '新增 IP', - 'Editing IP Address' => '編輯 IP', + 'Adding IP address' => '新增IP', + 'Editing IP Address' => '編輯IP', 'Editing Backup Exclusions' => '編輯備份排除項目', - 'Generating CSR' => '產生憑證簽署請求 (CSR) 中...', + 'Generating CSR' => '產生憑證簽署請求(CSR)中...', 'Listing' => '列出', 'Search Results' => '搜尋結果', 'Adding Firewall Rule' => '新增防火牆規則', @@ -142,11 +145,11 @@ $LANG['tw'] = array( 'Adding IP Address to Banlist' => '新增IP至黑名單', 'active' => '正常', - 'spnd' => '停用', - 'suspended' => '已停用', + 'spnd' => '封鎖', + 'suspended' => '已封鎖', 'running' => '執行中', 'stopped' => '已停止', - 'outdated' => '有可升級的新版本', + 'outdated' => '有新版本可升級', 'updated' => '已是最新版本', 'yes' => '是', @@ -158,8 +161,8 @@ $LANG['tw'] = array( 'mb' => 'MB', 'minute' => '分鐘', 'hour' => '小時', - 'day' => '日', - 'days' => '日', + 'day' => '天', + 'days' => '天', 'hours' => '小時', 'minutes' => '分鐘', 'month' => '月', @@ -170,15 +173,15 @@ $LANG['tw'] = array( 'Mail' => '信箱', 'Databases' => '資料庫', 'User Directories' => '使用者目錄', - 'Template' => '範本', - 'Web Template' => 'Apache 範本', - 'Backend Template' => 'Backend 範本', - 'Proxy Template' => 'Proxy 範本', - 'DNS Template' => 'DNS 範本', + 'Template' => '模板', + 'Web Template' => 'Apache 模板', + 'Backend Template' => 'Backend 模板', + 'Proxy Template' => 'Proxy 模板', + 'DNS Template' => 'DNS 模板', 'Web Domains' => '網站網域', 'SSL Domains' => 'SSL 網域', 'Web Aliases' => '網站子網域', - 'per domain' => '(每個網域)', + 'per domain' => '(每網域)', 'DNS Domains' => 'DNS 網域', 'DNS domains' => 'DNS 網域', 'DNS records' => 'DNS 紀錄', @@ -192,15 +195,14 @@ $LANG['tw'] = array( 'Backups' => '備份', 'Backup System' => '備份系統', 'backup exclusions' => '備份例外', - 'template' => '範本', + 'template' => '模板', 'SSL Support' => 'SSL 支援', 'SSL Home Directory' => 'SSL 主目錄', 'Lets Encrypt Support' => 'Lets Encrypt 支援', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', - 'Your certificate will be automatically issued in 5 minutes' => '您的憑證會在五分鐘內完成簽發', + 'Your certificate will be automatically issued in 5 minutes' => '您的憑證會在五分鐘內完成簽署', 'Proxy Support' => 'Proxy 支援', - 'Proxy Extensions' => 'Proxy 副檔名', + 'Proxy Extensions' => 'Proxy 擴充', 'Web Statistics' => '網站統計', 'Additional FTP Account' => '其他 FTP 帳號', 'Path' => '路徑', @@ -208,11 +210,11 @@ $LANG['tw'] = array( 'TTL' => 'TTL', 'Expire' => '過期', 'Records' => '紀錄', - 'Serial' => '序列 (Serial)', + 'Serial' => 'Serial', 'Catchall email' => '收到所有郵件', 'AntiVirus Support' => '防毒支援', 'AntiSpam Support' => '防垃圾郵件支援', - 'DKIM Support' => 'DKIM 支援', + 'DKIM Support' => 'DKIM支援', 'Accounts' => '帳號', 'Quota' => '配額', 'Autoreply' => '自動回覆', @@ -227,7 +229,7 @@ $LANG['tw'] = array( 'SMTP security' => 'SMTP 安全性', 'SMTP auth method' => 'SMTP 驗證方式', 'STARTTLS' => 'STARTTLS', - 'Normal password' => '普通密碼', + 'Normal password' => 'Normal password', 'database' => '資料庫', 'User' => '使用者', 'Host' => '主機', @@ -249,16 +251,16 @@ $LANG['tw'] = array( 'Users' => '使用者', 'Load Average' => '平均負載量', 'Memory Usage' => '記憶體使用量', - 'APACHE2 Usage' => 'APACHE2 使用量', - 'HTTPD Usage' => 'HTTPD 使用量', - 'NGINX Usage' => 'NGINX 使用量', - 'MySQL Usage on localhost' => '本機 MySQL 使用量', - 'PostgreSQL Usage on localhost' => '本機 PostgreSQL 使用量', - 'Bandwidth Usage eth0' => 'eth0 頻寬使用量', - 'Bandwidth Usage eth1' => 'eth1 頻寬使用量', - 'Exim Usage' => 'Exim 使用量', - 'FTP Usage' => 'FTP 使用量', - 'SSH Usage' => 'SSH 使用量', + 'APACHE2 Usage' => 'APACHE2 使用情形', + 'HTTPD Usage' => 'HTTPD 使用情形', + 'NGINX Usage' => 'NGINX 使用情形', + 'MySQL Usage on localhost' => '本機 MySQL 使用情形', + 'PostgreSQL Usage on localhost' => '本機 PostgreSQL 使用情形', + 'Bandwidth Usage eth0' => 'eth0 頻寬使用情形', + 'Bandwidth Usage eth1' => 'eth1 頻寬使用情形', + 'Exim Usage' => 'Exim 使用情形', + 'FTP Usage' => 'FTP 使用情形', + 'SSH Usage' => 'SSH 使用情形', 'reverse proxy' => '反向代理伺服器', 'web server' => '網站伺服器', 'dns server' => 'DNS 伺服器', @@ -275,12 +277,12 @@ $LANG['tw'] = array( 'Memory' => '記憶體', 'Uptime' => '已啟動時間', 'core package' => '核心系統', - 'php interpreter' => 'PHP 解析', + 'php interpreter' => 'PHP解析', 'internal web server' => '管理系統伺服器', 'Version' => '版本', 'Release' => '發佈號碼', 'Architecture' => '架構', - 'Object' => '物件', + 'Object' => 'Object', 'Username' => '使用者名稱', 'Password' => '密碼', 'Email' => '電子信箱', @@ -289,7 +291,7 @@ $LANG['tw'] = array( 'First Name' => '名字', 'Last Name' => '姓氏', 'Send login credentials to email address' => '傳送登入資訊至使用者的信箱', - 'Default Template' => '預設範本', + 'Default Template' => '預設模板', 'Default Name Servers' => '預設域名伺服器', 'Domain' => '網域', 'DNS Support' => 'DNS 支援', @@ -315,7 +317,7 @@ $LANG['tw'] = array( 'IP or Value' => 'IP 或值', 'Priority' => '優先順序', 'Record Number' => '記錄編號', - 'in megabytes' => '以 MB 為單位', + 'in megabytes' => '以MB為單位', 'Message' => '訊息', 'use local-part' => '使用本地部分', 'one or more email addresses' => '一個或更多電子郵件信箱', @@ -355,8 +357,8 @@ $LANG['tw'] = array( 'charset' => '編碼', 'domain' => '網域', 'ip' => 'IP', - 'ip address' => 'IP 位置', - 'IP address' => 'IP 位置', + 'ip address' => 'IP位置', + 'IP address' => 'IP位置', 'netmask' => '子網路遮罩', 'interface' => '介面卡', 'assigned user' => '指定使用者', @@ -368,19 +370,19 @@ $LANG['tw'] = array( 'last name' => '姓氏', 'account' => '帳號', 'ssl certificate' => 'SSL 憑證', - 'ssl key' => 'SSL 密鑰', + 'ssl key' => 'SSL密鑰', 'stats user password' => '統計使用者帳號密碼', 'stats username' => '統計使用者名稱', 'stats password' => '統計密碼', - 'ftp user password' => 'FTP 使用者帳號密碼', - 'ftp user' => 'FTP 使用者', - 'Last 70 lines of %s.%s.log' => '%s.%s.log 的最後 70 行', + 'ftp user password' => 'FTP使用者帳號密碼', + 'ftp user' => 'FTP使用者', + 'Last 70 lines of %s.%s.log' => '%s.%s.log 的最後70行', 'AccessLog' => '存取記錄', 'ErrorLog' => '錯誤紀錄', 'Download AccessLog' => '下載存取記錄', 'Download ErrorLog' => '下載錯誤記錄', 'Country' => '國家', - '2 letter code' => '國家簡碼(台灣 TW、香港 HK)', + '2 letter code' => '國家簡碼(台灣是TW/香港是HK)', 'State / Province' => '州 / 省', 'City / Locality' => '市 / 地區', 'Organization' => '組織名稱', @@ -389,10 +391,10 @@ $LANG['tw'] = array( 'Port' => '連線埠', 'Comment' => '備註', 'Banlist' => '封鎖清單', - 'ranges are acceptable' => '可接受陣列', - 'CIDR format is supported' => '支援 CIDR 格式', - 'ACCEPT' => '允許', - 'DROP' => '封鎖', + 'ranges are acceptable' => 'ranges are acceptable', + 'CIDR format is supported' => 'CIDR format is supported', + 'ACCEPT' => 'ACCEPT', + 'DROP' => 'DROP', 'TCP' => 'TCP', 'UDP' => 'UDP', 'ICMP' => 'ICMP', @@ -401,11 +403,11 @@ $LANG['tw'] = array( 'VESTA' => 'VESTA', 'Add one more Name Server' => '新增至少一個域名伺服器', - 'web domain' => 'Web 網域', - 'dns domain' => 'DNS 網域', - 'dns record' => 'DNS 紀錄', - 'mail domain' => 'Mail 紀錄', - 'mail account' => 'Mail 帳號', + 'web domain' => 'web 網域', + 'dns domain' => 'dns 網域', + 'dns record' => 'dns 紀錄', + 'mail domain' => 'mail 紀錄', + 'mail account' => 'mail 帳號', 'cron job' => '任務排程', 'cron' => '任務排程', @@ -424,71 +426,71 @@ $LANG['tw'] = array( '%s databases' => '%s 個資料庫', '1 cron job' => '1 個任務排程', '%s cron jobs' => '%s 個任務排程', - '1 archive' => '1 個壓縮', - '%s archives' => '%s 個壓縮', + '1 archive' => '1 壓縮', + '%s archives' => '%s 壓縮', '1 item' => '1 個項目', '%s items' => '%s 個項目', '1 package' => '1 種方案', - '%s packages' => '%s 種方案', + '%s packages' => '%s 整方案', '1 IP address' => '1 個 IP 位置', '%s IP addresses' => '%s 個 IP 位置', - '1 month' => '1 個月', - '%s months' => '%s 個月', - '1 log record' => '1 筆系統記錄', - '%s log records' => '%s 筆系統記錄', + '1 month' => '1 月', + '%s months' => '%s 月', + '1 log record' => '1 系統記錄', + '%s log records' => '%s 系統記錄', '1 object' => '1 個物件', '%s objects' => '%s 個物件', 'no exclusions' => '取消排除', '1 rule' => '1 條規則', '%s rules' => '%s 條規則', - 'There are no currently banned IP' => '目前沒有任何已封鎖的 IP', + 'There are no currently banned IP' => '目前沒有任何已封鎖的IP', - 'USER_CREATED_OK' => '使用者 %s has been 已加入成功!', - 'WEB_DOMAIN_CREATED_OK' => '網域 %s 已加入成功!', - 'DNS_DOMAIN_CREATED_OK' => 'DNS 網域 %s 已加入成功!', - 'DNS_RECORD_CREATED_OK' => '記錄 %s.%s 已加入成功!', - 'MAIL_DOMAIN_CREATED_OK' => '信箱網域 %s 已加入成功!', - 'MAIL_ACCOUNT_CREATED_OK' => '信箱帳號 %s@%s 已加入成功!', - 'DATABASE_CREATED_OK' => '資料庫 %s 已加入成功!', - 'CRON_CREATED_OK' => '任務排程 已加入成功!', - 'IP_CREATED_OK' => 'IP 位置 %s 已加入成功!', - 'PACKAGE_CREATED_OK' => '方案 %s 已加入成功!', - 'SSL_GENERATED_OK' => '已成功產生 SSL 憑證!', - 'RULE_CREATED_OK' => '已成功加入規則!', + 'USER_CREATED_OK' => '使用者 %s has been 已加入成功!', + 'WEB_DOMAIN_CREATED_OK' => '網域 %s 已加入成功!', + 'DNS_DOMAIN_CREATED_OK' => 'DNS網域 %s 已加入成功!', + 'DNS_RECORD_CREATED_OK' => '記錄 %s.%s 已加入成功!', + 'MAIL_DOMAIN_CREATED_OK' => '信箱網域 %s 已加入成功!', + 'MAIL_ACCOUNT_CREATED_OK' => '信箱帳號 %s@%s 已加入成功!', + 'DATABASE_CREATED_OK' => '資料庫 %s 已加入成功!', + 'CRON_CREATED_OK' => '任務排程 已加入成功!', + 'IP_CREATED_OK' => 'IP位置 %s 已加入成功!', + 'PACKAGE_CREATED_OK' => '方案 %s 已加入成功!', + 'SSL_GENERATED_OK' => '已成功產生 SSL 憑證!', + 'RULE_CREATED_OK' => '已成功加入規則!', 'BANLIST_CREATED_OK' => 'IP 位置已經成功封鎖', - 'Autoupdate has been successfully enabled' => '「自動更新」已成功啟動', - 'Autoupdate has been successfully disabled' => '「自動更新」已成功關閉', - 'Cronjob email reporting has been successfully enabled' => '「任務排程電子郵件回報」已成功啟動', - 'Cronjob email reporting has been successfully disabled' => '「任務排程電子郵件回報」已成功關閉', - 'Changes has been saved.' => '已儲存變更', + 'Autoupdate has been successfully enabled' => '自動更新已成功啟動', + 'Autoupdate has been successfully disabled' => '自動更新已成功關閉', + 'Cronjob email reporting has been successfully enabled' => '任務排程 電子郵件回報已成功啟動', + 'Cronjob email reporting has been successfully disabled' => '任務排程 電子郵件回報已成功關閉', + 'Changes has been saved.' => '已儲存更改', 'Confirmation' => '確認', - 'DELETE_USER_CONFIRMATION' => '確定要刪除使用者 %s 嗎?', - 'SUSPEND_USER_CONFIRMATION' => '確定要停用使用者 %s 嗎?', - 'UNSUSPEND_USER_CONFIRMATION' => '確定要解除停用使用者 %s 嗎?', - 'DELETE_DOMAIN_CONFIRMATION' => '確定要刪除網域 %s 嗎?', - 'SUSPEND_DOMAIN_CONFIRMATION' => '確定要停用網域 %s 嗎?', - 'UNSUSPEND_DOMAIN_CONFIRMATION' => '確定要解除停用網域 %s 嗎?', - 'DELETE_RECORD_CONFIRMATION' => '確定要刪除記錄 %s 嗎?', - 'SUSPEND_RECORD_CONFIRMATION' => '確定要停用記錄 %s 嗎?', - 'UNSUSPEND_RECORD_CONFIRMATION' => '確定要解除停用紀錄 %s 嗎?', - 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '確定要刪除 %s 嗎?', - 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要停用 %s 嗎?', - 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要解除停用 %s 嗎?', - 'DELETE_DATABASE_CONFIRMATION' => '確定要刪除資料庫 %s 嗎?', - 'SUSPEND_DATABASE_CONFIRMATION' => '確定要停用資料庫 %s 嗎?', - 'UNSUSPEND_DATABASE_CONFIRMATION' => '確定要解除停用資料庫 %s 嗎?', - 'DELETE_CRON_CONFIRMATION' => '確定要刪除 任務排程嗎?', - 'SUSPEND_CRON_CONFIRMATION' => '確定要停用 任務排程嗎?', - 'UNSUSPEND_CRON_CONFIRMATION' => '確定要解除停用 任務排程嗎?', - 'DELETE_BACKUP_CONFIRMATION' => '確定要刪除 %s 備份嗎?', - 'DELETE_EXCLUSION_CONFIRMATION' => '確定要刪除 %s 例外嗎?', - 'DELETE_PACKAGE_CONFIRMATION' => '確定要刪除方案 %s 嗎?', - 'DELETE_IP_CONFIRMATION' => '確定要刪除 IP 地址 %s 嗎?', - 'DELETE_RULE_CONFIRMATION' => '確定要刪除防火牆規則 #%s 嗎?', - 'SUSPEND_RULE_CONFIRMATION' => '確定要停用防火牆規則 #%s 嗎?', - 'UNSUSPEND_RULE_CONFIRMATION' => '確定要解除停用防火牆規則 #%s 嗎?', - 'LEAVE_PAGE_CONFIRMATION' => '確定離開嗎?', - 'RESTART_CONFIRMATION' => '確定要重新啟動 %s 嗎?', + 'DELETE_USER_CONFIRMATION' => '確定要刪除使用者 %s 嗎?', + 'SUSPEND_USER_CONFIRMATION' => '確定要封鎖使用者 %s 嗎?', + 'UNSUSPEND_USER_CONFIRMATION' => '確定要解除封鎖使用者 %s 嗎?', + 'DELETE_DOMAIN_CONFIRMATION' => '確定要刪除網域 %s 嗎?', + 'SUSPEND_DOMAIN_CONFIRMATION' => '確定要封鎖網域 %s 嗎?', + 'UNSUSPEND_DOMAIN_CONFIRMATION' => '確定要解除封鎖網域 %s 嗎?', + 'DELETE_RECORD_CONFIRMATION' => '確定要刪除記錄 %s 嗎?', + 'SUSPEND_RECORD_CONFIRMATION' => '確定要封鎖記錄 %s 嗎?', + 'UNSUSPEND_RECORD_CONFIRMATION' => '確定要解除封鎖紀錄 %s 嗎?', + 'DELETE_MAIL_ACCOUNT_CONFIRMATION' => '確定要刪除 %s 嗎?', + 'SUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要封鎖 %s 嗎?', + 'UNSUSPEND_MAIL_ACCOUNT_CONFIRMATION' => '確定要解除封鎖 %s 嗎?', + 'DELETE_DATABASE_CONFIRMATION' => '確定要刪除資料庫 %s 嗎?', + 'SUSPEND_DATABASE_CONFIRMATION' => '確定要封鎖資料庫 %s 嗎?', + 'UNSUSPEND_DATABASE_CONFIRMATION' => '確定要解除封鎖資料庫 %s 嗎?', + 'DELETE_CRON_CONFIRMATION' => '確定要刪除 任務排程嗎?', + 'SUSPEND_CRON_CONFIRMATION' => '確定要封鎖 任務排程嗎?', + 'UNSUSPEND_CRON_CONFIRMATION' => '確定要解除封鎖 任務排程嗎?', + 'DELETE_BACKUP_CONFIRMATION' => '確定要刪除 %s 備份嗎?', + 'DELETE_EXCLUSION_CONFIRMATION' => '確定要刪除 %s 例外嗎?', + 'DELETE_PACKAGE_CONFIRMATION' => '確定要方案 %s 嗎?', + 'DELETE_IP_CONFIRMATION' => '確定要刪除IP地址 %s 嗎?', + 'DELETE_RULE_CONFIRMATION' => '確定要刪除規則 #%s 嗎?', + 'SUSPEND_RULE_CONFIRMATION' => '確定要封鎖規則 #%s 嗎?', + 'UNSUSPEND_RULE_CONFIRMATION' => '確定要解除封鎖規則 #%s 嗎?', + 'LEAVE_PAGE_CONFIRMATION' => '離開?', + 'RESTART_CONFIRMATION' => '確定要重新啟動 %s 嗎?', 'Welcome' => '歡迎', 'LOGGED_IN_AS' => '以使用者身份 %s 登入', 'Error' => '錯誤', @@ -496,20 +498,20 @@ $LANG['tw'] = array( 'Invalid username or code' => '無效的使用者名稱或驗證碼.', 'Passwords not match' => '密碼錯誤', 'Please enter valid email address.' => '請輸入正確的信箱', - 'Field "%s" can not be blank.' => '"%s" 欄位不能空白', - 'Password is too short.' => '密碼太短。', - 'Error code:' => '錯誤代碼:%s', + 'Field "%s" can not be blank.' => '"%s" 不能為空白', + 'Password is too short.' => '密碼太短', + 'Error code:' => '錯誤代碼: %s', 'SERVICE_ACTION_FAILED' => '"%s" "%s" 失敗', 'IP address is in use' => 'IP 位置正在使用中', 'BACKUP_SCHEDULED' => '您的要求已加入隊列中,備份完成後會再以電子郵件通知您', - 'BACKUP_EXISTS' => '已經有一個備份正在執行中,請等待備份完成後再動作', - 'RESTORE_SCHEDULED' => '您的要求已加入隊列中,還原完成後會再以電子郵件通知您', - 'RESTORE_EXISTS' => '已經有一個還原正在執行中,請等待備份完成後再動作', + 'BACKUP_EXISTS' => '已經有一個備份正在執行中,請等待備份完成後再操作', + 'RESTORE_SCHEDULED' => '您的要求已加入隊列中,回復完成後會再以電子郵件通知您', + 'RESTORE_EXISTS' => '已經有一個回復正在執行中,請等待備份完成後再操作', - 'WEB_EXCLUSIONS' => '輸入網域名稱,每行一個網域。如要排除備份所有網域請使用「*」。排除特定的資料夾請依照這個格式:Example.com:public_html/cache:public_html/tmp', - 'DNS_EXCLUSIONS' => '輸入網域名稱,每行一個網域。如要排除備份所有網域請使用「*」', - 'MAIL_EXCLUSIONS' => '輸入網域名稱,每行一個網域。如要排除備份所有網域請使用「*」。要排除特定使用者請依照這個格式:Example.com:info:support:postmaster', - 'DB_EXCLUSIONS' => '輸入完整資料庫名城,每行一個資料庫。如要排除備份所有資料庫請使用「*」', + 'WEB_EXCLUSIONS' => '輸入網域名稱,每行一個網域。如要排除備份所有網域請使用*。排除特定的資料夾請依照這個格式: Example.com:public_html/cache:public_html/tmp', + 'DNS_EXCLUSIONS' => '輸入網域名稱,每行一個網域。如要排除備份所有網域請使用*', + 'MAIL_EXCLUSIONS' => '輸入網域名稱,每行一個網域。如要排除備份所有網域請使用*。要排除特定使用者請依照這個格式: Example.com:info:support:postmaster', + 'DB_EXCLUSIONS' => '輸入完整資料庫名城,每行一個資料庫。如要排除備份所有資料庫請使用*', 'CRON_EXCLUSIONS' => '要排除備份所有任務排程請使用*', 'USER_EXCLUSIONS' => '輸入要排除備份的資料夾名稱,每行一個資料夾。如要排除備份所有資料夾請使用*', @@ -517,13 +519,13 @@ $LANG['tw'] = array( 'MAIL_FROM' => 'Vesta 管理系統 ', 'GREETINGS_GORDON_FREEMAN' => "您好, %s %s,\n", 'GREETINGS' => "您好,\n", - 'ACCOUNT_READY' => "您的帳號已成功建立,並可以開始使用了!\n\nhttps://%s/login/\n使用者名稱:%s\n密碼:%s\n\n--\nVesta Control Panel\n", + 'ACCOUNT_READY' => "您的帳號已成功建立,並可以開始使用了!\n\nhttps://%s/login/\n使用者名稱: %s\n密碼: %s\n\n--\nVesta Control Panel\n", 'FTP login credentials' => 'FTP 登入資料', - 'FTP_ACCOUNT_READY' => "FTP 帳號已成功建立,並可以開始使用了!\n\n主機名稱:%s\n使用者名稱:%s_%s\n密碼:%s\n\n--\nVesta Control Panel\n", + 'FTP_ACCOUNT_READY' => "FTP帳號已成功建立,並可以開始使用了!\n\n主機名稱: %s\n使用者名稱: %s_%s\n密碼: %s\n\n--\nVesta Control Panel\n", 'Database Credentials' => '資料庫 登入資料', - 'DATABASE_READY' => "資料庫已加入成功!\n\n資料庫名稱:%s\n使用者名稱:%s\n密碼:%s\n%s\n\n--\nVesta Control Panel\n", + 'DATABASE_READY' => "資料庫已加入成功!\n\n資料庫名稱: %s\n使用者名稱: %s\n密碼: %s\n%s\n\n--\nVesta Control Panel\n", 'forgot password' => '忘記密碼', 'Confirm' => '確認', @@ -532,22 +534,22 @@ $LANG['tw'] = array( 'Reset' => '重設', 'Reset Code' => '重設代碼', 'RESET_NOTICE' => '', - 'RESET_CODE_SENT' => '密碼重設代碼已傳送到您的信箱
', - 'MAIL_RESET_SUBJECT' => '密碼重設在 %s', - 'PASSWORD_RESET_REQUEST' => "重設密碼請點擊連結:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 輸入密碼重設代碼:\n%s\n\n如果您沒有要求重設密碼,請忽略此郵件\n\n—\nVesta Control Panel\n", + 'RESET_CODE_SENT' => '密買重設代碼已發送到您的信箱
', + 'MAIL_RESET_SUBJECT' => '密碼重置在 %s', + 'PASSWORD_RESET_REQUEST' => "重置密碼請點擊連結:\nhttps://%s/reset/?action=confirm&user=%s&code=%s\n\n或者您可以到 https://%s/reset/?action=code&user=%s 輸入密碼重設代碼:\n%s\n\n如果您沒有要求重設密碼,請忽略此郵件\n\n—\nVesta Control Panel\n", - 'Jan' => '一月', - 'Feb' => '二月', - 'Mar' => '三月', - 'Apr' => '四月', - 'May' => '五月', - 'Jun' => '六月', - 'Jul' => '七月', - 'Aug' => '八月', - 'Sep' => '九月', - 'Oct' => '十月', - 'Nov' => '十一月', - 'Dec' => '十二月', + 'Jan' => '1月', + 'Feb' => '2月', + 'Mar' => '3月', + 'Apr' => '4月', + 'May' => '5月', + 'Jun' => '6月', + 'Jul' => '7月', + 'Aug' => '8月', + 'Sep' => '9月', + 'Oct' => '10月', + 'Nov' => '11月', + 'Dec' => '12月', 'Configuring Server' => '設定主機', 'Hostname' => '主機名稱', @@ -556,13 +558,12 @@ $LANG['tw'] = array( 'Proxy Server' => 'Proxy 伺服器', 'Web Server' => 'Web 伺服器', 'Backend Server' => 'Backend 伺服器', - 'Backend Pool Mode' => 'Backend 池模式', + 'Backend Pool Mode' => 'Backend Pool Mode', 'DNS Server' => 'DNS 伺服器', 'DNS Cluster' => 'DNS 叢集', 'MAIL Server' => 'MAIL 伺服器', 'Antivirus' => '病毒防護', 'AntiSpam' => '垃圾郵件防護', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Webmail 路徑', 'MySQL Support' => 'MySQL 支援', 'phpMyAdmin URL' => 'phpMyAdmin 路徑', @@ -572,7 +573,7 @@ $LANG['tw'] = array( 'Current Number Of Databases' => '目前的資料庫數量', 'Local backup' => '本機備份', 'Compression level' => '壓縮等級', - 'Directory' => '路徑', + 'Directory' => 'Directory', 'Remote backup' => '遠端備份', 'ftp' => 'FTP', 'sftp' => 'SFTP', @@ -585,9 +586,9 @@ $LANG['tw'] = array( 'Template Manager' => '模組管理員', 'Backup Migration Manager' => '備份轉移管理員', 'FileManager' => '檔案管理員', - 'show: CPU / MEM / NET / DISK' => '顯示:處理器 / 記憶體 / 網路 / 硬碟', + 'show: CPU / MEM / NET / DISK' => '顯示: 處理器 / 記憶體 / 網路 / 硬碟', - 'sort by' => '排序依', + 'sort by' => '排序按照', 'Date' => '日期', 'Starred' => '加註星號', 'Name' => '名稱', @@ -610,8 +611,8 @@ $LANG['tw'] = array( 'ARCHIVE' => '壓縮', 'EXTRACT' => '解壓縮', 'DOWNLOAD' => '下載', - 'Are you sure?' => '確定嗎?', - 'Hit' => '點擊', + 'Are you sure?' => '確定嗎?', + 'Hit' => 'Hit', 'to reload the page' => '重新整理頁面', 'Directory name cannot be empty' => '資料夾名稱不能為空白', 'File name cannot be empty' => '檔案名稱不能為空白', @@ -663,18 +664,18 @@ $LANG['tw'] = array( 'Cancel saving form' => '不要儲存設定', 'Go to USER list' => '回到使用者列表', 'Go to WEB list' => '回到網站列表', - 'Go to DNS list' => '回到 DNS 列表', + 'Go to DNS list' => '回到DNS列表', 'Go to MAIL list' => '回到郵件列表', 'Go to DB list' => '回到資料庫列表', 'Go to CRON list' => '回到任務排程列表', 'Go to BACKUP list' => '回到備份列表', 'Focus on search' => '搜尋', 'Display/Close shortcuts' => '顯示/關閉 快捷鍵列表', - 'Move backward through top menu' => '在頂部選單中向左移動', - 'Move forward through top menu' => '在頂部選單中向右移動', + 'Move backward through top menu' => '在頂置選單中向左移動', + 'Move forward through top menu' => '在頂置選單中向右移動', 'Enter focused element' => '進入選擇的選項', - 'Move up through elements list' => '往上檢視列表', - 'Move down through elements list' => '往下檢視列表', + 'Move up through elements list' => '往上查看列表', + 'Move down through elements list' => '往下查看列表', 'Upload' => '上傳', 'New File' => '新增檔案', @@ -707,13 +708,13 @@ $LANG['tw'] = array( 'Disable and Cancel Licence' => '刪除並且取消授權', 'Licence Activated' => '授權已啟用', 'Licence Deactivated' => '授權已停用', - 'Restrict users so that they cannot use SSH and access only their home directory.' => '禁止使用者使用 SSH,並且只能存取他們自己的資料夾', - 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '使用全能的檔案管理員瀏覽、複製、編輯、存取你所有的網站資料', + 'Restrict users so that they cannot use SSH and access only their home directory.' => '禁止使用者使用SSH,並且只能存取他們自己的資料夾', + 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => '瀏覽、複製、編輯、存取你所有的網站資料使用全能的檔案管理員', 'This is a commercial module, you would need to purchace license key to enable it.' => '這是一個付費模組,您需要購買授權金鑰才能啟用它。', - 'Minutes' => '分鐘', + 'Minutes' => '分', 'Hourly' => '小時', - 'Run Command' => '執行指令', + 'Run Command' => '執行命令', 'every month' => '每月', 'every odd month' => '奇數月', 'every even month' => '偶數月', @@ -739,14 +740,14 @@ $LANG['tw'] = array( 'webalizer' => 'webalizer', 'awstats' => 'awstats', - 'Vesta SSL' => 'Vesta 後台 SSL', - 'SUBJECT' => '主體名稱', - 'ALIASES' => '主體別名', - 'NOT_BEFORE' => '有效期自', - 'NOT_AFTER' => '有效期到', - 'SIGNATURE' => '簽章演算法', - 'PUB_KEY' => '公開金鑰', - 'ISSUER' => '簽發者', + 'Vesta SSL' => 'Vesta SSL', + 'SUBJECT' => 'SUBJECT', + 'ALIASES' => 'ALIASES', + 'NOT_BEFORE' => 'NOT_BEFORE', + 'NOT_AFTER' => 'NOT_AFTER', + 'SIGNATURE' => 'SIGNATURE', + 'PUB_KEY' => 'PUB_KEY', + 'ISSUER' => 'ISSUER', 'Use server hostname' => '使用伺服器主機名稱', 'Use domain hostname' => '使用網域主機名稱', @@ -755,7 +756,7 @@ $LANG['tw'] = array( 'No encryption' => '不加密', 'Do not use encryption' => '不要使用加密', - 'maximum characters length, including prefix' => '最多 %s 字元 (包含前綴)', + 'maximum characters length, including prefix' => '最多 %s 字元(包含前綴)', - 'Email Credentials' => '信箱登入資訊', + 'Email Credentials' => 'Email Credentials', ); diff --git a/web/inc/i18n/ua.php b/web/inc/i18n/ua.php index d552b3f8..cf47496d 100644 --- a/web/inc/i18n/ua.php +++ b/web/inc/i18n/ua.php @@ -196,7 +196,6 @@ $LANG['ua'] = array( 'SSL Home Directory' => 'Домашня тека SSL', 'Lets Encrypt Support' => 'Підтримка Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Ваш сертифікат буде автоматично виданий протягом 5-ти хвилин', 'Proxy Support' => 'Підтримка Proxy', 'Proxy Extensions' => 'Розширення Proxy', @@ -561,7 +560,6 @@ $LANG['ua'] = array( 'MAIL Server' => 'MAIL сервер', 'Antivirus' => 'Антивірус', 'AntiSpam' => 'АнтиСпам', - 'Use Web Domain SSL Certificate' => 'Використовувати SSL сертифікат веб домену', 'Webmail URL' => 'Webmail URL', 'MySQL Support' => 'Підтримка MySQL', 'phpMyAdmin URL' => 'phpMyAdmin URL', diff --git a/web/inc/i18n/ur.php b/web/inc/i18n/ur.php index 87c11ed3..d01a401d 100644 --- a/web/inc/i18n/ur.php +++ b/web/inc/i18n/ur.php @@ -70,7 +70,6 @@ $LANG['ur'] = array( 'Back' => 'پیچھے', 'Save' => 'محفوظ کریں', 'Submit' => 'جمع', - 'toggle all' => 'تمام ٹاگل', 'apply to selected' => 'منتخب شدہ پر لاگو', 'rebuild' => 'تعمیر نو', @@ -108,10 +107,7 @@ $LANG['ur'] = array( 'reread IP' => 'IP پھر سے پڑھنا', 'enable autoupdate' => 'آٹو اپ ڈیٹ کو چالو', 'disable autoupdate' => 'غیر فعال آٹو اپ ڈیٹ', - 'turn on notifications' => 'turn on notifications', - 'turn off notifications' => 'turn off notifications', 'configure' => 'ترتیب دے', - 'Adding User' => 'شامل کرنے صارف', 'Editing User' => 'ترمیم صارف', 'Adding Domain' => 'ڈومین کو شامل کرنے سے', @@ -139,7 +135,6 @@ $LANG['ur'] = array( 'Adding Firewall Rule' => 'فصیل اصول کو شامل کرنے سے', 'Editing Firewall Rule' => 'ترمیم فصیل اصول', 'Adding IP Address to Banlist' => 'Banlist کرنے IP ایڈریس کو شامل کرنے سے', - 'active' => 'فعال', 'spnd' => 'معطل', 'suspended' => 'معطل', @@ -147,7 +142,6 @@ $LANG['ur'] = array( 'stopped' => 'بند کر دیا', 'outdated' => 'فرسودہ', 'updated' => 'اپ ڈیٹ', - 'yes' => 'جی ہاں', 'no' => 'نہیں', 'none' => 'کوئی بھی', @@ -196,7 +190,6 @@ $LANG['ur'] = array( 'SSL Home Directory' => 'SSL ہوم', 'Lets Encrypt Support' => 'ینکریپٹ سپورٹ کی اجازت دیتا ہے', 'Lets Encrypt' => 'ینکریپٹ کی اجازت دیتا ہے', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'آپ کے سرٹیفکیٹ خود بخود 5 منٹ میں جاری کیا جائے گا', 'Proxy Support' => 'پراکسی سپورٹ', 'Proxy Extensions' => 'پراکسی ایکسٹنشن', @@ -399,17 +392,14 @@ $LANG['ur'] = array( 'FTP' => 'FTP', 'VESTA' => 'Vesta کی', 'Add one more Name Server' => 'ایک اور نام سرور شامل کریں', - 'web domain' => 'ویب ڈومین', 'dns domain' => 'DNS ڈومین', 'dns record' => 'DNS ریکارڈ', 'mail domain' => 'میل ڈومین', 'mail account' => 'میل اکاؤنٹ', 'cron job' => 'کرون کام', - 'cron' => 'کرون', 'user dir' => 'صارف دیر', - 'unlimited' => 'لامحدود', '1 account' => '1 اکاؤنٹ', '%s accounts' => '٪s کے اکاؤنٹس', @@ -504,14 +494,12 @@ $LANG['ur'] = array( 'BACKUP_EXISTS' => 'ایک موجودہ بیک اپ کو پہلے ہی چل رہا ہے. کہ بیک اپ کو ختم کرنے کے لئے براہ کرم انتظار کریں.', 'RESTORE_SCHEDULED' => 'ٹاسک قطار میں شامل کیا گیا ہے. جب آپ کو بحال مکمل کیا گیا ہے آپ کو ایک ای میل کی اطلاع وصول کریں گے.', 'RESTORE_EXISTS' => 'ایک موجودہ بحالی کا کام پہلے سے ہی چل رہا ہے. جو اسے دوبارہ شروع کرنے سے پہلے ختم کرنے کے لئے براہ کرم انتظار کریں.', - 'WEB_EXCLUSIONS' => 'قسم ڈومین کا نام ہے، ایک فی لائن. تمام ڈومینز استعمال کرتے خارج کرنے کے *. شکل مندرجہ ذیل مخصوص dirs استعمال کو خارج کرنے کے لئے: domain.com:public_html/cache:public_html/tmp', 'DNS_EXCLUSIONS' => 'قسم ڈومین کا نام ہے، ایک فی لائن. تمام ڈومینز استعمال کرتے خارج کرنے کے *', 'MAIL_EXCLUSIONS' => 'قسم ڈومین کا نام ہے، ایک فی لائن. تمام ڈومینز استعمال کرتے خارج کرنے کے *. شکل مندرجہ ذیل مخصوص اکاؤنٹس کے استعمال کو خارج کرنے کے لئے: domain.com:info:support:postmaster', 'DB_EXCLUSIONS' => 'مکمل ڈیٹا بیس کا نام ٹائپ کریں، فی لائن ایک. تمام ڈیٹا بیس کا استعمال کرتے خارج کرنے کے *', 'CRON_EXCLUSIONS' => 'تمام ملازمتوں کا استعمال کرتے خارج کرنے کے *', 'USER_EXCLUSIONS' => 'قسم ڈائریکٹری کا نام ہے، ایک فی لائن. تمام dirs استعمال کرتے exlude کرنے *', - 'Welcome to Vesta Control Panel' => 'Vesta کی کنٹرول پینل میں خوش آمدید', 'MAIL_FROM' => ' Vesta کی کنٹرول پینل ', 'GREETINGS_GORDON_FREEMAN' => "ہیلو, %s %s,\n", @@ -547,7 +535,6 @@ $LANG['ur'] = array( 'Oct' => 'اکتوبر', 'Nov' => 'نومبر', 'Dec' => 'دسمبر', - 'Configuring Server' => 'ترتیب سرور', 'Hostname' => 'میزبان کا نام', 'Time Zone' => 'ٹائم زون', @@ -561,7 +548,6 @@ $LANG['ur'] = array( 'MAIL Server' => 'میل سرور', 'Antivirus' => 'اینٹی وائرس', 'AntiSpam' => 'اینٹی سپیم', - 'Use Web Domain SSL Certificate' => 'ایس ایس ایل ویب ڈومین سرٹیفکیٹ کااستعمال کریں', 'Webmail URL' => 'ویب میل URL', 'MySQL Support' => 'ایس کیو ایل کی معاونت کی', 'phpMyAdmin URL' => 'phpMyAdmin کے یو آر ایل', @@ -585,14 +571,11 @@ $LANG['ur'] = array( 'Backup Migration Manager' => 'بیک اپ مائیگریشن مینیجر', 'FileManager' => 'فائل مینیجر', 'show: CPU / MEM / NET / DISK' => 'دکھائیں: CPU / MEM / NET / ڈسک', - 'sort by' => 'بہ ترتیب', 'Date' => 'تاریخ', 'Starred' => 'ستارے کے نشان', 'Name' => 'نام', - 'save to favorites' => 'پسندیدہ میں محفوظ کریں', - 'File Manager' => 'فائل منیجر', 'size' => 'سائز', 'date' => 'تاریخ', @@ -655,7 +638,6 @@ $LANG['ur'] = array( 'read by others' => 'دوسروں کی طرف سے پڑھا', 'write by others' => 'دوسروں کی طرف سے لکھ', 'execute/search by others' => 'پھانسی دوسروں کی طرف سے / تلاش', - 'Shortcuts' => 'شارٹ کٹ', 'Add New object' => 'نیا اعتراض شامل کریں', 'Save Form' => 'فارم محفوظ کریں', @@ -674,7 +656,6 @@ $LANG['ur'] = array( 'Enter focused element' => 'مرکوز عنصر درج', 'Move up through elements list' => 'عناصر فہرست کے ذریعے اوپر منتقل کریں', 'Move down through elements list' => 'عناصر فہرست کے ذریعے نیچے لے جائیں', - 'Upload' => 'اپ لوڈ کریں', 'New File' => 'نئی فائل', 'New Folder' => 'نیا فولڈر', @@ -698,7 +679,6 @@ $LANG['ur'] = array( 'Select All Files' => 'تمام فائلوں کو منتخب', 'shortcuts are inspired by magnificent GNU Midnight Commander file manager' => '.فائل مینیجر Midnight Commander شارٹ کٹ شاندار GNU سے متاثر ہیں', - 'Licence Key' => 'لائسنس کلید', 'Enter License Key' => 'لائسنس کلید درج کریں', 'Buy Licence' => 'ابھی لائسنس', @@ -709,7 +689,6 @@ $LANG['ur'] = array( 'Restrict users so that they cannot use SSH and access only their home directory.' => 'وہ SSH اور رسائی صرف ان کے گھر کی ڈائریکٹری کا استعمال نہیں کر سکتے ہیں تاکہ صارفین کو محدود کریں.', 'Browse, copy, edit, view, and retrieve all of your web domain files using fully featured File Manager.' => 'براؤز کریں، کاپی، ترمیم، دیکھیں، اور مکمل طور پر نمایاں فائل مینیجر کا استعمال کرتے ہوئے آپ کی ویب ڈومین فائلوں کی تمام بازیافت.', 'This is a commercial module, you would need to purchace license key to enable it.' => 'یہ ایک تجارتی ماڈیول ہے، آپ اسے چالو کرنے کے لئے لائسنس کی چابی purchace کرنے کی ضرورت گا.', - 'Minutes' => 'منٹس', 'Hourly' => 'گھنٹہ وار', 'Run Command' => 'چلائیں کمان', @@ -734,10 +713,8 @@ $LANG['ur'] = array( 'every two minutes' => 'ہر دو منٹ', 'every' => 'ہر کوئی', 'Generate' => 'بنائیں', - 'webalizer' => 'webalizer', 'awstats' => 'awstats', - 'Vesta SSL' => 'Vesta کی SSL', 'SUBJECT' => 'مضمون', 'ALIASES' => 'عرفیتیں', @@ -746,18 +723,14 @@ $LANG['ur'] = array( 'SIGNATURE' => 'دستخط', 'PUB_KEY' => 'PUB_KEY', 'ISSUER' => 'ISSUER', - 'Use server hostname' => 'سرور استعمال میزبان نام', 'Use domain hostname' => 'ڈومین کا استعمال میزبان نام', 'Use STARTTLS' => 'STARTTLS استعمال', - 'Use SSL / TLS' => 'SSL استعمال کریں', + 'Use SSL' => 'SSL استعمال کریں', 'No encryption' => 'کوئی خفیہ کاری', 'Do not use encryption' => 'خفیہ کاری کا استعمال نہ کریں', - 'maximum characters length, including prefix' => 'زیادہ سے زیادہ ٪s کو حروف لمبائی، سابقہ سم', - 'Email Credentials' => 'ای میل کی سند', - '%s rule' => 'قواعد %s', 'MainDomain' => 'اہم ڈومین', 'SubDomain' => 'ذیلی ڈومین', diff --git a/web/inc/i18n/vi.php b/web/inc/i18n/vi.php index 303bf8ac..40d40cbe 100644 --- a/web/inc/i18n/vi.php +++ b/web/inc/i18n/vi.php @@ -198,7 +198,6 @@ $LANG['vi'] = array( 'SSL Home Directory' => 'Trang chủ SSL', 'Lets Encrypt Support' => 'Hỗ trợ Lets Encrypt', 'Lets Encrypt' => 'Lets Encrypt', - 'You can add LetsEncrypt after adding domain, just EDIT this domain later' => 'You can add LetsEncrypt after adding domain, just EDIT this domain later', 'Your certificate will be automatically issued in 5 minutes' => 'Chứng chỉ của bạn sẽ được tự động cấp phát trong 5 phút', 'Proxy Support' => 'Hỗ trợ Nginx', 'Proxy Extensions' => 'Phần mở rộng Nginx', @@ -563,7 +562,6 @@ $LANG['vi'] = array( 'MAIL Server' => 'Máy chủ MAIL', 'Antivirus' => 'Trình diệt virus', 'AntiSpam' => 'Trình chống spam', - 'Use Web Domain SSL Certificate' => 'Use Web Domain SSL Certificate', 'Webmail URL' => 'Đường dẫn Webmail', 'MySQL Support' => 'Hỗ trợ MySQL', 'phpMyAdmin URL' => 'Đường dẫn phpMyAdmin', diff --git a/web/inc/main.php b/web/inc/main.php index f13e4142..dfa482a1 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -1,14 +1,9 @@ Your browser sent HTTP_ORIGIN with value: ".$_SERVER['HTTP_ORIGIN']."
myVesta expected HTTP_ORIGIN with value: ".$expected_http_origin."
Probably some browser extension is blocking it... disable all browser extensions and try again (or try to login with other browser).
If you are system administrator of this server, you can disable CSRF check by doing (as root, in SSH): mkdir -p /usr/local/vesta/conf_web && touch /usr/local/vesta/conf_web/dont_check_csrf
(but we don't recommend it)
If you are not system administrator of this server and you can't access the hosting panel even you disabled all browser extensions, please copy-paste this message to the system administrator of this server.
Once again, before you disable CSRF check, try to disable all browser extensions or try to login with other browser."); - } - } -} - -function prevent_get_csrf () { - global $login_url; - if (file_exists('/usr/local/vesta/conf_web/dont_check_csrf')) return; - if ($_SERVER['REQUEST_METHOD'] == "GET") { - if (isset($_GET[$login_url])) return; - if ($_SERVER['REQUEST_URI']=="" || $_SERVER['REQUEST_URI']=="/" || $_SERVER['REQUEST_URI']=="/login/" || $_SERVER['REQUEST_URI']=="/list/user/" || $_SERVER['REQUEST_URI']=="/list/web/") return; - if ($_SERVER['DOCUMENT_URI']=="/reset/index.php") return; - } - if (isset($_SERVER['HTTP_HOST']) == false) return; - if (isset($_SERVER['SERVER_PORT']) == false) return; - if (isset($_SERVER['HTTP_REFERER']) == false) return; - $_SERVER['HTTP_HOST'] = strtolower($_SERVER['HTTP_HOST']); - if (substr($_SERVER['HTTP_REFERER'], 0, 8) != "file:///" && substr($_SERVER['HTTP_REFERER'], 0, 7) != "http://" && substr($_SERVER['HTTP_REFERER'], 0, 8) != "https://") return; - $host_arr = explode(":", $_SERVER['HTTP_HOST']); - $hostname = $host_arr[0]; - $port = $_SERVER['SERVER_PORT']; - $expected_http_referer = "https://".$hostname.":".$port; - $expected_http_referer_length = strlen($expected_http_referer); - if (substr($_SERVER['HTTP_REFERER'], 0, $expected_http_referer_length) != $expected_http_referer) { - die ("You clicked on someone's link from other site.
This is just a protection layer to prevent potentially dangerous clicks, so if it was your link (or you got the link from the trusted source) - then you can proceed safely to your hosting panel.

Technical details:
Your browser sent HTTP_REFERER with value: ".$_SERVER['HTTP_REFERER']."
myVesta expected HTTP_REFERER to begin with value: ".$expected_http_referer."
If you got this error during casual work in your hosting panel, probably some browser extension is blocking HTTP_REFERER... disable all browser extensions and try again (or try to login with other browser).
If you are system administrator of this server, you can disable CSRF check by doing (as root, in SSH): mkdir -p /usr/local/vesta/conf_web && touch /usr/local/vesta/conf_web/dont_check_csrf
(but we don't recommend it)
If you are not system administrator of this server and you can't access the hosting panel even you clicked \"proceed safely to your hosting panel\" and disabled all browser extensions or changed the browser, please copy-paste this message to the system administrator of this server.
Once again, before you disable CSRF check, try to click \"proceed safely to your hosting panel\", and if that does not help then try to disable all browser extensions or try to login with other browser."); - } -} - -// Preventing all CSRFs -if ($secure_gate_check == true) { - prevent_post_csrf(); - prevent_get_csrf(); -} diff --git a/web/js/app.js b/web/js/app.js index 978b7d09..58eb60a8 100644 --- a/web/js/app.js +++ b/web/js/app.js @@ -797,8 +797,6 @@ App.Ajax.request = function(method, data, callback, onError){ }*/ //App.Helpers.setAjaxBusy(method, data); data = data || {}; - var token = $('#token').attr('token'); - data.token = token; var prgs = $('.progress-container'); @@ -1072,42 +1070,3 @@ function elementHideShow(elementToHideOrShow){ el.style.display = el.style.display === 'none' ? 'block' : 'none'; } -(function($) { - $(document).ready(function() { - $('.get-ip-info-btn').click(function() { - var token = $('#token').attr('token'); - var index = $(this).attr('data-index'); - var btn_el = $('.get-ip-info-btn[data-index="' + index + '"]'); - var result_el = $('.get-ip-info-btn[data-index="' + index + '"] + .get-ip-info-result'); - var ip = btn_el.attr('data-ip'); - - var url_params = new URLSearchParams(window.location.search); - var clear_cache = url_params.get('clear_cache'); - - if (!$.trim(result_el.html())) { - result_el.html(''); - - $.ajax({ - method: "POST", - url: "/list/firewall/banlist/ip_info.php", - data: { ip: ip, clear_cache: clear_cache, token: token }, - cache: false, - error: function(jqXHR, textStatus, errorThrown) { - result_el.html('GENERAL ERROR
' + errorThrown); - }, - success: function(result_data) { - if (btn_el.find('i').hasClass('fa-times')) { - result_el.html(result_data); - } - } - }); - - btn_el.find('i').removeClass('fa-search').addClass('fa-times'); - } - else { - result_el.html(''); - btn_el.find('i').removeClass('fa-times').addClass('fa-search'); - } - }); - }); -})(jQuery); diff --git a/web/js/file_manager.js b/web/js/file_manager.js index bcbe319e..749a3a97 100644 --- a/web/js/file_manager.js +++ b/web/js/file_manager.js @@ -533,8 +533,7 @@ FM.downloadFileFromSubcontext = function(elm) { var src = $.parseJSON($(elm).find('.source').val()); var path = src.full_path; - var token = $('#token').attr('token'); - var win = window.open('/download/file/?token='+token+'&path=' + path, '_blank'); + var win = window.open('/download/file/?path=' + path, '_blank'); win.focus(); } @@ -553,21 +552,20 @@ FM.openFile = function(dir, box, elm) { }; App.Ajax.request('check_file_type', params, function(reply) { - var token = $('#token').attr('token'); if (reply.result) { if (FM.isFileEditable(src, reply.data)) { - var myWindow = window.open('/edit/file/?token='+token+'&path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); + var myWindow = window.open('/edit/file/?path=' + src.full_path, '_blank');//, src.full_path, "width=900, height=700"); } else { var path = src.full_path; - var win = window.open('/download/file/?token='+token+'&path=' + path, '_blank'); + var win = window.open('/download/file/?path=' + path, '_blank'); //win.focus(); } } else { // force download file var path = src.full_path; - var win = window.open('/download/file/?token='+token+'&path=' + path, '_blank'); + var win = window.open('/download/file/?path=' + path, '_blank'); //win.focus(); } }); @@ -1996,8 +1994,7 @@ FM.downloadFiles = function() { } var path = src.full_path; - var token = $('#token').attr('token'); - var win = window.open('/download/file/?token='+token+'&path=' + path, '_blank'); + var win = window.open('/download/file/?path=' + path, '_blank'); win.focus(); } diff --git a/web/js/fix.js b/web/js/fix.js deleted file mode 100644 index aaf0fa05..00000000 --- a/web/js/fix.js +++ /dev/null @@ -1,121 +0,0 @@ -function setCookie(cname, cvalue, exdays) { - var d = new Date(); - d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000)); - var expires = "expires="+d.toUTCString(); - document.cookie = cname + "=" + cvalue + ";" + expires + ";path=/"; -} - -function getCookie(cname) { - var name = cname + "="; - var ca = document.cookie.split(';'); - for(var i = 0; i < ca.length; i++) { - var c = ca[i]; - while (c.charAt(0) === ' ') { - c = c.substring(1); - } - if (c.indexOf(name) === 0) { - return c.substring(name.length, c.length); - } - } - return ""; -} - -function showIoLog(animate) { - //console.log('animate='+animate); - if (animate==0) { - $(".l-content .l-center").css("margin-right", 240); - $(".to-top").css("right", 285); - $(".to-shortcuts").css("right", 330); - $(".right_sidebar").css("right", 0); - //$(".io-log2").css("right", 0); - //$("#myvesta_float").css("margin-right", 280); - } else { - $(".l-content .l-center").animate({"margin-right": 240}); - $(".to-top").animate({"right": 285}); - $(".to-shortcuts").animate({"right": 330}); - $(".right_sidebar").animate({"right": 0}); - //$(".io-log2").animate({"right": 0}); - //$("#myvesta_float").animate({"margin-right": 280}); - } - - /* - $.ajax({url: "/list/log/", success: function(result){ - $( ".io-log div" ).remove(); - $($(result).find('.l-center.units')).insertAfter(".io-log h2"); - $( ".io-log div" ).removeClass(); - }}); - */ -} - -function hideIoLog(animate){ - //console.log('animate='+animate); - if (animate==0) { - $(".l-content .l-center").css("margin-right", 40); - $(".to-top").css("right", 85); - $(".to-shortcuts").css("right", 130); - $(".right_sidebar").css("right", -200); - //$("#myvesta_float").css("margin-right", 100); - } else { - $(".l-content .l-center").animate({"margin-right": 40}); - $(".to-top").animate({"right": 85}); - $(".to-shortcuts").animate({"right": 130}); - $(".right_sidebar").animate({"right": -200}); - //$("#myvesta_float").animate({"margin-right": 100}); - } -} - -function checkCookie() { - iolog = getCookie("iolog"); - //console.log('cookie: "'+iolog+'"'); - if (iolog === '1') { - return 1; - } - if (iolog === '0') { - return 0; - } - if (iolog == '') { - //console.log('cookie is empty'); - return ''; - } -} - -// function getRandomInt(max) { -// return Math.floor(Math.random() * max); -// } -// var randomnumber=getRandomInt(100000000); -var iohtml = '
\n' + - '
'; - -$(document).ready(function(){ - //var sys_height=$(".io-log").height(); - //$(".io-log2").css("top", sys_height+50); - /* - setTimeout(function() { - iolog = getCookie("iolog"); - if (iolog === '0') { - //setCookie("iolog", 0, 365); - hideIoLog(0); - return 0; - } - }, 1); - */ - - //if (GLOBAL.CURRENT_USER_FINAL == 'admin') $(".body-user .l-content > .l-center.units").first().prepend( iohtml ); - - $(".io-log").on("click", function() { - var showlog=checkCookie(); - //console.log('cookie = "'+iolog+'"'); - if (showlog===1 || showlog=='') { - //console.log('cookie is active or empty, calling hidelog()'); - setCookie("iolog", 0, 365); - hideIoLog(1); - } - if (showlog===0) { - //console.log('cookie is inactive, calling showlog()'); - setCookie("iolog", 1, 365); - showIoLog(1); - } - - }); -}); - diff --git a/web/js/init.js b/web/js/init.js index 06ecc750..3ac6175e 100644 --- a/web/js/init.js +++ b/web/js/init.js @@ -31,20 +31,16 @@ $(document).ready(function(){ }); - /* // CREATE BUTTON - if ($(".l-sort__create-btn").length>0) { - //$(".l-sort__create-btn").append("
"); - //$(".l-sort__create-btn").append("
"+$('.l-sort__create-btn').attr('title').replace(' ',' ')+"
"); - $('.l-sort__create-btn').hover(function(){ - $("#tooltip").css('background-color', '#1ca2cc'); - }, function() { - $("#tooltip").css('background-color', '#34b5dd'); - //$("#add-icon").remove(); - //$("#tooltip").remove(); - }); - } - */ + + $('.l-sort__create-btn').hover(function(){ + $(".l-sort__create-btn").append("
"); + $(".l-sort__create-btn").append("
"+$('.l-sort__create-btn').attr('title').replace(' ',' ')+"
"); + }, function(){ + $("#add-icon").remove(); + $("#tooltip").remove(); + }); + // SEARCH BOX @@ -132,7 +128,6 @@ $(document).ready(function(){ $('.l-unit .l-icon-star').click(function(){ var l_unit = $(this).parents('.l-unit'); - var token = $('#token').attr('token'); if(l_unit.hasClass('l-unit--starred')){ // removing star @@ -140,7 +135,7 @@ $(document).ready(function(){ $.ajax({ method: "POST", url: "/delete/favorite/index.php", - data: { v_section: l_unit.attr('v_section'), v_unit_id: l_unit.attr('v_unit_id'), token: token } + data: { v_section: l_unit.attr('v_section'), v_unit_id: l_unit.attr('v_unit_id') } }); l_unit.attr({'sort-star': 0}); @@ -150,7 +145,7 @@ $(document).ready(function(){ $.ajax({ method: "POST", url: "/add/favorite/index.php", - data: { v_unit_id: l_unit.attr('v_unit_id'), v_section: l_unit.attr('v_section'), token: token } + data: { v_unit_id: l_unit.attr('v_unit_id'), v_section: l_unit.attr('v_section') } }); l_unit.attr({'sort-star': 1}); diff --git a/web/js/pages/add_user.js b/web/js/pages/add_user.js index 597c869e..510ed167 100644 --- a/web/js/pages/add_user.js +++ b/web/js/pages/add_user.js @@ -7,7 +7,7 @@ $(function() { randomString = function() { var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz'; - var string_length = 16; + var string_length = 10; var randomstring = ''; for (var i = 0; i < string_length; i++) { var rnum = Math.floor(Math.random() * chars.length); diff --git a/web/js/pages/edit_user.js b/web/js/pages/edit_user.js index 381f4330..439aeab0 100644 --- a/web/js/pages/edit_user.js +++ b/web/js/pages/edit_user.js @@ -1,6 +1,6 @@ function randomString() { var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz'; - var string_length = 16; + var string_length = 10; var randomstring = ''; for (var i = 0; i < string_length; i++) { var rnum = Math.floor(Math.random() * chars.length); diff --git a/web/list/directory/index.php b/web/list/directory/index.php index 7a57566c..737e19db 100644 --- a/web/list/directory/index.php +++ b/web/list/directory/index.php @@ -15,7 +15,7 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { } if (empty($panel)) { - $command = VESTA_CMD."v-list-user ".escapeshellarg($user)." 'json'"; + $command = VESTA_CMD."v-list-user '".$user."' 'json'"; exec ($command, $output, $return_var); if ( $return_var > 0 ) { header("Location: /error/"); @@ -24,8 +24,8 @@ if (empty($panel)) { $panel = json_decode(implode('', $output), true); } -$path_a = !empty($_REQUEST['dir_a']) ? htmlentities($_REQUEST['dir_a']) : ''; -$path_b = !empty($_REQUEST['dir_b']) ? htmlentities($_REQUEST['dir_b']) : ''; +$path_a = !empty($_REQUEST['dir_a']) ? $_REQUEST['dir_a'] : ''; +$path_b = !empty($_REQUEST['dir_b']) ? $_REQUEST['dir_b'] : ''; $GLOBAL_JS = ''; $GLOBAL_JS .= ''; $GLOBAL_JS .= ''; diff --git a/web/list/dns/index.php b/web/list/dns/index.php index 53d5980c..df5b4a83 100644 --- a/web/list/dns/index.php +++ b/web/list/dns/index.php @@ -7,14 +7,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Data & Render page if (empty($_GET['domain'])){ - exec (VESTA_CMD."v-list-dns-domains ".escapeshellarg($user)." json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); render_page($user, $TAB, 'list_dns'); } else { - exec (VESTA_CMD."v-list-dns-records ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var); + exec (VESTA_CMD."v-list-dns-records '".$user."' '".escapeshellarg($_GET['domain'])."' 'json'", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); diff --git a/web/list/firewall/banlist/ip_info.php b/web/list/firewall/banlist/ip_info.php deleted file mode 100644 index e7888a75..00000000 --- a/web/list/firewall/banlist/ip_info.php +++ /dev/null @@ -1,164 +0,0 @@ - 'http://lists.blocklist.de/lists/all.txt', - 'BFB' => 'http://danger.rulez.sk/projects/bruteforceblocker/blist.php', - 'CIARMY' => 'http://www.ciarmy.com/list/ci-badguys.txt', - 'GREENSNOW' => 'https://blocklist.greensnow.co/greensnow.txt', - 'SPAMDROP' => 'https://www.spamhaus.org/drop/drop.txt', - 'SPAMEDROP' => 'https://www.spamhaus.org/drop/edrop.txt', - 'TOR' => 'https://check.torproject.org/cgi-bin/TorBulkExitList.py', - ]; - $today = date('Y-m-d'); - - foreach ($lists as $code => $url) { - $cache_tag = 'ip-blacklist-' . $code . '-cache'; - - // init cache - if (!isset($_SESSION[$cache_tag])) $_SESSION[$cache_tag] = ['updated' => '', 'items' => [], 'http_code' => '']; - - // invalidate cache if clear_cache parameter is 1 - if (!empty($_REQUEST['clear_cache']) && $_REQUEST['clear_cache'] == 1) $_SESSION[$cache_tag]['updated'] = '2000-01-01'; - - // if cache is not updated, fetch new data and save to cache - if (strtotime($today) > strtotime($_SESSION[$cache_tag]['updated'])) { - $new_cache_data = fetchURL($url, $url_result); - if ($url_result['http_code'] == '200') $new_cache_items = parseCacheEntries($new_cache_data); - $_SESSION[$cache_tag] = ['updated' => $today, 'items' => $new_cache_items, 'http_code' => $url_result['http_code']]; - } - - // check ip - $matched_ips = array_filter($_SESSION[$cache_tag]['items'], function ($item) use ($ip) { - if (str_contains($item, '/')) return cidrMatch($ip, $item); - if ($ip == $item) return true; - return false; - }); - - $check_results[$code]['found'] = count($matched_ips) > 0 ? true : false; - $check_results[$code]['updated'] = $_SESSION[$cache_tag]['updated']; - $check_results[$code]['http_code'] = $_SESSION[$cache_tag]['http_code']; - } - - return $check_results; -} - -// Check token -if ((!isset($_REQUEST['token'])) || ($_SESSION['token'] != $_REQUEST['token'])) { - die("Wrong token"); -} - -$ip = $_REQUEST['ip']; - -// Validate IP format -if (filter_var($ip, FILTER_VALIDATE_IP) === false) { - die('GENERAL ERROR
BAD_IP_FORMAT'); -} - -// Query host -$host = gethostbyaddr($ip); - -// Query blocklists -$result_blocklists = ''; -$ip_check = checkIP($ip); -if ($ip_check) { - foreach ($ip_check as $list_code => $list_results) { - $result_blocklists .= '
'; - $result_blocklists .= $list_results['found'] ? '' : ''; - $result_blocklists .= ' '.$list_code.' '; - $result_blocklists .= $list_results['http_code'] == '200' ? '' : ''; - $result_blocklists .= '
'; - } -} - -// Query location -$url = 'https://api.db-ip.com/v2/free/'.$ip; -$result = fetchURL($url); -$result_array = json_decode($result, true); -if (!is_array($result_array)) { - die('GENERAL ERROR
BAD_JSON'); -} -if (!empty($result_array['errorCode'])) { - die('GENERAL ERROR
'.$result_array['errorCode']); -} - -// Output -echo " -
-
".__('Host')."
-
".$host."
-
".__('Banlist')."
-
".$result_blocklists."
-
".__('Continent')."
-
".$result_array['continentName']." [".$result_array['continentCode']."]
-
".__('Country')."
-
".$result_array['countryName']." [".$result_array['countryCode']."]
-
".__('State / Province')."
-
".$result_array['stateProv']." [".$result_array['stateProvCode']."]
-
".__('City / Locality')."
-
".$result_array['city']."
-
-"; diff --git a/web/list/mail/index.php b/web/list/mail/index.php index e389b3b1..6b767768 100644 --- a/web/list/mail/index.php +++ b/web/list/mail/index.php @@ -7,14 +7,14 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); // Data & Render page if (empty($_GET['domain'])){ - exec (VESTA_CMD."v-list-mail-domains ".escapeshellarg($user)." json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-domains $user json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); render_page($user, $TAB, 'list_mail'); } else { - exec (VESTA_CMD."v-list-mail-accounts ".escapeshellarg($user)." ".escapeshellarg($_GET['domain'])." json", $output, $return_var); + exec (VESTA_CMD."v-list-mail-accounts '".$user."' '".escapeshellarg($_GET['domain'])."' json", $output, $return_var); $data = json_decode(implode('', $output), true); $data = array_reverse($data, true); unset($output); diff --git a/web/list/rrd/index.php b/web/list/rrd/index.php index 2c30b530..7a13b78b 100644 --- a/web/list/rrd/index.php +++ b/web/list/rrd/index.php @@ -11,10 +11,6 @@ if ($_SESSION['user'] != 'admin') { exit; } -if (!empty($_GET['period'])) { - if ($_GET['period']!="daily" && $_GET['period']!="weekly" && $_GET['period']!="monthly" && $_GET['period']!="yearly") unset($_GET['period']); -} - // Data exec (VESTA_CMD."v-list-sys-rrd json", $output, $return_var); $data = json_decode(implode('', $output), true); diff --git a/web/list/stats/index.php b/web/list/stats/index.php index 3c730632..c758705a 100644 --- a/web/list/stats/index.php +++ b/web/list/stats/index.php @@ -20,7 +20,7 @@ if ($user == 'admin') { unset($output); } - exec (VESTA_CMD."v-list-sys-users json", $output, $return_var); + exec (VESTA_CMD."v-list-sys-users 'json'", $output, $return_var); $users = json_decode(implode('', $output), true); unset($output); } else { diff --git a/web/list/user/index.php b/web/list/user/index.php index 4e5ac369..302e8c14 100644 --- a/web/list/user/index.php +++ b/web/list/user/index.php @@ -14,24 +14,6 @@ if ($user == 'admin') { $data = json_decode(implode('', $output), true); $data = array_reverse($data,true); -// Check and get changelog if needed -if ($user == 'admin') { - if (file_exists("/usr/local/vesta/data/upgrades/show_changelog")) { - $show_changelog_value=file_get_contents("/usr/local/vesta/data/upgrades/show_changelog"); - $show_changelog_value_int=intval($show_changelog_value); - if ($show_changelog_value_int==1) { - $changelog=''; - $changelog_arr=file("/usr/local/vesta/Changelog.md"); - for ($i=0; $i<100; $i++) { - if (trim($changelog_arr[$i])=="") break; - if ($i>1) $changelog.="\n"; - $changelog.=$changelog_arr[$i]; - } - file_put_contents("/usr/local/vesta/data/upgrades/show_changelog", "0"); - } - } -} - // Render page render_page($user, $TAB, 'list_user'); diff --git a/web/login/index.php b/web/login/index.php index 5de05451..4be64ecc 100644 --- a/web/login/index.php +++ b/web/login/index.php @@ -1,7 +1,5 @@ ".__('Login with root has been disabled').""; + // Send password via tmp file + $v_password = exec('mktemp -p /tmp'); + $fp = fopen($v_password, "w"); + fwrite($fp, $_POST['password']."\n"); + fclose($fp); + + // Check user & password + exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." ".escapeshellarg($_SERVER['REMOTE_ADDR']), $output, $return_var); + unset($output); + + // Remove tmp file + unlink($v_password); + + // Check API answer + if ( $return_var > 0 ) { + $ERROR = "".__('Invalid username or password').""; + } else { - // Get user's salt + + // Make root admin user + if ($_POST['user'] == 'root') $v_user = 'admin'; + + // Get user speciefic parameters + exec (VESTA_CMD . "v-list-user ".$v_user." json", $output, $return_var); + $data = json_decode(implode('', $output), true); + + // Define session user + $_SESSION['user'] = key($data); + $v_user = $_SESSION['user']; + + // Get user favorites + get_favourites(); + + // Define language $output = ''; - exec (VESTA_CMD."v-get-user-salt ".$v_user." ".$v_ip." json" , $output, $return_var); - $pam = json_decode(implode('', $output), true); - if ( $return_var > 0 ) { - $ERROR = "".__('Invalid username or password').""; + exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); + $languages = json_decode(implode('', $output), true); + if(in_array($data[$v_user]['LANGUAGE'], $languages)){ + $_SESSION['language'] = $data[$v_user]['LANGUAGE']; + } + else { + $_SESSION['language'] = 'en'; + } + + // Regenerate session id to prevent session fixation + session_regenerate_id(); + + // Redirect request to control panel interface + if (!empty($_SESSION['request_uri'])) { + header("Location: ".$_SESSION['request_uri']); + unset($_SESSION['request_uri']); + exit; } else { - $user = $_POST['user']; - $password = $_POST['password']; - $salt = $pam[$user]['SALT']; - $method = $pam[$user]['METHOD']; - - if ($method == 'md5' ) { - $hash = crypt($password, '$1$'.$salt.'$'); - } - if ($method == 'sha-512' ) { - $hash = crypt($password, '$6$rounds=5000$'.$salt.'$'); - $hash = str_replace('$rounds=5000','',$hash); - } - if ($method == 'des' ) { - $hash = crypt($password, $salt); - } - - // Send hash via tmp file - $v_hash = exec('mktemp -p /tmp'); - $fp = fopen($v_hash, "w"); - fwrite($fp, $hash."\n"); - fclose($fp); - - // Check user hash - exec(VESTA_CMD ."v-check-user-hash ".$v_user." ".$v_hash." ".$v_ip, $output, $return_var); - unset($output); - - // Remove tmp file - unlink($v_hash); - - // Check API answer - if ( $return_var > 0 ) { - $ERROR = "".__('Invalid username or password').""; - } else { - - // Make root admin user - // if ($_POST['user'] == 'root') $v_user = 'admin'; - - // Get user speciefic parameters - exec (VESTA_CMD . "v-list-user ".$v_user." json", $output, $return_var); - $data = json_decode(implode('', $output), true); - - // Define session user - $_SESSION['user'] = key($data); - $v_user = $_SESSION['user']; - - // Get user favorites - get_favourites(); - - // Define language - $output = ''; - exec (VESTA_CMD."v-list-sys-languages json", $output, $return_var); - $languages = json_decode(implode('', $output), true); - if (in_array($data[$v_user]['LANGUAGE'], $languages)){ - $_SESSION['language'] = $data[$v_user]['LANGUAGE']; - } else { - $_SESSION['language'] = 'en'; - } - - // Regenerate session id to prevent session fixation - session_regenerate_id(true); - - // Redirect request to control panel interface - if (!empty($_SESSION['request_uri'])) { - header("Location: ".$_SESSION['request_uri']); - unset($_SESSION['request_uri']); - exit; - } else { - header("Location: /list/user/"); - exit; - } - } + header("Location: /"); + exit; } } } else { @@ -160,8 +126,7 @@ if (empty($_SESSION['language'])) { } // Generate CSRF token -$token = bin2hex(file_get_contents('/dev/urandom', false, null, 0, 16)); -$_SESSION['token'] = $token; +$_SESSION['token'] = md5(uniqid(mt_rand(), true)); require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php'); require_once('../templates/header.html'); diff --git a/web/logout/index.php b/web/logout/index.php index 7f1d693c..51c89198 100644 --- a/web/logout/index.php +++ b/web/logout/index.php @@ -4,11 +4,10 @@ session_start(); if (!empty($_SESSION['look'])) { unset($_SESSION['look']); - header("Location: /"); } else { session_destroy(); - header("Location: /login/"); } +header("Location: /"); exit; ?> diff --git a/web/reset/index.php b/web/reset/index.php index 9a42b2cb..abde3c14 100644 --- a/web/reset/index.php +++ b/web/reset/index.php @@ -2,7 +2,6 @@ session_start(); define('NO_AUTH_REQUIRED',true); $TAB = 'RESET PASSWORD'; -$v_ip = $_SERVER['REMOTE_ADDR']; if (isset($_SESSION['user'])) { header("Location: /list/user"); @@ -12,72 +11,35 @@ if (isset($_SESSION['user'])) { include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); if ((!empty($_POST['user'])) && (empty($_POST['code']))) { - - // Check token - if ((!isset($_REQUEST['token'])) || ($_SESSION['token'] != $_REQUEST['token'])) { - die("Wrong token or missing token"); - } - $v_user = escapeshellarg($_POST['user']); $user = $_POST['user']; - $email = $_POST['email']; $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-list-user"; exec ($cmd." ".$v_user." json", $output, $return_var); if ( $return_var == 0 ) { $data = json_decode(implode('', $output), true); - unset($output); - exec("/usr/bin/sudo /usr/local/vesta/bin/v-get-user-value ".$v_user." RKEYEXP", $output, $return_var); - $rkeyexp = trim(implode('', $output)); - if (strlen($rkeyexp)>9) $rkeyexp=intval($rkeyexp); - unset($output); - if ($rkeyexp === null || $rkeyexp < time() - 900) { - if ($email == $data[$user]['CONTACT']) { - exec("/usr/bin/sudo /usr/local/vesta/bin/v-change-user-rkey ".$v_user, $output, $return_var); - unset($output); - $CMD="/usr/bin/sudo /usr/local/vesta/bin/v-get-user-value ".$v_user." RKEY"; - exec($CMD, $output, $return_var); - $rkey = trim(implode('', $output)); - //unset($output); - //echo $rkey; exit; - //echo $CMD."\n
"; - //var_dump($rkey); exit; - $fname = $data[$user]['FNAME']; - $lname = $data[$user]['LNAME']; - $contact = $data[$user]['CONTACT']; - $to = $data[$user]['CONTACT']; - $subject = __('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s")); - $hostname = exec('hostname'); - $from = __('MAIL_FROM',$hostname); - if (!empty($fname)) { - $mailtext = __('GREETINGS_GORDON_FREEMAN',$fname,$lname); - } else { - $mailtext = __('GREETINGS'); - } - $mailtext .= __('PASSWORD_RESET_REQUEST',$hostname.":".$_SERVER['SERVER_PORT'],$user,$rkey,$hostname.":".$_SERVER['SERVER_PORT'],$user,$rkey); - if (!empty($rkey)) { - send_email($to, $subject, $mailtext, $from); - header("Location: /reset/?action=code&user=".$_POST['user']); - } - } else { - $ERROR = "".__('User and email not matched').""; - exec("/usr/bin/sudo /usr/local/vesta/bin/v-log-failed-login " . $v_user . " " . $v_ip, $output, $return_var); - } + $rkey = $data[$user]['RKEY']; + $fname = $data[$user]['FNAME']; + $lname = $data[$user]['LNAME']; + $contact = $data[$user]['CONTACT']; + $to = $data[$user]['CONTACT']; + $subject = __('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s")); + $hostname = exec('hostname'); + $from = __('MAIL_FROM',$hostname); + if (!empty($fname)) { + $mailtext = __('GREETINGS_GORDON_FREEMAN',$fname,$lname); } else { - $ERROR = "".__('Please wait 15 minutes before sending a new request').""; + $mailtext = __('GREETINGS'); } - } else { - $ERROR = "".__('User and email not matched').""; + $mailtext .= __('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey); + if (!empty($rkey)) send_email($to, $subject, $mailtext, $from); + unset($output); } - unset($output); + + header("Location: /reset/?action=code&user=".$_POST['user']); + exit; } if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['password'])) ) { - - // Check token - if ((!isset($_REQUEST['token'])) || ($_SESSION['token'] != $_REQUEST['token'])) { - die("Wrong token or missing token"); - } - if ( $_POST['password'] == $_POST['password_confirm'] ) { $v_user = escapeshellarg($_POST['user']); $user = $_POST['user']; @@ -85,42 +47,26 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass exec ($cmd." ".$v_user." json", $output, $return_var); if ( $return_var == 0 ) { $data = json_decode(implode('', $output), true); - unset($output); $rkey = $data[$user]['RKEY']; - if (hash_equals($rkey, $_POST['code'])) { - unset($output); - exec("/usr/bin/sudo /usr/local/vesta/bin/v-get-user-value ".$v_user." RKEYEXP", $output, $return_var); - $rkeyexp = trim(implode('', $output)); - if (strlen($rkeyexp)>9) $rkeyexp=intval($rkeyexp); - unset($output); - if ($rkeyexp > time() - 900) { - $v_password = tempnam("/tmp","vst"); - $fp = fopen($v_password, "w"); - fwrite($fp, $_POST['password']."\n"); - fclose($fp); - $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-change-user-password"; - exec ($cmd." ".$v_user." ".$v_password, $output, $return_var); - unlink($v_password); - if ( $return_var > 0 ) { - sleep(5); - $ERROR = "".__('An internal error occurred').""; - } else { - $_SESSION['user'] = $_POST['user']; - header("Location: /"); - exit; - } + if ($rkey == $_POST['code']) { + $v_password = tempnam("/tmp","vst"); + $fp = fopen($v_password, "w"); + fwrite($fp, $_POST['password']."\n"); + fclose($fp); + $cmd="/usr/bin/sudo /usr/local/vesta/bin/v-change-user-password"; + exec ($cmd." ".$v_user." ".$v_password, $output, $return_var); + unlink($v_password); + if ( $return_var > 0 ) { + $ERROR = "".__('An internal error occurred').""; } else { - sleep(5); - $ERROR = "".__('Code has been expired').""; - exec("/usr/bin/sudo /usr/local/vesta/bin/v-log-failed-login " . $v_user . " " . $v_ip, $output, $return_var); + $_SESSION['user'] = $_POST['user']; + header("Location: /"); + exit; } } else { - sleep(5); $ERROR = "".__('Invalid username or code').""; - exec("/usr/bin/sudo /usr/local/vesta/bin/v-log-failed-login " . $v_user . " " . $v_ip, $output, $return_var); } } else { - sleep(5); $ERROR = "".__('Invalid username or code').""; } } else { diff --git a/web/reset/mail/index.php b/web/reset/mail/index.php index c0524ebb..9315d041 100644 --- a/web/reset/mail/index.php +++ b/web/reset/mail/index.php @@ -1,30 +1,10 @@ $arr_val) { - // search for NAT IPs and allow them - if ($ip==$arr_key || $ip==$arr_val['NAT']) { - $ok=1; - break; - } -} -if ($ip == $_SERVER['SERVER_ADDR']) $ok=1; -if ($ip == '127.0.0.1') $ok=1; -if ($ok==0) exit; -if (isset($_SERVER['HTTP_X_REAL_IP']) || isset($_SERVER['HTTP_X_FORWARDED_FOR'])) exit; - // // sourceforge.net/projects/postfixadmin/ // md5crypt @@ -127,15 +107,15 @@ if ((!empty($_POST['email'])) && (!empty($_POST['password'])) && (!empty($_POST[ $v_password = $_POST['password']; // Get domain owner - exec (VESTA_CMD."v-search-domain-owner ".$v_domain." mail", $output, $return_var); - if (($return_var == 0) && (!empty($output[0]))) { - $v_user = escapeshellarg($output[0]); + exec (VESTA_CMD."v-search-domain-owner ".$v_domain." 'mail'", $output, $return_var); + if ($return_var == 0) { + $v_user = $output[0]; } unset($output); // Get current md5 hash if (!empty($v_user)) { - exec (VESTA_CMD."v-get-mail-account-value ".$v_user." ".$v_domain." ".$v_account." md5", $output, $return_var); + exec (VESTA_CMD."v-get-mail-account-value '".$v_user."' ".$v_domain." ".$v_account." 'md5'", $output, $return_var); if ($return_var == 0) { $v_hash = $output[0]; } @@ -149,14 +129,14 @@ if ((!empty($_POST['email'])) && (!empty($_POST['password'])) && (!empty($_POST[ $n_hash = '{MD5}'.$n_hash; // Change password - if ( hash_equals($v_hash, $n_hash ) ) { + if ( $v_hash == $n_hash ) { $v_new_password = tempnam("/tmp","vst"); $fp = fopen($v_new_password, "w"); fwrite($fp, $_POST['new']."\n"); fclose($fp); - exec (VESTA_CMD."v-change-mail-account-password ".$v_user." ".$v_domain." ".$v_account." ".$v_new_password, $output, $return_var); + exec (VESTA_CMD."v-change-mail-account-password '".$v_user."' ".$v_domain." ".$v_account." ".$v_new_password, $output, $return_var); if ($return_var == 0) { - echo "==ok=="; + echo "ok"; exit; } } diff --git a/web/restart/service/index.php b/web/restart/service/index.php index eb07e856..5f42e5e5 100644 --- a/web/restart/service/index.php +++ b/web/restart/service/index.php @@ -5,12 +5,6 @@ ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -// Check token -if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { - header('location: /login/'); - exit(); -} - if ($_SESSION['user'] == 'admin') { if (!empty($_GET['srv'])) { if ($_GET['srv'] == 'iptables') { diff --git a/web/restart/system/index.php b/web/restart/system/index.php index 4e09745e..4facc5a5 100644 --- a/web/restart/system/index.php +++ b/web/restart/system/index.php @@ -5,12 +5,6 @@ ob_start(); session_start(); include($_SERVER['DOCUMENT_ROOT']."/inc/main.php"); -// Check token -if ((!isset($_GET['token'])) || ($_SESSION['token'] != $_GET['token'])) { - header('location: /login/'); - exit(); -} - if ($_SESSION['user'] == 'admin') { if (!empty($_GET['hostname'])) { exec (VESTA_CMD."v-restart-system yes", $output, $return_var); diff --git a/web/schedule/backup/index.php b/web/schedule/backup/index.php index be7e713c..67c7b44f 100644 --- a/web/schedule/backup/index.php +++ b/web/schedule/backup/index.php @@ -1,17 +1,10 @@ (".__('maximum characters length, including prefix', $_SESSION['MAX_DBUSER_LEN']).")"; + echo "    (".__('maximum characters length, including prefix', 16).")"; ?> @@ -148,8 +148,6 @@ - - diff --git a/web/templates/admin/add_dns_rec.html b/web/templates/admin/add_dns_rec.html index 33b4a9be..2c8bebd7 100644 --- a/web/templates/admin/add_dns_rec.html +++ b/web/templates/admin/add_dns_rec.html @@ -82,7 +82,6 @@ - diff --git a/web/templates/admin/add_mail_acc.html b/web/templates/admin/add_mail_acc.html index e8d09ea8..0f2ea2d0 100644 --- a/web/templates/admin/add_mail_acc.html +++ b/web/templates/admin/add_mail_acc.html @@ -97,7 +97,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -158,7 +158,7 @@ : -
example@
+
william.cage@
: diff --git a/web/templates/admin/add_web.html b/web/templates/admin/add_web.html index 77e72239..56f25edc 100644 --- a/web/templates/admin/add_web.html +++ b/web/templates/admin/add_web.html @@ -95,7 +95,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -129,7 +129,6 @@ - - - - @@ -181,7 +174,7 @@ @@ -191,7 +184,7 @@
- -
@@ -171,7 +164,7 @@
- +
- +
- +
diff --git a/web/templates/admin/edit_backup_exclusions.html b/web/templates/admin/edit_backup_exclusions.html index 2c337555..819c9244 100644 --- a/web/templates/admin/edit_backup_exclusions.html +++ b/web/templates/admin/edit_backup_exclusions.html @@ -50,7 +50,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -80,7 +80,7 @@ - + diff --git a/web/templates/admin/edit_mail_acc.html b/web/templates/admin/edit_mail_acc.html index e11216a2..c9b7ed85 100644 --- a/web/templates/admin/edit_mail_acc.html +++ b/web/templates/admin/edit_mail_acc.html @@ -86,7 +86,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -165,7 +165,7 @@ : -
example@
+
william.cage@
: diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html index 888b081f..4f142a6a 100644 --- a/web/templates/admin/edit_server.html +++ b/web/templates/admin/edit_server.html @@ -280,115 +280,13 @@

- - - - - - - - - - - - - - - - - -
- -
- -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
- : - - -
-
- - + + @@ -605,8 +503,7 @@ ">

- - +
@@ -616,10 +513,9 @@ - - + - - - - - - @@ -67,7 +67,7 @@ @@ -79,7 +79,7 @@ @@ -89,7 +89,7 @@ @@ -99,7 +99,7 @@ @@ -109,7 +109,7 @@ @@ -119,7 +119,7 @@ @@ -130,7 +130,7 @@ @@ -141,7 +141,7 @@ diff --git a/web/templates/admin/edit_server_httpd.html b/web/templates/admin/edit_server_httpd.html index 03fca7bb..c58ae89d 100644 --- a/web/templates/admin/edit_server_httpd.html +++ b/web/templates/admin/edit_server_httpd.html @@ -57,7 +57,7 @@ diff --git a/web/templates/admin/edit_server_mysql.html b/web/templates/admin/edit_server_mysql.html index 96d2523f..8c5325fd 100644 --- a/web/templates/admin/edit_server_mysql.html +++ b/web/templates/admin/edit_server_mysql.html @@ -127,7 +127,7 @@ diff --git a/web/templates/admin/edit_server_nginx.html b/web/templates/admin/edit_server_nginx.html index d85c75de..2267089a 100644 --- a/web/templates/admin/edit_server_nginx.html +++ b/web/templates/admin/edit_server_nginx.html @@ -184,7 +184,7 @@ diff --git a/web/templates/admin/edit_server_pgsql.html b/web/templates/admin/edit_server_pgsql.html index 0b7c65fc..6aca48d4 100644 --- a/web/templates/admin/edit_server_pgsql.html +++ b/web/templates/admin/edit_server_pgsql.html @@ -56,7 +56,7 @@ @@ -66,7 +66,7 @@ diff --git a/web/templates/admin/edit_web.html b/web/templates/admin/edit_web.html index b0d79d25..00600539 100644 --- a/web/templates/admin/edit_web.html +++ b/web/templates/admin/edit_web.html @@ -82,7 +82,7 @@ @@ -172,7 +172,7 @@
- - + +
@@ -641,17 +537,6 @@

- -
- "> -

-
@@ -695,54 +580,13 @@
- +
- - - - - - - @@ -760,7 +604,7 @@ @@ -771,16 +615,16 @@ : - + @@ -789,7 +633,7 @@ : @@ -797,7 +641,7 @@ : @@ -805,15 +649,16 @@ : + @@ -821,7 +666,7 @@ :
- -
- - - - - - - -
- -
- -

-
-
@@ -750,7 +594,7 @@
- +
- +
- +
: - +
- +
- +
- +
: - +
- +
@@ -942,7 +787,7 @@ 2Checkout.com Inc. (Ohio, USA) is a payment facilitator for goods and services provided by vestacp.com.'; diff --git a/web/templates/admin/edit_server_bind9.html b/web/templates/admin/edit_server_bind9.html index dae145fc..62d9051f 100644 --- a/web/templates/admin/edit_server_bind9.html +++ b/web/templates/admin/edit_server_bind9.html @@ -57,7 +57,7 @@
- +
- +
diff --git a/web/templates/admin/edit_server_dovecot.html b/web/templates/admin/edit_server_dovecot.html index 38ebea60..f5b4bd27 100644 --- a/web/templates/admin/edit_server_dovecot.html +++ b/web/templates/admin/edit_server_dovecot.html @@ -56,7 +56,7 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
diff --git a/web/templates/admin/edit_server_php.html b/web/templates/admin/edit_server_php.html index f2b144df..16693f81 100644 --- a/web/templates/admin/edit_server_php.html +++ b/web/templates/admin/edit_server_php.html @@ -150,7 +150,7 @@
- +
diff --git a/web/templates/admin/edit_server_service.html b/web/templates/admin/edit_server_service.html index ac92762d..49a81f55 100644 --- a/web/templates/admin/edit_server_service.html +++ b/web/templates/admin/edit_server_service.html @@ -56,7 +56,7 @@
- +
- +
- +
@@ -218,7 +218,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -238,7 +238,7 @@ - +
-
+
diff --git a/web/templates/admin/list_backup_detail.html b/web/templates/admin/list_backup_detail.html index a5063e1d..39790652 100644 --- a/web/templates/admin/list_backup_detail.html +++ b/web/templates/admin/list_backup_detail.html @@ -1,27 +1,31 @@ - -

- -
+
-
+
+ +
+ + + +
-
+
- +
@@ -34,10 +38,9 @@ input[type="checkbox"] { -
+
-
-
:
+
-
+
-
+
- +
@@ -99,11 +102,11 @@ input[type="checkbox"] { if (!empty($key)) { ?> -
+
-
+
- +
@@ -147,11 +150,11 @@ input[type="checkbox"] { if (!empty($key)) { ?> -
+
-
+
- +
@@ -194,11 +197,11 @@ input[type="checkbox"] { if (!empty($key)) { ?> -
+
-
+
- +
@@ -242,11 +245,11 @@ input[type="checkbox"] { if (!empty($key)) { ?> -
+
-
+
- +
@@ -290,11 +293,11 @@ input[type="checkbox"] { if (!empty($key)) { ?> -
+
-
+
- +
@@ -329,11 +332,11 @@ input[type="checkbox"] { -
+
-
+
- +
@@ -391,4 +394,3 @@ input[type="checkbox"] {
- diff --git a/web/templates/admin/list_backup_exclusions.html b/web/templates/admin/list_backup_exclusions.html index 2093278f..efaaa450 100644 --- a/web/templates/admin/list_backup_exclusions.html +++ b/web/templates/admin/list_backup_exclusions.html @@ -1,6 +1,6 @@
-
+
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html index e6bec6b6..4bea20c0 100644 --- a/web/templates/admin/list_cron.html +++ b/web/templates/admin/list_cron.html @@ -1,6 +1,6 @@
-
+
'; + echo ''; } if($pgsql){ - echo ''; + echo ''; } ?>
phpMyAdminphpMyAdminphpPgAdminphpPgAdmin
-
:
+
:
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html index 5bb2d868..72fe1454 100644 --- a/web/templates/admin/list_web.html +++ b/web/templates/admin/list_web.html @@ -1,6 +1,6 @@
-
+
diff --git a/web/templates/admin/panel.html b/web/templates/admin/panel.html index c181903b..57f377db 100644 --- a/web/templates/admin/panel.html +++ b/web/templates/admin/panel.html @@ -1,14 +1,14 @@ - + - +
- -
+ Vesta Control Panel +
@@ -53,7 +53,7 @@ diff --git a/web/templates/reset_1.html b/web/templates/reset_1.html index ad14d07d..b48f3706 100644 --- a/web/templates/reset_1.html +++ b/web/templates/reset_1.html @@ -4,15 +4,14 @@