diff --git a/CHANGELOG.md b/CHANGELOG.md index c303dc6..b28165d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -63,7 +63,7 @@ All notable changes to this project will be documented in this file. ## [1.8.1] - Service release - Fixed Debian 10 not working with IP addresses check -- Fixed Exim4 update config via patch was unreliable added few safety checks and add notice if failed. +- Fixed Exim update config via patch was unreliable added few safety checks and add notice if failed. - Fixed hestia-nginx not loading with custom port ## [1.8.0] - Feature / Major release @@ -630,8 +630,8 @@ A bug in v-update-sys-hestia caused auto update to be not working. Please run: ` ## [1.6.2] - Service release -- Fixed an issue with rate limits in Exim4 and make it more bullet proof (#2703) -- Fixed an issue with system-filter not properly loaded in Exim4 for Exim 4.94 and Ugrades from 1.5.x +- Fixed an issue with rate limits in Exim and make it more bullet proof (#2703) +- Fixed an issue with system-filter not properly loaded in Exim for Exim 4.94 and Ugrades from 1.5.x ## [1.6.1] - Service release @@ -1238,7 +1238,7 @@ After that run apt update && apt upgrade - Improve the calculated disk size of a new backup estimated by excluding the exclude folders, mail accounts and database in backups (#1616) @Myself5 - Improve v-update-firewall / v-stop-firewall to make it self healing (#1892) @myrevery - Update phpMyAdmin version to 1.5.1 (See ) -- Fixed a bug after rebuilding mail with Exim4 and suspended domains (#1886) +- Fixed a bug after rebuilding mail with Exim and suspended domains (#1886) - Fixed "Allowed IP addresses for API" field with strange behaviour #1866 - Fixed an issue where the "Saved confirmation" was not set due to a redirect #1879 - Increased minimal memory requirements for ClamD / ClamAV. #1840 diff --git a/bin/v-add-mail-account b/bin/v-add-mail-account index 2459678..285fe3a 100755 --- a/bin/v-add-mail-account +++ b/bin/v-add-mail-account @@ -122,7 +122,7 @@ if [ -n "$user_rate_limit" ]; then sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits else - system=$(cat /etc/exim4/limit.conf) + system=$(cat /etc/exim/limit.conf) sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits fi diff --git a/bin/v-add-mail-account-autoreply b/bin/v-add-mail-account-autoreply index d961603..fbc723a 100755 --- a/bin/v-add-mail-account-autoreply +++ b/bin/v-add-mail-account-autoreply @@ -28,11 +28,8 @@ source $HESTIA/func/domain.sh source_conf "$HESTIA/conf/hestia.conf" # Define mail user -if [ "$MAIL_SYSTEM" = 'exim4' ]; then - MAIL_USER=Debian-exim -else - MAIL_USER=exim -fi +MAIL_USER=exim + # Additional argument formatting format_domain diff --git a/bin/v-add-mail-account-fwd-only b/bin/v-add-mail-account-fwd-only index 2a88ed3..f40312b 100755 --- a/bin/v-add-mail-account-fwd-only +++ b/bin/v-add-mail-account-fwd-only @@ -27,11 +27,8 @@ source $HESTIA/func/domain.sh source_conf "$HESTIA/conf/hestia.conf" # Define mail user -if [ "$MAIL_SYSTEM" = 'exim4' ]; then - MAIL_USER=Debian-exim -else - MAIL_USER=exim -fi +MAIL_USER=exim + # Additional argument formatting format_domain diff --git a/bin/v-add-mail-domain b/bin/v-add-mail-domain index c8b1ca4..dc855cd 100755 --- a/bin/v-add-mail-domain +++ b/bin/v-add-mail-domain @@ -35,11 +35,7 @@ source $HESTIA/func/syshealth.sh source_conf "$HESTIA/conf/hestia.conf" # Define mail user -if [ "$MAIL_SYSTEM" = 'exim4' ]; then - MAIL_USER=Debian-exim -else - MAIL_USER=exim -fi +MAIL_USER=exim # Additional argument formatting format_domain diff --git a/bin/v-add-mail-domain-dkim b/bin/v-add-mail-domain-dkim index 870cb33..c6b0f8e 100755 --- a/bin/v-add-mail-domain-dkim +++ b/bin/v-add-mail-domain-dkim @@ -27,11 +27,8 @@ source $HESTIA/func/domain.sh source_conf "$HESTIA/conf/hestia.conf" # Define mail user -if [ "$MAIL_SYSTEM" = 'exim4' ]; then - MAIL_USER=Debian-exim -else - MAIL_USER=exim -fi +MAIL_USER=exim + # Additional argument formatting format_domain diff --git a/bin/v-add-mail-domain-smtp-relay b/bin/v-add-mail-domain-smtp-relay index 3745f92..d70f4da 100755 --- a/bin/v-add-mail-domain-smtp-relay +++ b/bin/v-add-mail-domain-smtp-relay @@ -48,7 +48,7 @@ check_hestia_demo_mode # Action # #----------------------------------------------------------# -cat > /etc/exim4/domains/${domain}/smtp_relay.conf << EOL +cat > /etc/exim/domains/${domain}/smtp_relay.conf << EOL host:$host port:$port user:$username diff --git a/bin/v-add-sys-smtp-relay b/bin/v-add-sys-smtp-relay index 5fbf94d..aede3a0 100755 --- a/bin/v-add-sys-smtp-relay +++ b/bin/v-add-sys-smtp-relay @@ -46,7 +46,7 @@ change_sys_value 'SMTP_RELAY_HOST' "$host" change_sys_value 'SMTP_RELAY_PORT' "$port" change_sys_value 'SMTP_RELAY_USER' "$username" -cat > /etc/exim4/smtp_relay.conf << EOL +cat > /etc/exim/smtp_relay.conf << EOL host:$host port:$port user:$username diff --git a/bin/v-change-domain-owner b/bin/v-change-domain-owner index 41f9bf4..1206d89 100755 --- a/bin/v-change-domain-owner +++ b/bin/v-change-domain-owner @@ -229,7 +229,7 @@ if [ -n "$mail_data" ]; then echo " ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf - # Add domain SSL configuration to exim4 + # Add domain SSL configuration to exim # Cleanup symlinks find /usr/local/hestia/ssl/mail -xtype l -delete diff --git a/bin/v-change-mail-account-rate-limit b/bin/v-change-mail-account-rate-limit index e95c90a..1b1f58c 100755 --- a/bin/v-change-mail-account-rate-limit +++ b/bin/v-change-mail-account-rate-limit @@ -66,7 +66,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits else - system=$(cat /etc/exim4/limit.conf) + system=$(cat /etc/exim/limit.conf) sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits fi diff --git a/bin/v-change-sys-service-config b/bin/v-change-sys-service-config index 0ede52f..83976c2 100755 --- a/bin/v-change-sys-service-config +++ b/bin/v-change-sys-service-config @@ -69,7 +69,7 @@ case $service in httpd) dst='/etc/httpd/conf/httpd.conf' ;; apache2) dst='/etc/apache2/apache2.conf' ;; exim) dst='/etc/exim/exim.conf' ;; - exim4) dst='/etc/exim4/exim4.conf.template' ;; + exim4) dst='/etc/exim/exim.conf.template' ;; vsftpd) dst=$(find /etc/vsftpd* -name 'vsftpd.conf') ;; proftpd) dst=$(find /etc/proftpd* -name 'proftpd.conf') ;; php) diff --git a/bin/v-delete-mail-domain-smtp-relay b/bin/v-delete-mail-domain-smtp-relay index 2af82aa..d418c40 100755 --- a/bin/v-delete-mail-domain-smtp-relay +++ b/bin/v-delete-mail-domain-smtp-relay @@ -37,7 +37,7 @@ is_object_unsuspended 'mail' 'DOMAIN' "$domain" # Action # #----------------------------------------------------------# -rm -f /etc/exim4/domains/${domain}/smtp_relay.conf +rm -f /etc/exim/domains/${domain}/smtp_relay.conf #----------------------------------------------------------# # Hestia # diff --git a/bin/v-delete-sys-smtp-relay b/bin/v-delete-sys-smtp-relay index f44edd7..af23f8b 100755 --- a/bin/v-delete-sys-smtp-relay +++ b/bin/v-delete-sys-smtp-relay @@ -34,7 +34,7 @@ change_sys_value "SMTP_RELAY_HOST" "" change_sys_value "SMTP_RELAY_PORT" "" change_sys_value "SMTP_RELAY_USER" "" -rm -f /etc/exim4/smtp_relay.conf +rm -f /etc/exim/smtp_relay.conf #----------------------------------------------------------# # Hestia # diff --git a/bin/v-list-sys-mail-status b/bin/v-list-sys-mail-status index c441850..1e50425 100755 --- a/bin/v-list-sys-mail-status +++ b/bin/v-list-sys-mail-status @@ -39,14 +39,10 @@ echo -en "\n---------------------------------------------" echo -en "---------------------------------------------\n\n" # Displaying exim stats -if [ -e "/var/log/exim4/mainlog" ]; then - eximstats /var/log/exim4/mainlog 2> /dev/null -else - eximstats /var/log/exim/main.log 2> /dev/null -fi +eximstats /var/log/exim/main.log 2> /dev/null if [ $? -ne 0 ]; then - echo "[Exim4] No valid log lines read" + echo "[Exim] No valid log lines read" exit 0 fi diff --git a/bin/v-rebuild-mail-domain b/bin/v-rebuild-mail-domain index b1a13db..37dcd38 100755 --- a/bin/v-rebuild-mail-domain +++ b/bin/v-rebuild-mail-domain @@ -32,11 +32,8 @@ source $HESTIA/func/syshealth.sh source_conf "$HESTIA/conf/hestia.conf" # Define mail user -if [ "$MAIL_SYSTEM" = 'exim4' ]; then - export MAIL_USER="Debian-exim" -else - export MAIL_USER="exim" -fi +export MAIL_USER="exim" + #----------------------------------------------------------# # Verifications # diff --git a/bin/v-rebuild-mail-domains b/bin/v-rebuild-mail-domains index 01f4026..5ada52a 100755 --- a/bin/v-rebuild-mail-domains +++ b/bin/v-rebuild-mail-domains @@ -30,11 +30,8 @@ source $HESTIA/func/syshealth.sh source_conf "$HESTIA/conf/hestia.conf" # Define mail user -if [ "$MAIL_SYSTEM" = 'exim4' ]; then - export MAIL_USER="Debian-exim" -else - export MAIL_USER="exim" -fi +export MAIL_USER="exim" + #----------------------------------------------------------# # Verifications # diff --git a/bin/v-restart-service b/bin/v-restart-service index d7ba717..97a3b5e 100755 --- a/bin/v-restart-service +++ b/bin/v-restart-service @@ -77,7 +77,7 @@ for service in $service_list; do elif [ -z "$restart" -o "$restart" = "no" ] && [ \ "$service" = "nginx" -o \ "$service" = "httpd" -o \ - "$service" = "exim4" -o \ + "$service" = "exim" -o \ "$service" = "dovecot" -o \ "$service" = "bind9" -o \ "$service" = "named" -o \ diff --git a/bin/v-restore-user b/bin/v-restore-user index 289a4ba..822e9b1 100755 --- a/bin/v-restore-user +++ b/bin/v-restore-user @@ -643,7 +643,7 @@ if [ "$mail" != 'no' ] && [ -n "$MAIL_SYSTEM" ]; then mkdir /usr/local/hestia/ssl/mail fi - # Add domain SSL configuration to exim4 + # Add domain SSL configuration to exim # Cleanup broken symlinks find /usr/local/hestia/ssl/mail -xtype l -delete diff --git a/docs/docs/server-administration/os-upgrades.md b/docs/docs/server-administration/os-upgrades.md index 46f5a3e..678ea98 100644 --- a/docs/docs/server-administration/os-upgrades.md +++ b/docs/docs/server-administration/os-upgrades.md @@ -24,13 +24,6 @@ yum update sed -i "s/obscure yescrypt/obscure sha512/g" /etc/pam.d/common-password ``` -### Конфигурация Exim4 - -```bash -rm -f /etc/exim4/exim4.conf.template -cp -f /usr/local/hestia/install/deb/exim/exim4.conf.4.94.template /etc/exim4/exim4.conf.template -``` - ### ProFTPD -Закомментируйте [строку 29](https://github.com/hestiacp/hestiacp/blob/1ff8a4e5207aae1e241954a83b7e8070bcdca788/install/deb/proftpd/proftpd.conf#L29) в `/etc/profpd/prodtpd.conf`. \ No newline at end of file +Закомментируйте [строку 29](https://github.com/hestiacp/hestiacp/blob/1ff8a4e5207aae1e241954a83b7e8070bcdca788/install/deb/proftpd/proftpd.conf#L29) в `/etc/profpd/prodtpd.conf`. diff --git a/func/domain.sh b/func/domain.sh index 6cb5c4d..daeea44 100644 --- a/func/domain.sh +++ b/func/domain.sh @@ -889,7 +889,7 @@ add_mail_ssl_config() { echo " ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf - # Add domain SSL configuration to exim4 + # Add domain SSL configuration to exim ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.pem $HESTIA/ssl/mail/$domain.crt ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key $HESTIA/ssl/mail/$domain.key fi @@ -901,7 +901,7 @@ add_mail_ssl_config() { echo " ssl_key = <$HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key" >> /etc/dovecot/conf.d/domains/$domain.conf echo "}" >> /etc/dovecot/conf.d/domains/$domain.conf - # Add domain SSL configuration to exim4 + # Add domain SSL configuration to exim ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.pem $HESTIA/ssl/mail/mail.$domain.crt ln -s $HOMEDIR/$user/conf/mail/$domain/ssl/$domain.key $HESTIA/ssl/mail/mail.$domain.key diff --git a/func/rebuild.sh b/func/rebuild.sh index 6455206..14d5d36 100644 --- a/func/rebuild.sh +++ b/func/rebuild.sh @@ -736,7 +736,7 @@ rebuild_mail_domain_conf() { echo "$account@$domain_idn:$user_rate_limit" >> $HOMEDIR/$user/conf/mail/$domain/limits else #revert to system value - system=$(cat /etc/exim4/limit.conf) + system=$(cat /etc/exim/limit.conf) sed -i "/^$account@$domain_idn:/ d" $HOMEDIR/$user/conf/mail/$domain/limits echo "$account@$domain_idn:$system" >> $HOMEDIR/$user/conf/mail/$domain/limits fi diff --git a/hestiacp/install/hst-install.sh b/hestiacp/install/hst-install.sh deleted file mode 100644 index e69de29..0000000 diff --git a/install/common/dovecot/conf.d/auth-passwdfile.conf.ext b/install/common/dovecot/conf.d/auth-passwdfile.conf.ext index 75e6e11..69ab3a5 100644 --- a/install/common/dovecot/conf.d/auth-passwdfile.conf.ext +++ b/install/common/dovecot/conf.d/auth-passwdfile.conf.ext @@ -1,9 +1,9 @@ passdb { driver = passwd-file - args = scheme=MD5-CRYPT username_format=%n /etc/exim4/domains/%d/passwd + args = scheme=MD5-CRYPT username_format=%n /etc/exim/domains/%d/passwd } userdb { driver = passwd-file - args = username_format=%n /etc/exim4/domains/%d/passwd + args = username_format=%n /etc/exim/domains/%d/passwd } diff --git a/install/deb/apache2/apache2.conf b/install/deb/apache2/apache2.conf deleted file mode 100644 index 7a0bfdc..0000000 --- a/install/deb/apache2/apache2.conf +++ /dev/null @@ -1,96 +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 - -IncludeOptional conf.d/*.conf -IncludeOptional conf.d/domains/webmail.*.conf -IncludeOptional conf.d/domains/*.conf - -# 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/deb/apache2/hestia-event.conf b/install/deb/apache2/hestia-event.conf deleted file mode 100644 index 51ada7c..0000000 --- a/install/deb/apache2/hestia-event.conf +++ /dev/null @@ -1,5 +0,0 @@ - - - SetHandler "proxy:fcgi://127.0.0.1:9000" - - \ No newline at end of file diff --git a/install/deb/apache2/status.conf b/install/deb/apache2/status.conf deleted file mode 100644 index f68f293..0000000 --- a/install/deb/apache2/status.conf +++ /dev/null @@ -1,7 +0,0 @@ -Listen 127.0.0.1:8081 - - SetHandler server-status - Order deny,allow - Deny from all - Allow from 127.0.0.1 - diff --git a/install/deb/apache2/unassigned.conf b/install/deb/apache2/unassigned.conf deleted file mode 100644 index d5ac412..0000000 --- a/install/deb/apache2/unassigned.conf +++ /dev/null @@ -1,18 +0,0 @@ - - ServerName directIP - DocumentRoot /var/www/html/ - Alias /error/ /var/www/document_errors/ - - - - - ServerName directIP - DocumentRoot /var/www/html/ - Alias /error/ /var/www/document_errors/ - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile /usr/local/hestia/ssl/certificate.crt - SSLCertificateKeyFile /usr/local/hestia/ssl/certificate.key - - diff --git a/install/deb/bind/named.conf b/install/deb/bind/named.conf deleted file mode 100644 index 2a888fa..0000000 --- a/install/deb/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/deb/bind/named.conf.options b/install/deb/bind/named.conf.options deleted file mode 100644 index 1fd6565..0000000 --- a/install/deb/bind/named.conf.options +++ /dev/null @@ -1,24 +0,0 @@ -options { - directory "/var/cache/bind"; - // If there is a firewall between you and nameservers you want - // to talk to, you may need to fix the firewall to allow multiple - // ports to talk. See http://www.kb.cert.org/vuls/id/800113 - // If your ISP provided one or more IP addresses for stable - // nameservers, you probably want to use them as forwarders. - // Uncomment the following block, and insert the addresses replacing - // the all-0's placeholder. - // forwarders { - // 0.0.0.0; - // }; - //======================================================================== - // If BIND logs error messages about the root key being expired, - // you will need to update your keys. See https://www.isc.org/bind-keys - //======================================================================== - dnssec-validation auto; - auth-nxdomain no; - allow-recursion { 127.0.0.1; ::1; }; - allow-transfer {"none";}; - hostname none; - server-id none; - version none; -}; \ No newline at end of file diff --git a/install/deb/clamav/clamd.conf b/install/deb/clamav/clamd.conf deleted file mode 100644 index a489072..0000000 --- a/install/deb/clamav/clamd.conf +++ /dev/null @@ -1,88 +0,0 @@ -#Automatically Generated by clamav-daemon postinst -#To reconfigure clamd run #dpkg-reconfigure clamav-daemon -#Please read /usr/share/doc/clamav-daemon/README.Debian.gz for details -LocalSocket /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 -ScanMail true -ScanArchive true -ArchiveBlockEncrypted false -MaxDirectoryRecursion 15 -FollowDirectorySymlinks false -FollowFileSymlinks false -ReadTimeout 180 -MaxThreads 12 -MaxConnectionQueueLength 15 -LogSyslog false -LogRotate true -LogFacility LOG_LOCAL6 -LogClean false -LogVerbose true -PreludeEnable no -PreludeAnalyzerName ClamAV -DatabaseDirectory /var/lib/clamav -OfficialDatabaseOnly false -SelfCheck 3600 -Foreground false -Debug false -ScanPE true -MaxEmbeddedPE 10M -ScanOLE2 true -ScanPDF true -ScanHTML true -MaxHTMLNormalize 10M -MaxHTMLNoTags 2M -MaxScriptNormalize 5M -MaxZipTypeRcg 1M -ScanSWF true -ExitOnOOM false -LeaveTemporaryFiles false -AlgorithmicDetection true -ScanELF true -IdleTimeout 30 -CrossFilesystems true -PhishingSignatures true -PhishingScanURLs true -PhishingAlwaysBlockSSLMismatch false -PhishingAlwaysBlockCloak false -PartitionIntersection false -DetectPUA false -ScanPartialMessages false -HeuristicScanPrecedence false -StructuredDataDetection false -CommandReadTimeout 5 -SendBufTimeout 200 -MaxQueue 100 -ExtendedDetectionInfo true -OLE2BlockMacros false -AllowAllMatchScan true -ForceToDisk false -DisableCertCheck false -DisableCache false -MaxScanTime 120000 -MaxScanSize 100M -MaxFileSize 25M -MaxRecursion 16 -MaxFiles 10000 -MaxPartitions 50 -MaxIconsPE 100 -PCREMatchLimit 10000 -PCRERecMatchLimit 5000 -PCREMaxFileSize 25M -ScanXMLDOCS true -ScanHWP3 true -MaxRecHWP3 16 -StreamMaxLength 25M -LogFile /var/log/clamav/clamav.log -LogTime true -LogFileUnlock false -LogFileMaxSize 0 -Bytecode true -BytecodeSecurity TrustSigned -BytecodeTimeout 60000 -PidFile /run/clamav/clamd.pid -OnAccessMaxFileSize 5M diff --git a/install/deb/deb_signing.key b/install/deb/deb_signing.key deleted file mode 100644 index 2ad2db8..0000000 --- a/install/deb/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/deb/exim/dnsbl.conf b/install/deb/exim/dnsbl.conf deleted file mode 100644 index 5166b25..0000000 --- a/install/deb/exim/dnsbl.conf +++ /dev/null @@ -1,2 +0,0 @@ -bl.spamcop.net -zen.spamhaus.org diff --git a/install/deb/exim/exim4.conf.4.94.template b/install/deb/exim/exim4.conf.4.94.template deleted file mode 100644 index 7a3b594..0000000 --- a/install/deb/exim/exim4.conf.4.94.template +++ /dev/null @@ -1,476 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Hestia Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#SPAM_REJECT_SCORE = 100 -#CLAMD = yes - -smtp_banner = $smtp_active_hostname -smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}} -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -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 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /run/clamav/clamd.ctl -.endif - -log_selector = +tls_sni - -tls_advertise_hosts = * - -# We test that $tls_in_sni is a valid domain, by an arbitrary email address foo@domain.tld . -# Then, we extract the domain with a function that would fail if the email address is invalid. -# If the certificate exists, we will use it, otherwise the default certificate in /etc/ssl will be used. -tls_certificate = \ - ${if and {\ - { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\ - { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.crt} }\ - }\ - {/usr/local/hestia/ssl/mail/$tls_in_sni.crt}\ - {/usr/local/hestia/ssl/certificate.crt}\ - } - -tls_privatekey = \ - ${if and {\ - { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\ - { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.key} }\ - }\ - {/usr/local/hestia/ssl/mail/$tls_in_sni.key}\ - {/usr/local/hestia/ssl/certificate.key}\ - } - -daemon_smtp_ports = 25 : 465 : 587 -tls_on_connect_ports = 465 -tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE -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}} - -OUTGOING_IP = /etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/ip - -SMTP_RELAY_FILE = ${if exists{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/smtp_relay.conf}} -SMTP_RELAY_HOST = ${lookup{host}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_PORT = ${lookup{port}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_USER = ${lookup{user}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_PASS = ${lookup{pass}lsearch{SMTP_RELAY_FILE}} - -# Custom Filter -system_filter = /etc/exim4/system.filter -system_filter_user = Debian-exim - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -# Limit per user for PHP scripts -acl_not_smtp: - deny message = Website of user $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period - ratelimit = 200 / 1h / $authenticated_id - - warn ratelimit = 100 / 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 an 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 = : - -# Limit per email account for SMTP auhenticated users - deny message = Email account $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period - set acl_c_msg_limit = ${if exists{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{${lookup {$authenticated_id} lsearch{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{$value}{${readfile{/etc/exim4/limit.conf}}}}}{${readfile{/etc/exim4/limit.conf}}} } - ratelimit = $acl_c_msg_limit / 1h / strict/ $authenticated_id - - warn ratelimit = ${eval:$acl_c_msg_limit / 2} / 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 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 - set acl_m3 = no - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes - warn condition = ${if exists {/etc/exim4/domains/$domain/reject_spam}{yes}{no}} - set acl_m3 = yes -.endif - - accept - - -acl_check_data: -.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}{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). - - # Deny spam at high score if spam score > SPAM_REJECT_SCORE and delete_spam is enabled - deny message = This message scored $spam_score spam points - spam = debian-spamd:true - condition = ${if eq{$acl_m3}{yes}{yes}{no}} - condition = ${if >{$spam_score_int}{SPAM_REJECT_SCORE}{1}{0}} -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ace|\.ade|\.adp|\.app|\.arj|\.asp|\.aspx|\.asx|\.bas|\.bat|\.cab|\.cer|\.chm|\.cmd|\.cnt|\.com|\.cpl|\.crt|\.csh|\.der|\.diagcab|\.dll|\.efi|\.exe|\.fla|\.fon|\.fxp|\.gadget|\.grp|\.hlp|\.hpj|\.hta|\.htc|\.img|\.inf|\.ins|\.iso|\.isp|\.its|\.jar|\.jnlp|\.js|\.jse|\.ksh|\.lib|\.lnk|\.mad|\.maf|\.mag|\.mam|\.maq|\.mar|\.mas|\.mat|\.mau|\.mav|\.maw|\.mcf|\.mda|\.mdb|\.mde|\.mdt|\.mdw|\.mdz|\.msc|\.msh|\.msh1|\.msh1xml|\.msh2|\.msh2xml|\.mshxml|\.msi|\.msp|\.mst|\.msu|\.ops|\.osd|\.pcd|\.pif|\.pl|\.plg|\.prf|\.prg|\.printerexport|\.ps1|\.ps1xml|\.ps2|\.ps2xml|\.psc1|\.psc2|\.psd1|\.psdm1|\.pst|\.py|\.pyc|\.pyo|\.pyw|\.pyz|\.pyzw|\.reg|\.scf|\.scr|\.sct|\.sfx|\.shb|\.shs|\.swf|\.sys|\.theme|\.tmp|\.ttf|\.url|\.vb|\.vba|\.vbe|\.vbp|\.vbs|\.vhd|\.vhdx|\.vsmacros|\.vsw|\.vxd|\.webpnp|\.website|\.wim|\.ws|\.wsc|\.wsf|\.wsh|\.xbap|\.xll|\.xnk)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -smtp_relay_login: - driver = plaintext - public_name = LOGIN - hide client_send = : SMTP_RELAY_USER : SMTP_RELAY_PASS - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -send_via_unauthenticated_smtp_relay: - driver = manualroute - address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT - domains = !+local_domains - require_files = SMTP_RELAY_FILE - condition = ${if eq{SMTP_RELAY_USER}{}} - transport = remote_smtp - route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}} - no_more - no_verify - -send_via_smtp_relay: - driver = manualroute - address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT - domains = !+local_domains - require_files = SMTP_RELAY_FILE - transport = smtp_relay_smtp - route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}} - no_more - no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -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_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}}}} - -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 - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}} - -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 - -smtp_relay_smtp: - driver = smtp - hosts_require_auth = $host_address - hosts_require_tls = $host_address - -remote_smtp: - driver = smtp - helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}} - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = !*.l.google.com - interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}} - -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/deb/exim/exim4.conf.4.95.template b/install/deb/exim/exim4.conf.4.95.template deleted file mode 100644 index 054cd02..0000000 --- a/install/deb/exim/exim4.conf.4.95.template +++ /dev/null @@ -1,512 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Hestia Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#SPAM_REJECT_SCORE = 100 -#CLAMD = yes - -smtp_banner = $smtp_active_hostname -smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}} -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -SRS_SECRET = ${readfile{/etc/exim4/srs.conf}} - -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 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /run/clamav/clamd.ctl -.endif - -log_selector = +tls_sni - -tls_advertise_hosts = * - -# We test that $tls_in_sni is a valid domain, by an arbitrary email address foo@domain.tld . -# Then, we extract the domain with a function that would fail if the email address is invalid. -# If the certificate exists, we will use it, otherwise the default certificate in /etc/ssl will be used. -tls_certificate = \ - ${if and {\ - { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\ - { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.crt} }\ - }\ - {/usr/local/hestia/ssl/mail/$tls_in_sni.crt}\ - {/usr/local/hestia/ssl/certificate.crt}\ - } - -tls_privatekey = \ - ${if and {\ - { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\ - { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.key} }\ - }\ - {/usr/local/hestia/ssl/mail/$tls_in_sni.key}\ - {/usr/local/hestia/ssl/certificate.key}\ - } - -daemon_smtp_ports = 25 : 465 : 587 -tls_on_connect_ports = 465 -tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE -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}} - -OUTGOING_IP = /etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/ip - -SMTP_RELAY_FILE = ${if exists{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/domains/${lookup{$sender_address_domain}dsearch{/etc/exim4/domains}}/smtp_relay.conf}{/etc/exim4/smtp_relay.conf}} -SMTP_RELAY_HOST = ${lookup{host}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_PORT = ${lookup{port}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_USER = ${lookup{user}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_PASS = ${lookup{pass}lsearch{SMTP_RELAY_FILE}} - -# Custom Filter -system_filter = /etc/exim4/system.filter -system_filter_user = Debian-exim - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -# Limit per user for PHP scripts -acl_not_smtp: - deny message = Website of user $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period - ratelimit = 200 / 1h / $authenticated_id - - warn ratelimit = 100 / 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 an 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 = : - -# Limit per email account for SMTP auhenticated users - deny message = Email account $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period - set acl_c_msg_limit = ${if exists{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{${lookup {$authenticated_id} lsearch{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{$value}{${readfile{/etc/exim4/limit.conf}}}}}{${readfile{/etc/exim4/limit.conf}}} } - ratelimit = $acl_c_msg_limit / 1h / strict/ $authenticated_id - - warn ratelimit = ${eval:$acl_c_msg_limit / 2} / 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 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 - set acl_m3 = no - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes - warn condition = ${if exists {/etc/exim4/domains/$domain/reject_spam}{yes}{no}} - set acl_m3 = yes -.endif - - accept - - -acl_check_data: -.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}{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). - - # Deny spam at high score if spam score > SPAM_REJECT_SCORE and delete_spam is enabled - deny message = This message scored $spam_score spam points - spam = debian-spamd:true - condition = ${if eq{$acl_m3}{yes}{yes}{no}} - condition = ${if >{$spam_score_int}{SPAM_REJECT_SCORE}{1}{0}} -.endif - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ace|\.ade|\.adp|\.app|\.arj|\.asp|\.aspx|\.asx|\.bas|\.bat|\.cab|\.cer|\.chm|\.cmd|\.cnt|\.com|\.cpl|\.crt|\.csh|\.der|\.diagcab|\.dll|\.efi|\.exe|\.fla|\.fon|\.fxp|\.gadget|\.grp|\.hlp|\.hpj|\.hta|\.htc|\.img|\.inf|\.ins|\.iso|\.isp|\.its|\.jar|\.jnlp|\.js|\.jse|\.ksh|\.lib|\.lnk|\.mad|\.maf|\.mag|\.mam|\.maq|\.mar|\.mas|\.mat|\.mau|\.mav|\.maw|\.mcf|\.mda|\.mdb|\.mde|\.mdt|\.mdw|\.mdz|\.msc|\.msh|\.msh1|\.msh1xml|\.msh2|\.msh2xml|\.mshxml|\.msi|\.msp|\.mst|\.msu|\.ops|\.osd|\.pcd|\.pif|\.pl|\.plg|\.prf|\.prg|\.printerexport|\.ps1|\.ps1xml|\.ps2|\.ps2xml|\.psc1|\.psc2|\.psd1|\.psdm1|\.pst|\.py|\.pyc|\.pyo|\.pyw|\.pyz|\.pyzw|\.reg|\.scf|\.scr|\.sct|\.sfx|\.shb|\.shs|\.swf|\.sys|\.theme|\.tmp|\.ttf|\.url|\.vb|\.vba|\.vbe|\.vbp|\.vbs|\.vhd|\.vhdx|\.vsmacros|\.vsw|\.vxd|\.webpnp|\.website|\.wim|\.ws|\.wsc|\.wsf|\.wsh|\.xbap|\.xll|\.xnk)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -smtp_relay_login: - driver = plaintext - public_name = LOGIN - hide client_send = : SMTP_RELAY_USER : SMTP_RELAY_PASS - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -send_via_unauthenticated_smtp_relay: - driver = manualroute - address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT - domains = !+local_domains - require_files = SMTP_RELAY_FILE - condition = ${if eq{SMTP_RELAY_USER}{}} - transport = remote_smtp - route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}} - no_more - no_verify - -send_via_smtp_relay: - driver = manualroute - address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT - domains = !+local_domains - require_files = SMTP_RELAY_FILE - transport = smtp_relay_smtp - route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}} - 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 - -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 SRS'd, 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 SRS'd 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_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}}}} - -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 - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}} - -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 - -smtp_relay_smtp: - driver = smtp - hosts_require_auth = $host_address - hosts_require_tls = $host_address - -remote_smtp: - driver = smtp - helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}} - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = !*.l.google.com - interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}} - -remote_forwarded_smtp: - driver = smtp - helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}} - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = !*.l.google.com - interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}} - # 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/deb/exim/exim4.conf.template b/install/deb/exim/exim4.conf.template deleted file mode 100644 index 91f0032..0000000 --- a/install/deb/exim/exim4.conf.template +++ /dev/null @@ -1,478 +0,0 @@ -###################################################################### -# # -# Exim configuration file for Hestia Control Panel # -# # -###################################################################### - -#SPAMASSASSIN = yes -#SPAM_SCORE = 50 -#SPAM_REJECT_SCORE = 100 -#CLAMD = yes - -smtp_banner = $smtp_active_hostname -smtp_active_hostname = ${lookup dnsdb{>: defer_never,ptr=$interface_address}{${listextract{1}{$value}}}{$primary_hostname}} -add_environment = <; PATH=/bin:/usr/bin -keep_environment = -disable_ipv6 = true - -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 - -.ifdef SPAMASSASSIN -spamd_address = 127.0.0.1 783 -.endif - -.ifdef CLAMD -av_scanner = clamd: /run/clamav/clamd.ctl -.endif - -log_selector = +tls_sni - -tls_advertise_hosts = * - -# We test that $tls_in_sni is a valid domain, by an arbitrary email address foo@domain.tld . -# Then, we extract the domain with a function that would fail if the email address is invalid. -# If the certificate exists, we will use it, otherwise the default certificate in /etc/ssl will be used. -tls_certificate = \ - ${if and {\ - { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\ - { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.crt} }\ - }\ - {/usr/local/hestia/ssl/mail/$tls_in_sni.crt}\ - {/usr/local/hestia/ssl/certificate.crt}\ - } - -tls_privatekey = \ - ${if and {\ - { eq {${domain:foo@$tls_in_sni}} {$tls_in_sni}}\ - { exists{/usr/local/hestia/ssl/mail/$tls_in_sni.key} }\ - }\ - {/usr/local/hestia/ssl/mail/$tls_in_sni.key}\ - {/usr/local/hestia/ssl/certificate.key}\ - } - -daemon_smtp_ports = 25 : 465 : 587 -tls_on_connect_ports = 465 -tls_require_ciphers = PERFORMANCE:-RSA:-VERS-ALL:+VERS-TLS1.2:+VERS-TLS1.3:%SERVER_PRECEDENCE -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}} - -OUTGOING_IP = /etc/exim4/domains/$sender_address_domain/ip - -SMTP_RELAY_FILE = ${if exists{/etc/exim4/domains/${sender_address_domain}/smtp_relay.conf}{/etc/exim4/domains/$sender_address_domain/smtp_relay.conf}{/etc/exim4/smtp_relay.conf}} -SMTP_RELAY_HOST = ${lookup{host}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_PORT = ${lookup{port}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_USER = ${lookup{user}lsearch{SMTP_RELAY_FILE}} -SMTP_RELAY_PASS = ${lookup{pass}lsearch{SMTP_RELAY_FILE}} - -# Custom Filter -system_filter = /etc/exim4/system.filter -system_filter_user = Debian-exim - -###################################################################### -# ACL CONFIGURATION # -# Specifies access control lists for incoming SMTP mail # -###################################################################### - -acl_not_smtp = acl_not_smtp - -begin acl - -# Limit per user for PHP scripts -acl_not_smtp: - deny message = Website of user $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period - ratelimit = 200 / 1h / $authenticated_id - - warn ratelimit = 100 / 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 an 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 = : - -# Limit per email account for SMTP auhenticated users - deny message = Email account $authenticated_id is sending too many emails - rate overlimit = $sender_rate / $sender_rate_period - set acl_c_msg_limit = ${if exists{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{${lookup {$authenticated_id} lsearch{/etc/exim4/domains/${lookup{${domain:$authenticated_id}}dsearch{/etc/exim4/domains/}}/limits}{$value}{${readfile{/etc/exim4/limit.conf}}}}}{${readfile{/etc/exim4/limit.conf}}} } - ratelimit = $acl_c_msg_limit / 1h / strict/ $authenticated_id - - warn ratelimit = ${eval:$acl_c_msg_limit / 2} / 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 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 - set acl_m3 = no - warn condition = ${if exists {/etc/exim4/domains/$domain/antispam}{yes}{no}} - set acl_m1 = yes - warn condition = ${if exists {/etc/exim4/domains/$domain/reject_spam}{yes}{no}} - set acl_m3 = yes -.endif - - - accept - - -acl_check_data: -.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}{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). - - # Deny spam at high score if spam score > SPAM_REJECT_SCORE and delete_spam is enabled - deny message = This message scored $spam_score spam points - spam = debian-spamd:true - condition = ${if eq{$acl_m3}{yes}{yes}{no}} - condition = ${if >{$spam_score_int}{SPAM_REJECT_SCORE}{1}{0}} -.endif - - - accept - - -acl_check_mime: - deny message = Blacklisted file extension detected - condition = ${if match {${lc:$mime_filename}}{\N(\.ace|\.ade|\.adp|\.app|\.arj|\.asp|\.aspx|\.asx|\.bas|\.bat|\.cab|\.cer|\.chm|\.cmd|\.cnt|\.com|\.cpl|\.crt|\.csh|\.der|\.diagcab|\.dll|\.efi|\.exe|\.fla|\.fon|\.fxp|\.gadget|\.grp|\.hlp|\.hpj|\.hta|\.htc|\.img|\.inf|\.ins|\.iso|\.isp|\.its|\.jar|\.jnlp|\.js|\.jse|\.ksh|\.lib|\.lnk|\.mad|\.maf|\.mag|\.mam|\.maq|\.mar|\.mas|\.mat|\.mau|\.mav|\.maw|\.mcf|\.mda|\.mdb|\.mde|\.mdt|\.mdw|\.mdz|\.msc|\.msh|\.msh1|\.msh1xml|\.msh2|\.msh2xml|\.mshxml|\.msi|\.msp|\.mst|\.msu|\.ops|\.osd|\.pcd|\.pif|\.pl|\.plg|\.prf|\.prg|\.printerexport|\.ps1|\.ps1xml|\.ps2|\.ps2xml|\.psc1|\.psc2|\.psd1|\.psdm1|\.pst|\.py|\.pyc|\.pyo|\.pyw|\.pyz|\.pyzw|\.reg|\.scf|\.scr|\.sct|\.sfx|\.shb|\.shs|\.swf|\.sys|\.theme|\.tmp|\.ttf|\.url|\.vb|\.vba|\.vbe|\.vbp|\.vbs|\.vhd|\.vhdx|\.vsmacros|\.vsw|\.vxd|\.webpnp|\.website|\.wim|\.ws|\.wsc|\.wsf|\.wsh|\.xbap|\.xll|\.xnk)$\N}{1}{0}} - - accept - - - -###################################################################### -# AUTHENTICATION CONFIGURATION # -###################################################################### -begin authenticators - -smtp_relay_login: - driver = plaintext - public_name = LOGIN - hide client_send = : SMTP_RELAY_USER : SMTP_RELAY_PASS - -dovecot_plain: - driver = dovecot - public_name = PLAIN - server_socket = /run/dovecot/auth-client - server_set_id = $auth1 - -dovecot_login: - driver = dovecot - public_name = LOGIN - server_socket = /run/dovecot/auth-client - server_set_id = $auth1 - - - -###################################################################### -# ROUTERS CONFIGURATION # -# Specifies how addresses are handled # -###################################################################### -begin routers - -send_via_unauthenticated_smtp_relay: - driver = manualroute - address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT - domains = !+local_domains - require_files = SMTP_RELAY_FILE - condition = ${if eq{SMTP_RELAY_USER}{}} - transport = remote_smtp - route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}} - no_more - no_verify - -send_via_smtp_relay: - driver = manualroute - address_data = SMTP_RELAY_HOST:SMTP_RELAY_PORT - domains = !+local_domains - require_files = SMTP_RELAY_FILE - transport = smtp_relay_smtp - route_list = * ${extract{1}{:}{$address_data}}::${extract{2}{:}{$address_data}} - no_more - no_verify - -dnslookup: - driver = dnslookup - domains = !+local_domains - transport = remote_smtp - no_more - -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_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 - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}} - -terminate_alias: - driver = accept - transport = devnull - condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/$domain/aliases}{true}{false}} - -###################################################################### -# TRANSPORTS CONFIGURATION # -###################################################################### -begin transports - -smtp_relay_smtp: - driver = smtp - hosts_require_auth = $host_address - hosts_require_tls = $host_address - -remote_smtp: - driver = smtp - helo_data = ${lookup dnsdb{>: defer_never,ptr=$sending_ip_address}{${listextract{1}{$value}}}{$primary_hostname}} - dkim_domain = DKIM_DOMAIN - dkim_selector = mail - dkim_private_key = DKIM_PRIVATE_KEY - dkim_canon = relaxed - dkim_strict = 0 - hosts_try_fastopen = !*.l.google.com - interface = ${if exists{OUTGOING_IP}{${readfile{OUTGOING_IP}}}} - -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/deb/exim/limit.conf b/install/deb/exim/limit.conf deleted file mode 100644 index ae4ee13..0000000 --- a/install/deb/exim/limit.conf +++ /dev/null @@ -1 +0,0 @@ -200 \ No newline at end of file diff --git a/install/deb/exim/spam-blocks.conf b/install/deb/exim/spam-blocks.conf deleted file mode 100644 index e69de29..0000000 diff --git a/install/deb/exim/srs.conf b/install/deb/exim/srs.conf deleted file mode 100644 index dc25d08..0000000 --- a/install/deb/exim/srs.conf +++ /dev/null @@ -1 +0,0 @@ -TOBEREPLACED diff --git a/install/deb/exim/system.filter b/install/deb/exim/system.filter deleted file mode 100644 index 738030e..0000000 --- a/install/deb/exim/system.filter +++ /dev/null @@ -1,16 +0,0 @@ -if $h_X-Spam-Status: contains "Yes" -then - headers add "Old-Subject: $h_subject" - headers remove "Subject" - headers add "Subject: *** SPAM *** $h_old-subject" - headers remove "Old-Subject" -endif - -# X-Anti-Virus: infected -if $h_X-Anti-Virus: contains "infected" -then - headers add "Old-Subject: $h_subject" - headers remove "Subject" - headers add "Subject: *** VIRUS *** $h_old-subject" - headers remove "Old-Subject" -endif \ No newline at end of file diff --git a/install/deb/fail2ban/action.d/hestia.conf b/install/deb/fail2ban/action.d/hestia.conf deleted file mode 100644 index e6baff5..0000000 --- a/install/deb/fail2ban/action.d/hestia.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Fail2Ban configuration file for hestia - -[Definition] - -actionstart = /usr/local/hestia/bin/v-add-firewall-chain -actionstop = /usr/local/hestia/bin/v-delete-firewall-chain -actioncheck = iptables -n -L INPUT | grep -q 'fail2ban-[ \t]' -actionban = /usr/local/hestia/bin/v-add-firewall-ban -actionunban = /usr/local/hestia/bin/v-delete-firewall-ban \ No newline at end of file diff --git a/install/deb/fail2ban/filter.d/hestia.conf b/install/deb/fail2ban/filter.d/hestia.conf deleted file mode 100644 index dc3e521..0000000 --- a/install/deb/fail2ban/filter.d/hestia.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Fail2Ban filter for unsuccessful hestia authentication attempts -# - -[INCLUDES] -before = common.conf - -[Definition] -failregex = .* failed to login -ignoreregex = - diff --git a/install/deb/fail2ban/jail.local b/install/deb/fail2ban/jail.local deleted file mode 100644 index 9106609..0000000 --- a/install/deb/fail2ban/jail.local +++ /dev/null @@ -1,66 +0,0 @@ -[ssh-iptables] -enabled = true -filter = sshd -action = hestia[name=SSH] -logpath = /var/log/auth.log -maxretry = 5 - -[vsftpd-iptables] -enabled = false -filter = vsftpd -action = hestia[name=FTP] -logpath = /var/log/vsftpd.log -maxretry = 5 - -[exim-iptables] -enabled = true -filter = exim -action = hestia[name=MAIL] -logpath = /var/log/exim4/mainlog - -[dovecot-iptables] -enabled = true -filter = dovecot -action = hestia[name=MAIL] -logpath = /var/log/dovecot.log - -[mysqld-iptables] -enabled = false -filter = mysqld-auth -action = hestia[name=DB] -logpath = /var/log/mysql/error.log -maxretry = 5 - -[hestia-iptables] -enabled = true -filter = hestia -action = hestia[name=HESTIA] -logpath = /var/log/hestia/auth.log -maxretry = 5 - -[roundcube-auth] -enabled = false -filter = roundcube-auth -action = hestia[name=WEB] -logpath = /var/log/roundcube/errors.log -maxretry = 5 - -[phpmyadmin-auth] -enabled = true -filter = phpmyadmin-syslog -action = hestia[name=WEB] -logpath = /var/log/auth.log -maxretry = 5 - -[recidive] -enabled = true -filter = recidive -action = hestia[name=RECIDIVE] -logpath = /var/log/fail2ban.log -maxretry = 5 -findtime = 86400 -bantime = 864000 - -#Uncomment and add your IPs and or domains to the Whitelist -#[DEFAULT] -#ignoreip = 111.111.111.111 222.222.222.222 subdomain.example.tld example.tld 333.333.333.333 diff --git a/install/deb/filemanager/filegator/backend/Services/Archiver/Adapters/HestiaZipArchiver.php b/install/deb/filemanager/filegator/backend/Services/Archiver/Adapters/HestiaZipArchiver.php deleted file mode 100644 index 49529aa..0000000 --- a/install/deb/filemanager/filegator/backend/Services/Archiver/Adapters/HestiaZipArchiver.php +++ /dev/null @@ -1,48 +0,0 @@ -tmpfs = $tmpfs; - $this->container = $container; - } - - public function uncompress(string $source, string $destination, Storage $storage) { - $auth = $this->container->get("Filegator\Services\Auth\AuthInterface"); - - $v_user = basename($auth->user()->getUsername()); - - if (!strlen($v_user)) { - return; - } - - if (strpos($source, "/home") === false) { - $source = "/home/$v_user/" . $source; - } - - if (strpos($destination, "/home") === false) { - $destination = "/home/$v_user/" . $destination; - } - - exec( - "sudo /usr/local/hestia/bin/v-extract-fs-archive " . - quoteshellarg($v_user) . - " " . - quoteshellarg($source) . - " " . - quoteshellarg($destination), - $output, - $return_var, - ); - } -} diff --git a/install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php b/install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php deleted file mode 100644 index 799387d..0000000 --- a/install/deb/filemanager/filegator/backend/Services/Auth/Adapters/HestiaAuth.php +++ /dev/null @@ -1,122 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE file - */ - -namespace Filegator\Services\Auth\Adapters; - -use Filegator\Services\Auth\AuthInterface; -use Filegator\Services\Auth\User; -use Filegator\Services\Auth\UsersCollection; -use Filegator\Services\Service; -use function Hestiacp\quoteshellarg\quoteshellarg; - -/** - * @codeCoverageIgnore - */ -class HestiaAuth implements Service, AuthInterface { - protected $permissions = []; - - protected $private_repos = false; - - protected $hestia_user = ""; - - public function init(array $config = []) { - if (isset($_SESSION["user"])) { - $v_user = $_SESSION["user"]; - } - if (!empty($_SESSION["look"])) { - if (isset($_SESSION["look"]) && $_SESSION["userContext"] === "admin") { - $v_user = $_SESSION["look"]; - } - if ( - $_SESSION["look"] == "admin" && - $_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] == "yes" - ) { - // Go away do not login - header("Location: /"); - exit(); - } - } - $this->hestia_user = $v_user; - $this->permissions = isset($config["permissions"]) ? (array) $config["permissions"] : []; - $this->private_repos = isset($config["private_repos"]) - ? (bool) $config["private_repos"] - : false; - } - - public function user(): ?User { - $cmd = "/usr/bin/sudo /usr/local/hestia/bin/v-list-user"; - exec($cmd . " " . quoteshellarg($this->hestia_user) . " json", $output, $return_var); - - if ($return_var == 0) { - $data = json_decode(implode("", $output), true); - $hestia_user_info = $data[$this->hestia_user]; - return $this->transformUser($hestia_user_info); - } - - return $this->getGuest(); - } - - public function transformUser($hstuser): User { - $user = new User(); - $user->setUsername($this->hestia_user); - $user->setName($this->hestia_user . " (" . $hstuser["NAME"] . ")"); - $user->setRole("user"); - $user->setPermissions($this->permissions); - $user->setHomedir("/"); - return $user; - } - - public function authenticate($username, $password): bool { - # Auth is handled by Hestia - return false; - } - - public function forget() { - // Logout return to Hestia - return $this->getGuest(); - } - - public function store(User $user) { - return null; // not used - } - - public function update($username, User $user, $password = ""): User { - // Password change is handled by Hestia - return $this->user(); - } - - public function add(User $user, $password): User { - return new User(); // not used - } - - public function delete(User $user) { - return true; // not used - } - - public function find($username): ?User { - return null; // not used - } - - public function allUsers(): UsersCollection { - return new UsersCollection(); // not used - } - - public function getGuest(): User { - $guest = new User(); - - $guest->setUsername("guest"); - $guest->setName("Guest"); - $guest->setRole("guest"); - $guest->setHomedir("/"); - $guest->setPermissions([]); - - return $guest; - } -} diff --git a/install/deb/filemanager/filegator/backend/Services/Session/Adapters/SessionStorage.php b/install/deb/filemanager/filegator/backend/Services/Session/Adapters/SessionStorage.php deleted file mode 100644 index 320b7bc..0000000 --- a/install/deb/filemanager/filegator/backend/Services/Session/Adapters/SessionStorage.php +++ /dev/null @@ -1,64 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE file - */ - -namespace Filegator\Services\Session\Adapters; - -use Filegator\Kernel\Request; -use Filegator\Services\Service; -use Filegator\Services\Session\Session; -use Filegator\Services\Session\SessionStorageInterface; - -class SessionStorage implements Service, SessionStorageInterface { - protected $request; - - protected $config; - - public function __construct(Request $request) { - $this->request = $request; - } - - public function init(array $config = []) { - // we don't have a previous session attached - if (!$this->getSession()) { - $handler = $config["handler"]; - $session = new Session($handler()); - //$session->setName('filegator'); - $this->setSession($session); - } - } - - public function save() { - $this->getSession()->save(); - } - - public function set(string $key, $data) { - return $this->getSession()->set($key, $data); - } - - public function get(string $key, $default = null) { - return $this->getSession() ? $this->getSession()->get($key, $default) : $default; - } - - public function invalidate() { - if (!$this->getSession()->isStarted()) { - $this->getSession()->start(); - } - - $this->getSession()->invalidate(); - } - - private function setSession(Session $session) { - return $this->request->setSession($session); - } - - private function getSession(): ?Session { - return $this->request->getSession(); - } -} diff --git a/install/deb/filemanager/filegator/composer.json b/install/deb/filemanager/filegator/composer.json deleted file mode 100644 index f95bb82..0000000 --- a/install/deb/filemanager/filegator/composer.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "filegator/filegator", - "description": "Filegator", - "license": "MIT", - "type": "project", - "config": { - "platform": { - "php": "7.2.5" - } - }, - "require": { - "php": "^7.2", - "monolog/monolog": "^1.24", - "nikic/fast-route": "^1.3", - "symfony/security-csrf": "^4.4", - "symfony/http-foundation": "^4.4", - "dibi/dibi": "^4.1", - "php-di/php-di": "^6.0", - "rakit/validation": "^1.1", - "league/flysystem": "^1.1", - "league/flysystem-ziparchive": "^1.0", - "league/flysystem-sftp": "^1.0", - "hestiacp/phpquoteshellarg": "^1.0" - }, - "authors": [ - { - "name": "Milos Stojanovic", - "email": "alcalbg@gmail.com" - } - ], - "autoload": { - "psr-4": { - "Filegator\\": "backend" - } - }, - "autoload-dev": { - "psr-4": { - "Tests\\": "tests/backend/" - } - }, - "require-dev": { - "phpunit/phpunit": "^8.0", - "symfony/var-dumper": "^4.4", - "league/flysystem-memory": "^1.0", - "phpstan/phpstan": "^0.11.8" - } -} diff --git a/install/deb/filemanager/filegator/composer.lock b/install/deb/filemanager/filegator/composer.lock deleted file mode 100644 index 94e36a4..0000000 --- a/install/deb/filemanager/filegator/composer.lock +++ /dev/null @@ -1,4771 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "2804e81bca9a58669546bcb9ce9ff709", - "packages": [ - { - "name": "dibi/dibi", - "version": "v4.2.7", - "source": { - "type": "git", - "url": "https://github.com/dg/dibi.git", - "reference": "7fa05f381b23fdc59af98caeb03b1ae8ed1e03ed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dg/dibi/zipball/7fa05f381b23fdc59af98caeb03b1ae8ed1e03ed", - "reference": "7fa05f381b23fdc59af98caeb03b1ae8ed1e03ed", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "replace": { - "dg/dibi": "*" - }, - "require-dev": { - "nette/di": "^3.0", - "nette/tester": "~2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "~2.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - } - ], - "description": "Dibi is Database Abstraction Library for PHP", - "homepage": "https://dibiphp.com", - "keywords": [ - "access", - "database", - "dbal", - "mssql", - "mysql", - "odbc", - "oracle", - "pdo", - "postgresql", - "sqlite", - "sqlsrv" - ], - "support": { - "issues": "https://github.com/dg/dibi/issues", - "source": "https://github.com/dg/dibi/tree/v4.2.7" - }, - "time": "2022-11-18T03:40:51+00:00" - }, - { - "name": "hestiacp/phpquoteshellarg", - "version": "v1.0.1-p3", - "source": { - "type": "git", - "url": "https://github.com/hestiacp/phpquoteshellarg.git", - "reference": "89cbab9b81b4482127a7bd521ccb6394dd8cda37" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/hestiacp/phpquoteshellarg/zipball/89cbab9b81b4482127a7bd521ccb6394dd8cda37", - "reference": "89cbab9b81b4482127a7bd521ccb6394dd8cda37", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "autoload": { - "files": [ - "src/Hestiacp/quoteshellarg/quoteshellarg.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Unlicense" - ], - "description": "Improved escape shell arguments for support of special charactars", - "homepage": "https://github.com/hestiacp", - "keywords": [ - "escapeshellarg", - "quoteshellarg" - ], - "support": { - "source": "https://github.com/hestiacp/phpquoteshellarg/tree/v1.0.1-p3" - }, - "time": "2022-07-17T14:48:05+00:00" - }, - { - "name": "league/flysystem", - "version": "1.1.10", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem.git", - "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3239285c825c152bcc315fe0e87d6b55f5972ed1", - "reference": "3239285c825c152bcc315fe0e87d6b55f5972ed1", - "shasum": "" - }, - "require": { - "ext-fileinfo": "*", - "league/mime-type-detection": "^1.3", - "php": "^7.2.5 || ^8.0" - }, - "conflict": { - "league/flysystem-sftp": "<1.0.6" - }, - "require-dev": { - "phpspec/prophecy": "^1.11.1", - "phpunit/phpunit": "^8.5.8" - }, - "suggest": { - "ext-ftp": "Allows you to use FTP server storage", - "ext-openssl": "Allows you to use FTPS server storage", - "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", - "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", - "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", - "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", - "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", - "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", - "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", - "league/flysystem-webdav": "Allows you to use WebDAV storage", - "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", - "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", - "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Flysystem\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Filesystem abstraction: Many filesystems, one API.", - "keywords": [ - "Cloud Files", - "WebDAV", - "abstraction", - "aws", - "cloud", - "copy.com", - "dropbox", - "file systems", - "files", - "filesystem", - "filesystems", - "ftp", - "rackspace", - "remote", - "s3", - "sftp", - "storage" - ], - "support": { - "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.1.10" - }, - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], - "time": "2022-10-04T09:16:37+00:00" - }, - { - "name": "league/flysystem-sftp", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem-sftp.git", - "reference": "36fb893d10bb799fa6aa7199e37e84314c9fd97d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-sftp/zipball/36fb893d10bb799fa6aa7199e37e84314c9fd97d", - "reference": "36fb893d10bb799fa6aa7199e37e84314c9fd97d", - "shasum": "" - }, - "require": { - "league/flysystem": "~1.0", - "php": ">=5.6.0", - "phpseclib/phpseclib": "~2.0" - }, - "require-dev": { - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "^5.7.25" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Flysystem\\Sftp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Flysystem adapter for SFTP", - "support": { - "issues": "https://github.com/thephpleague/flysystem-sftp/issues", - "source": "https://github.com/thephpleague/flysystem-sftp/tree/1.1.0" - }, - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "custom" - }, - { - "url": "https://github.com/frankdejonge", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", - "type": "tidelift" - } - ], - "abandoned": "league/flysystem-sftp-v3", - "time": "2022-01-04T22:02:01+00:00" - }, - { - "name": "league/flysystem-ziparchive", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem-ziparchive.git", - "reference": "c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-ziparchive/zipball/c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45", - "reference": "c6d7c7ea23a57ee802d533ab9eb9f19dd5c5fc45", - "shasum": "" - }, - "require": { - "ext-zip": "*", - "league/flysystem": "~1.0", - "php": ">=5.4.0" - }, - "require-dev": { - "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Flysystem\\ZipArchive\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Flysystem adapter for ZipArchive's", - "support": { - "issues": "https://github.com/thephpleague/flysystem-ziparchive/issues", - "source": "https://github.com/thephpleague/flysystem-ziparchive/tree/master" - }, - "time": "2016-12-20T08:36:16+00:00" - }, - { - "name": "league/mime-type-detection", - "version": "1.11.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "shasum": "" - }, - "require": { - "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^3.2", - "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\MimeTypeDetection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frankdejonge.nl" - } - ], - "description": "Mime-type detection for Flysystem", - "support": { - "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" - }, - "funding": [ - { - "url": "https://github.com/frankdejonge", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", - "type": "tidelift" - } - ], - "time": "2022-04-17T13:12:02+00:00" - }, - { - "name": "monolog/monolog", - "version": "1.27.1", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "904713c5929655dc9b97288b69cfeedad610c9a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1", - "reference": "904713c5929655dc9b97288b69cfeedad610c9a1", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" - }, - "provide": { - "psr/log-implementation": "1.0.0" - }, - "require-dev": { - "aws/aws-sdk-php": "^2.4.9 || ^3.0", - "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "php-amqplib/php-amqplib": "~2.4", - "php-console/php-console": "^3.1.3", - "phpstan/phpstan": "^0.12.59", - "phpunit/phpunit": "~4.5", - "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "^5.3|^6.0" - }, - "suggest": { - "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", - "doctrine/couchdb": "Allow sending log messages to a CouchDB server", - "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", - "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", - "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", - "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" - }, - "type": "library", - "autoload": { - "psr-4": { - "Monolog\\": "src/Monolog" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", - "keywords": [ - "log", - "logging", - "psr-3" - ], - "support": { - "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/1.27.1" - }, - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], - "time": "2022-06-09T08:53:42+00:00" - }, - { - "name": "nikic/fast-route", - "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/FastRoute.git", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35|~5.7" - }, - "type": "library", - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "FastRoute\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov", - "email": "nikic@php.net" - } - ], - "description": "Fast request router for PHP", - "keywords": [ - "router", - "routing" - ], - "support": { - "issues": "https://github.com/nikic/FastRoute/issues", - "source": "https://github.com/nikic/FastRoute/tree/master" - }, - "time": "2018-02-13T20:26:39+00:00" - }, - { - "name": "opis/closure", - "version": "3.6.3", - "source": { - "type": "git", - "url": "https://github.com/opis/closure.git", - "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad", - "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad", - "shasum": "" - }, - "require": { - "php": "^5.4 || ^7.0 || ^8.0" - }, - "require-dev": { - "jeremeamia/superclosure": "^2.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.6.x-dev" - } - }, - "autoload": { - "files": [ - "functions.php" - ], - "psr-4": { - "Opis\\Closure\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marius Sarca", - "email": "marius.sarca@gmail.com" - }, - { - "name": "Sorin Sarca", - "email": "sarca_sorin@hotmail.com" - } - ], - "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", - "homepage": "https://opis.io/closure", - "keywords": [ - "anonymous functions", - "closure", - "function", - "serializable", - "serialization", - "serialize" - ], - "support": { - "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.3" - }, - "time": "2022-01-27T09:35:39+00:00" - }, - { - "name": "php-di/invoker", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/PHP-DI/Invoker.git", - "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/540c27c86f663e20fe39a24cd72fa76cdb21d41a", - "reference": "540c27c86f663e20fe39a24cd72fa76cdb21d41a", - "shasum": "" - }, - "require": { - "psr/container": "~1.0" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "phpunit/phpunit": "~4.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Invoker\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Generic and extensible callable invoker", - "homepage": "https://github.com/PHP-DI/Invoker", - "keywords": [ - "callable", - "dependency", - "dependency-injection", - "injection", - "invoke", - "invoker" - ], - "support": { - "issues": "https://github.com/PHP-DI/Invoker/issues", - "source": "https://github.com/PHP-DI/Invoker/tree/master" - }, - "time": "2017-03-20T19:28:22+00:00" - }, - { - "name": "php-di/php-di", - "version": "6.3.5", - "source": { - "type": "git", - "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "b8126d066ce144765300ee0ab040c1ed6c9ef588" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/b8126d066ce144765300ee0ab040c1ed6c9ef588", - "reference": "b8126d066ce144765300ee0ab040c1ed6c9ef588", - "shasum": "" - }, - "require": { - "opis/closure": "^3.5.5", - "php": ">=7.2.0", - "php-di/invoker": "^2.0", - "php-di/phpdoc-reader": "^2.0.1", - "psr/container": "^1.0" - }, - "provide": { - "psr/container-implementation": "^1.0" - }, - "require-dev": { - "doctrine/annotations": "~1.2", - "friendsofphp/php-cs-fixer": "^2.4", - "mnapoli/phpunit-easymock": "^1.2", - "ocramius/proxy-manager": "^2.0.2", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8.5|^9.0" - }, - "suggest": { - "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", - "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" - }, - "type": "library", - "autoload": { - "files": [ - "src/functions.php" - ], - "psr-4": { - "DI\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "The dependency injection container for humans", - "homepage": "https://php-di.org/", - "keywords": [ - "PSR-11", - "container", - "container-interop", - "dependency injection", - "di", - "ioc", - "psr11" - ], - "support": { - "issues": "https://github.com/PHP-DI/PHP-DI/issues", - "source": "https://github.com/PHP-DI/PHP-DI/tree/6.3.5" - }, - "funding": [ - { - "url": "https://github.com/mnapoli", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/php-di/php-di", - "type": "tidelift" - } - ], - "time": "2021-09-02T09:49:58+00:00" - }, - { - "name": "php-di/phpdoc-reader", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/PHP-DI/PhpDocReader.git", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "require-dev": { - "mnapoli/hard-mode": "~0.3.0", - "phpunit/phpunit": "^8.5|^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpDocReader\\": "src/PhpDocReader" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", - "keywords": [ - "phpdoc", - "reflection" - ], - "support": { - "issues": "https://github.com/PHP-DI/PhpDocReader/issues", - "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1" - }, - "time": "2020-10-12T12:39:22+00:00" - }, - { - "name": "phpseclib/phpseclib", - "version": "2.0.41", - "source": { - "type": "git", - "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "7e763c6f97ec1fcb37c46aa8ecfc20a2c71d9c1b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7e763c6f97ec1fcb37c46aa8ecfc20a2c71d9c1b", - "reference": "7e763c6f97ec1fcb37c46aa8ecfc20a2c71d9c1b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4", - "squizlabs/php_codesniffer": "~2.0" - }, - "suggest": { - "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", - "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.", - "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.", - "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.", - "ext-xml": "Install the XML extension to load XML formatted public keys." - }, - "type": "library", - "autoload": { - "files": [ - "phpseclib/bootstrap.php" - ], - "psr-4": { - "phpseclib\\": "phpseclib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jim Wigginton", - "email": "terrafrost@php.net", - "role": "Lead Developer" - }, - { - "name": "Patrick Monnerat", - "email": "pm@datasphere.ch", - "role": "Developer" - }, - { - "name": "Andreas Fischer", - "email": "bantu@phpbb.com", - "role": "Developer" - }, - { - "name": "Hans-Jürgen Petrich", - "email": "petrich@tronic-media.com", - "role": "Developer" - }, - { - "name": "Graham Campbell", - "email": "graham@alt-three.com", - "role": "Developer" - } - ], - "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", - "homepage": "http://phpseclib.sourceforge.net", - "keywords": [ - "BigInteger", - "aes", - "asn.1", - "asn1", - "blowfish", - "crypto", - "cryptography", - "encryption", - "rsa", - "security", - "sftp", - "signature", - "signing", - "ssh", - "twofish", - "x.509", - "x509" - ], - "support": { - "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/2.0.41" - }, - "funding": [ - { - "url": "https://github.com/terrafrost", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpseclib", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib", - "type": "tidelift" - } - ], - "time": "2022-12-23T16:44:18+00:00" - }, - { - "name": "psr/container", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" - }, - "time": "2021-03-05T17:36:06+00:00" - }, - { - "name": "psr/event-dispatcher", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\EventDispatcher\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Standard interfaces for event handling.", - "keywords": [ - "events", - "psr", - "psr-14" - ], - "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" - }, - "time": "2019-01-08T18:20:26+00:00" - }, - { - "name": "psr/log", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" - }, - "time": "2021-05-03T11:20:27+00:00" - }, - { - "name": "rakit/validation", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/rakit/validation.git", - "reference": "ff003a35cdf5030a5f2482299f4c93f344a35b29" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/rakit/validation/zipball/ff003a35cdf5030a5f2482299f4c93f344a35b29", - "reference": "ff003a35cdf5030a5f2482299f4c93f344a35b29", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=7.0" - }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^6.5", - "squizlabs/php_codesniffer": "^3" - }, - "type": "library", - "autoload": { - "psr-4": { - "Rakit\\Validation\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Muhammad Syifa", - "email": "emsifa@gmail.com" - } - ], - "description": "PHP Laravel like standalone validation library", - "support": { - "issues": "https://github.com/rakit/validation/issues", - "source": "https://github.com/rakit/validation/tree/v1.4.0" - }, - "time": "2020-08-27T05:07:01+00:00" - }, - { - "name": "symfony/deprecation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" - }, - { - "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/event-dispatcher": "^1" - }, - "suggest": { - "symfony/event-dispatcher-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to dispatching event", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" - }, - { - "name": "symfony/http-foundation", - "version": "v4.4.49", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "191413c7b832c015bb38eae963f2e57498c3c173" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/191413c7b832c015bb38eae963f2e57498c3c173", - "reference": "191413c7b832c015bb38eae963f2e57498c3c173", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/mime": "^4.3|^5.0", - "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php80": "^1.16" - }, - "require-dev": { - "predis/predis": "~1.0", - "symfony/expression-language": "^3.4|^4.0|^5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Defines an object-oriented layer for the HTTP specification", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.49" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-04T16:17:57+00:00" - }, - { - "name": "symfony/mime", - "version": "v5.4.19", - "source": { - "type": "git", - "url": "https://github.com/symfony/mime.git", - "reference": "a858429a9c704edc53fe057228cf9ca282ba48eb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/a858429a9c704edc53fe057228cf9ca282ba48eb", - "reference": "a858429a9c704edc53fe057228cf9ca282ba48eb", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "egulias/email-validator": "~3.0.0", - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "symfony/mailer": "<4.4", - "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" - }, - "require-dev": { - "egulias/email-validator": "^2.1.10|^3.1|^4", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/property-access": "^4.4|^5.1|^6.0", - "symfony/property-info": "^4.4|^5.1|^6.0", - "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Mime\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Allows manipulating MIME messages", - "homepage": "https://symfony.com", - "keywords": [ - "mime", - "mime-type" - ], - "support": { - "source": "https://github.com/symfony/mime/tree/v5.4.19" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-09T05:43:46+00:00" - }, - { - "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Trevor Rowbotham", - "email": "trevor.rowbotham@pm.me" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/security-core", - "version": "v5.2.14", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-core.git", - "reference": "4ce2b1e532fb3bb591ad4efa8cc43afc9242a247" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/4ce2b1e532fb3bb591ad4efa8cc43afc9242a247", - "reference": "4ce2b1e532fb3bb591ad4efa8cc43afc9242a247", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/event-dispatcher-contracts": "^1.1|^2", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1.6|^2" - }, - "conflict": { - "symfony/event-dispatcher": "<4.4", - "symfony/ldap": "<4.4", - "symfony/security-guard": "<4.4", - "symfony/validator": "<5.2" - }, - "require-dev": { - "psr/container": "^1.0|^2.0", - "psr/log": "^1|^2|^3", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/expression-language": "^4.4|^5.0", - "symfony/http-foundation": "^4.4|^5.0", - "symfony/ldap": "^4.4|^5.0", - "symfony/translation": "^4.4|^5.0", - "symfony/validator": "^5.2" - }, - "suggest": { - "psr/container-implementation": "To instantiate the Security class", - "symfony/event-dispatcher": "", - "symfony/expression-language": "For using the expression voter", - "symfony/http-foundation": "", - "symfony/ldap": "For using LDAP integration", - "symfony/validator": "For using the user password constraint" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Security\\Core\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Security Component - Core Library", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-core/tree/v5.2.14" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2021-07-29T06:36:20+00:00" - }, - { - "name": "symfony/security-csrf", - "version": "v4.4.37", - "source": { - "type": "git", - "url": "https://github.com/symfony/security-csrf.git", - "reference": "45c956ef58135091f53732646a0acd28034f02c0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/45c956ef58135091f53732646a0acd28034f02c0", - "reference": "45c956ef58135091f53732646a0acd28034f02c0", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16", - "symfony/security-core": "^3.4|^4.0|^5.0" - }, - "conflict": { - "symfony/http-foundation": "<3.4" - }, - "require-dev": { - "symfony/http-foundation": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/http-foundation": "For using the class SessionTokenStorage." - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Security\\Csrf\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Security Component - CSRF Library", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/security-csrf/tree/v4.4.37" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:41:36+00:00" - }, - { - "name": "symfony/service-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "shasum": "" - }, - "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" - }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "suggest": { - "symfony/service-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to writing services", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-05-30T19:17:29+00:00" - } - ], - "packages-dev": [ - { - "name": "composer/package-versions-deprecated", - "version": "1.11.99.5", - "source": { - "type": "git", - "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b4f54f74ef3453349c24a845d22392cd31e65f1d", - "reference": "b4f54f74ef3453349c24a845d22392cd31e65f1d", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.1.0 || ^2.0", - "php": "^7 || ^8" - }, - "replace": { - "ocramius/package-versions": "1.11.99" - }, - "require-dev": { - "composer/composer": "^1.9.3 || ^2.0@dev", - "ext-zip": "^1.13", - "phpunit/phpunit": "^6.5 || ^7" - }, - "type": "composer-plugin", - "extra": { - "class": "PackageVersions\\Installer", - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "support": { - "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.5" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2022-01-17T14:14:24+00:00" - }, - { - "name": "composer/xdebug-handler", - "version": "1.4.6", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c", - "reference": "f27e06cd9675801df441b3656569b328e04aa37c", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.6" - }, - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2021-03-25T17:01:18+00:00" - }, - { - "name": "doctrine/instantiator", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^11", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-12-30T00:15:36+00:00" - }, - { - "name": "jean85/pretty-package-versions", - "version": "1.6.0", - "source": { - "type": "git", - "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "1e0104b46f045868f11942aea058cd7186d6c303" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/1e0104b46f045868f11942aea058cd7186d6c303", - "reference": "1e0104b46f045868f11942aea058cd7186d6c303", - "shasum": "" - }, - "require": { - "composer/package-versions-deprecated": "^1.8.0", - "php": "^7.0|^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0|^8.5|^9.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Jean85\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Alessandro Lai", - "email": "alessandro.lai85@gmail.com" - } - ], - "description": "A wrapper for ocramius/package-versions to get pretty versions strings", - "keywords": [ - "composer", - "package", - "release", - "versions" - ], - "support": { - "issues": "https://github.com/Jean85/pretty-package-versions/issues", - "source": "https://github.com/Jean85/pretty-package-versions/tree/1.6.0" - }, - "time": "2021-02-04T16:20:16+00:00" - }, - { - "name": "league/flysystem-memory", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem-memory.git", - "reference": "d0e87477c32e29f999b4de05e64c1adcddb51757" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-memory/zipball/d0e87477c32e29f999b4de05e64c1adcddb51757", - "reference": "d0e87477c32e29f999b4de05e64c1adcddb51757", - "shasum": "" - }, - "require": { - "league/flysystem": "~1.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.10" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "League\\Flysystem\\Memory\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Chris Leppanen", - "email": "chris.leppanen@gmail.com", - "role": "Developer" - } - ], - "description": "An in-memory adapter for Flysystem.", - "homepage": "https://github.com/thephpleague/flysystem-memory", - "keywords": [ - "Flysystem", - "adapter", - "memory" - ], - "support": { - "issues": "https://github.com/thephpleague/flysystem-memory/issues", - "source": "https://github.com/thephpleague/flysystem-memory/tree/1.0.2" - }, - "time": "2019-05-30T21:34:13+00:00" - }, - { - "name": "myclabs/deep-copy", - "version": "1.11.0", - "source": { - "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "conflict": { - "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" - }, - "require-dev": { - "doctrine/collections": "^1.6.8", - "doctrine/common": "^2.13.3 || ^3.2.2", - "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" - }, - "type": "library", - "autoload": { - "files": [ - "src/DeepCopy/deep_copy.php" - ], - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "Create deep copies (clones) of your objects", - "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" - ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], - "time": "2022-03-03T13:19:32+00:00" - }, - { - "name": "nette/bootstrap", - "version": "v3.1.4", - "source": { - "type": "git", - "url": "https://github.com/nette/bootstrap.git", - "reference": "1a7965b4ee401ad0e3f673b9c016d2481afdc280" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/bootstrap/zipball/1a7965b4ee401ad0e3f673b9c016d2481afdc280", - "reference": "1a7965b4ee401ad0e3f673b9c016d2481afdc280", - "shasum": "" - }, - "require": { - "nette/di": "^3.0.5", - "nette/utils": "^3.2.1 || ^4.0", - "php": ">=7.2 <8.3" - }, - "conflict": { - "tracy/tracy": "<2.6" - }, - "require-dev": { - "latte/latte": "^2.8", - "nette/application": "^3.1", - "nette/caching": "^3.0", - "nette/database": "^3.0", - "nette/forms": "^3.0", - "nette/http": "^3.0", - "nette/mail": "^3.0", - "nette/robot-loader": "^3.0", - "nette/safe-stream": "^2.2", - "nette/security": "^3.0", - "nette/tester": "^2.0", - "phpstan/phpstan-nette": "^0.12", - "tracy/tracy": "^2.6" - }, - "suggest": { - "nette/robot-loader": "to use Configurator::createRobotLoader()", - "tracy/tracy": "to use Configurator::enableTracy()" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🅱 Nette Bootstrap: the simple way to configure and bootstrap your Nette application.", - "homepage": "https://nette.org", - "keywords": [ - "bootstrapping", - "configurator", - "nette" - ], - "support": { - "issues": "https://github.com/nette/bootstrap/issues", - "source": "https://github.com/nette/bootstrap/tree/v3.1.4" - }, - "time": "2022-12-14T15:23:02+00:00" - }, - { - "name": "nette/di", - "version": "v3.1.1", - "source": { - "type": "git", - "url": "https://github.com/nette/di.git", - "reference": "4799ee684453bf5e70df1e87bec80bfbfc0e7d13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/4799ee684453bf5e70df1e87bec80bfbfc0e7d13", - "reference": "4799ee684453bf5e70df1e87bec80bfbfc0e7d13", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "nette/neon": "^3.3 || ^4.0", - "nette/php-generator": "^3.5.4 || ^4.0", - "nette/robot-loader": "^3.2 || ~4.0.0", - "nette/schema": "^1.2", - "nette/utils": "^3.2.5 || ~4.0.0", - "php": ">=7.2 <8.3" - }, - "require-dev": { - "nette/tester": "^2.4", - "phpstan/phpstan": "^1.0", - "tracy/tracy": "^2.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "💎 Nette Dependency Injection Container: Flexible, compiled and full-featured DIC with perfectly usable autowiring and support for all new PHP features.", - "homepage": "https://nette.org", - "keywords": [ - "compiled", - "di", - "dic", - "factory", - "ioc", - "nette", - "static" - ], - "support": { - "issues": "https://github.com/nette/di/issues", - "source": "https://github.com/nette/di/tree/v3.1.1" - }, - "time": "2023-01-16T03:38:02+00:00" - }, - { - "name": "nette/finder", - "version": "v2.6.0", - "source": { - "type": "git", - "url": "https://github.com/nette/finder.git", - "reference": "991aefb42860abeab8e003970c3809a9d83cb932" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/finder/zipball/991aefb42860abeab8e003970c3809a9d83cb932", - "reference": "991aefb42860abeab8e003970c3809a9d83cb932", - "shasum": "" - }, - "require": { - "nette/utils": "^2.4 || ^3.0", - "php": ">=7.1" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "require-dev": { - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🔍 Nette Finder: find files and directories with an intuitive API.", - "homepage": "https://nette.org", - "keywords": [ - "filesystem", - "glob", - "iterator", - "nette" - ], - "support": { - "issues": "https://github.com/nette/finder/issues", - "source": "https://github.com/nette/finder/tree/v2.6.0" - }, - "time": "2022-10-13T01:31:15+00:00" - }, - { - "name": "nette/neon", - "version": "v3.3.3", - "source": { - "type": "git", - "url": "https://github.com/nette/neon.git", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/22e384da162fab42961d48eb06c06d3ad0c11b95", - "reference": "22e384da162fab42961d48eb06c06d3ad0c11b95", - "shasum": "" - }, - "require": { - "ext-json": "*", - "php": ">=7.1" - }, - "require-dev": { - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.7" - }, - "bin": [ - "bin/neon-lint" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.3-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🍸 Nette NEON: encodes and decodes NEON file format.", - "homepage": "https://ne-on.org", - "keywords": [ - "export", - "import", - "neon", - "nette", - "yaml" - ], - "support": { - "issues": "https://github.com/nette/neon/issues", - "source": "https://github.com/nette/neon/tree/v3.3.3" - }, - "time": "2022-03-10T02:04:26+00:00" - }, - { - "name": "nette/php-generator", - "version": "v3.6.9", - "source": { - "type": "git", - "url": "https://github.com/nette/php-generator.git", - "reference": "d31782f7bd2ae84ad06f863391ec3fb77ca4d0a6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/d31782f7bd2ae84ad06f863391ec3fb77ca4d0a6", - "reference": "d31782f7bd2ae84ad06f863391ec3fb77ca4d0a6", - "shasum": "" - }, - "require": { - "nette/utils": "^3.1.2", - "php": ">=7.2 <8.3" - }, - "require-dev": { - "nette/tester": "^2.4", - "nikic/php-parser": "^4.13", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.8" - }, - "suggest": { - "nikic/php-parser": "to use ClassType::withBodiesFrom() & GlobalFunction::withBodyFrom()" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.6-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.1 features.", - "homepage": "https://nette.org", - "keywords": [ - "code", - "nette", - "php", - "scaffolding" - ], - "support": { - "issues": "https://github.com/nette/php-generator/issues", - "source": "https://github.com/nette/php-generator/tree/v3.6.9" - }, - "time": "2022-10-04T11:49:47+00:00" - }, - { - "name": "nette/robot-loader", - "version": "v3.4.2", - "source": { - "type": "git", - "url": "https://github.com/nette/robot-loader.git", - "reference": "970c8f82be98ec54180c88a468cd2b057855d993" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/robot-loader/zipball/970c8f82be98ec54180c88a468cd2b057855d993", - "reference": "970c8f82be98ec54180c88a468cd2b057855d993", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "nette/finder": "^2.5 || ^3.0", - "nette/utils": "^3.0", - "php": ">=7.1" - }, - "require-dev": { - "nette/tester": "^2.0", - "phpstan/phpstan": "^0.12", - "tracy/tracy": "^2.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🍀 Nette RobotLoader: high performance and comfortable autoloader that will search and autoload classes within your application.", - "homepage": "https://nette.org", - "keywords": [ - "autoload", - "class", - "interface", - "nette", - "trait" - ], - "support": { - "issues": "https://github.com/nette/robot-loader/issues", - "source": "https://github.com/nette/robot-loader/tree/v3.4.2" - }, - "time": "2022-12-14T15:41:06+00:00" - }, - { - "name": "nette/schema", - "version": "v1.2.3", - "source": { - "type": "git", - "url": "https://github.com/nette/schema.git", - "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/schema/zipball/abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", - "reference": "abbdbb70e0245d5f3bf77874cea1dfb0c930d06f", - "shasum": "" - }, - "require": { - "nette/utils": "^2.5.7 || ^3.1.5 || ^4.0", - "php": ">=7.1 <8.3" - }, - "require-dev": { - "nette/tester": "^2.3 || ^2.4", - "phpstan/phpstan-nette": "^1.0", - "tracy/tracy": "^2.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "📐 Nette Schema: validating data structures against a given Schema.", - "homepage": "https://nette.org", - "keywords": [ - "config", - "nette" - ], - "support": { - "issues": "https://github.com/nette/schema/issues", - "source": "https://github.com/nette/schema/tree/v1.2.3" - }, - "time": "2022-10-13T01:24:26+00:00" - }, - { - "name": "nette/utils", - "version": "v3.2.9", - "source": { - "type": "git", - "url": "https://github.com/nette/utils.git", - "reference": "c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c", - "reference": "c91bac3470c34b2ecd5400f6e6fdf0b64a836a5c", - "shasum": "" - }, - "require": { - "php": ">=7.2 <8.3" - }, - "conflict": { - "nette/di": "<3.0.6" - }, - "require-dev": { - "jetbrains/phpstorm-attributes": "dev-master", - "nette/tester": "~2.0", - "phpstan/phpstan": "^1.0", - "tracy/tracy": "^2.3" - }, - "suggest": { - "ext-gd": "to use Image", - "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()", - "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", - "ext-json": "to use Nette\\Utils\\Json", - "ext-mbstring": "to use Strings::lower() etc...", - "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()", - "ext-xml": "to use Strings::length() etc. when mbstring is not available" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0-only", - "GPL-3.0-only" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "https://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "https://nette.org/contributors" - } - ], - "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", - "homepage": "https://nette.org", - "keywords": [ - "array", - "core", - "datetime", - "images", - "json", - "nette", - "paginator", - "password", - "slugify", - "string", - "unicode", - "utf-8", - "utility", - "validation" - ], - "support": { - "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v3.2.9" - }, - "time": "2023-01-18T03:26:20+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v4.15.3", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039", - "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.9-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3" - }, - "time": "2023-01-16T22:05:37+00:00" - }, - { - "name": "phar-io/manifest", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" - }, - "time": "2021-07-20T11:28:43+00:00" - }, - { - "name": "phar-io/version", - "version": "3.2.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" - }, - "time": "2022-02-21T01:04:05+00:00" - }, - { - "name": "phpstan/phpdoc-parser", - "version": "0.3.5", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8c4ef2aefd9788238897b678a985e1d5c8df6db4", - "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4", - "shasum": "" - }, - "require": { - "php": "~7.1" - }, - "require-dev": { - "consistence/coding-standard": "^3.5", - "jakub-onderka/php-parallel-lint": "^0.9.2", - "phing/phing": "^2.16.0", - "phpstan/phpstan": "^0.10", - "phpunit/phpunit": "^6.3", - "slevomat/coding-standard": "^4.7.2", - "squizlabs/php_codesniffer": "^3.3.2", - "symfony/process": "^3.4 || ^4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.3-dev" - } - }, - "autoload": { - "psr-4": { - "PHPStan\\PhpDocParser\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPDoc parser with support for nullable, intersection and generic types", - "support": { - "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/master" - }, - "time": "2019-06-07T19:13:52+00:00" - }, - { - "name": "phpstan/phpstan", - "version": "0.11.20", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan.git", - "reference": "938dcc03a005280e1a9587ec7684345bff06ebfc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/938dcc03a005280e1a9587ec7684345bff06ebfc", - "reference": "938dcc03a005280e1a9587ec7684345bff06ebfc", - "shasum": "" - }, - "require": { - "composer/xdebug-handler": "^1.3.0", - "jean85/pretty-package-versions": "^1.0.3", - "nette/bootstrap": "^2.4 || ^3.0", - "nette/di": "^2.4.7 || ^3.0", - "nette/neon": "^2.4.3 || ^3.0", - "nette/robot-loader": "^3.0.1", - "nette/schema": "^1.0", - "nette/utils": "^2.4.5 || ^3.0", - "nikic/php-parser": "^4.2.3", - "php": "~7.1", - "phpstan/phpdoc-parser": "^0.3.5", - "symfony/console": "~3.2 || ~4.0", - "symfony/finder": "~3.2 || ~4.0" - }, - "conflict": { - "symfony/console": "3.4.16 || 4.1.5" - }, - "require-dev": { - "brianium/paratest": "^2.0 || ^3.0", - "consistence/coding-standard": "^3.5", - "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4", - "ext-intl": "*", - "ext-mysqli": "*", - "ext-simplexml": "*", - "ext-soap": "*", - "ext-zip": "*", - "jakub-onderka/php-parallel-lint": "^1.0", - "localheinz/composer-normalize": "^1.1.0", - "phing/phing": "^2.16.0", - "phpstan/phpstan-deprecation-rules": "^0.11", - "phpstan/phpstan-php-parser": "^0.11", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-strict-rules": "^0.11", - "phpunit/phpunit": "^7.5.14 || ^8.0", - "slevomat/coding-standard": "^4.7.2", - "squizlabs/php_codesniffer": "^3.3.2" - }, - "bin": [ - "bin/phpstan" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.11-dev" - } - }, - "autoload": { - "psr-4": { - "PHPStan\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHPStan - PHP Static Analysis Tool", - "support": { - "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.11.20" - }, - "funding": [ - { - "url": "https://github.com/ondrejmirtes", - "type": "github" - }, - { - "url": "https://www.patreon.com/phpstan", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" - } - ], - "time": "2020-10-12T14:33:05+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "7.0.15", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "819f92bba8b001d4363065928088de22f25a3a48" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/819f92bba8b001d4363065928088de22f25a3a48", - "reference": "819f92bba8b001d4363065928088de22f25a3a48", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-xmlwriter": "*", - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.3 || ^4.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" - }, - "require-dev": { - "phpunit/phpunit": "^8.2.2" - }, - "suggest": { - "ext-xdebug": "^2.7.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "7.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.15" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-07-26T12:20:09+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "2.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2021-12-02T12:42:26+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" - }, - "time": "2015-06-21T13:50:34+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "2.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:20:02+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "3.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9c1da83261628cb24b6a6df371b6e312b3954768", - "reference": "9c1da83261628cb24b6a6df371b6e312b3954768", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "abandoned": true, - "time": "2021-07-26T12:15:06+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "8.5.32", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "375686930d05c9fd7d20f6e5fc38121e8d7a9d55" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/375686930d05c9fd7d20f6e5fc38121e8d7a9d55", - "reference": "375686930d05c9fd7d20f6e5fc38121e8d7a9d55", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.3.1", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.0", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.4", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.5", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.5", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" - }, - "suggest": { - "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0.0" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "8.5-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.32" - }, - "funding": [ - { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" - } - ], - "time": "2023-01-26T08:30:25+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T08:15:22+00:00" - }, - { - "name": "sebastian/comparator", - "version": "3.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2022-09-14T12:31:48+00:00" - }, - { - "name": "sebastian/diff", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:59:04+00:00" - }, - { - "name": "sebastian/environment", - "version": "4.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.5" - }, - "suggest": { - "ext-posix": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:53:42+00:00" - }, - { - "name": "sebastian/exporter", - "version": "3.1.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6", - "shasum": "" - }, - "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^8.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2022-09-14T06:00:17+00:00" - }, - { - "name": "sebastian/global-state", - "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/de036ec91d55d2a9e0db2ba975b512cdb1c23921", - "reference": "de036ec91d55d2a9e0db2ba975b512cdb1c23921", - "shasum": "" - }, - "require": { - "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" - }, - "require-dev": { - "ext-dom": "*", - "phpunit/phpunit": "^8.0" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2022-02-10T06:55:38+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "3.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "shasum": "" - }, - "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Traverses array structures and object graphs to enumerate all referenced objects", - "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:40:27+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "shasum": "" - }, - "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:37:18+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", - "shasum": "" - }, - "require": { - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:34:24+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:30:19+00:00" - }, - { - "name": "sebastian/type", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the types of the PHP type system", - "homepage": "https://github.com/sebastianbergmann/type", - "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-11-30T07:25:11+00:00" - }, - { - "name": "sebastian/version", - "version": "2.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" - }, - "time": "2016-10-03T07:35:21+00:00" - }, - { - "name": "symfony/console", - "version": "v4.4.49", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/33fa45ffc81fdcc1ca368d4946da859c8cdb58d9", - "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1|^2" - }, - "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3|>=5", - "symfony/lock": "<4.4", - "symfony/process": "<3.3" - }, - "provide": { - "psr/log-implementation": "1.0|2.0" - }, - "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^3.4|^4.0|^5.0", - "symfony/dependency-injection": "^3.4|^4.0|^5.0", - "symfony/event-dispatcher": "^4.3", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^3.4|^4.0|^5.0", - "symfony/var-dumper": "^4.3|^5.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Eases the creation of beautiful and testable command line interfaces", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/console/tree/v4.4.49" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-05T17:10:16+00:00" - }, - { - "name": "symfony/finder", - "version": "v4.4.44", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "66bd787edb5e42ff59d3523f623895af05043e4f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f", - "reference": "66bd787edb5e42ff59d3523f623895af05043e4f", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Finds files and directories via an intuitive fluent interface", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.44" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-07-29T07:35:46+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/var-dumper", - "version": "v4.4.47", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "1069c7a3fca74578022fab6f81643248d02f8e63" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1069c7a3fca74578022fab6f81643248d02f8e63", - "reference": "1069c7a3fca74578022fab6f81643248d02f8e63", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php72": "~1.5", - "symfony/polyfill-php80": "^1.16" - }, - "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/console": "<3.4" - }, - "require-dev": { - "ext-iconv": "*", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/process": "^4.4|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" - }, - "suggest": { - "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump", - "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" - }, - "bin": [ - "Resources/bin/var-dump-server" - ], - "type": "library", - "autoload": { - "files": [ - "Resources/functions/dump.php" - ], - "psr-4": { - "Symfony\\Component\\VarDumper\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides mechanisms for walking through any arbitrary PHP variable", - "homepage": "https://symfony.com", - "keywords": [ - "debug", - "dump" - ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.47" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-10-03T15:15:11+00:00" - }, - { - "name": "theseer/tokenizer", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - } - ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" - }, - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], - "time": "2021-07-28T10:34:58+00:00" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": "^7.2" - }, - "platform-dev": [], - "platform-overrides": { - "php": "7.2.5" - }, - "plugin-api-version": "2.3.0" -} diff --git a/install/deb/filemanager/filegator/configuration.php b/install/deb/filemanager/filegator/configuration.php deleted file mode 100644 index 3298d8c..0000000 --- a/install/deb/filemanager/filegator/configuration.php +++ /dev/null @@ -1,175 +0,0 @@ -'; - exit(); - } else { - $_SESSION["LAST_ACTIVITY"] = time(); - } - } else { - echo ''; - } - if (isset($_SESSION["user"])) { - $v_user = $_SESSION["user"]; - } - if (!empty($_SESSION["look"])) { - if (isset($_SESSION["look"]) && $_SESSION["userContext"] === "admin") { - $v_user = $_SESSION["look"]; - } - if ( - isset($_SESSION["look"]) && - $_SESSION["look"] == "admin" && - $_SESSION["POLICY_SYSTEM_PROTECTED_ADMIN"] == "yes" - ) { - header("Location: /"); - } - } - # Create filemanager sftp key if missing and trash it after 30 min - if (!file_exists("/home/" . basename($v_user) . "/.ssh/hst-filemanager-key")) { - exec( - "sudo /usr/local/hestia/bin/v-add-user-sftp-key " . - quoteshellarg(basename($v_user)) . - " 30", - $output, - $return_var, - ); - // filemanager also requires .ssh chmod o+x ... hopefully we can improve it to g+x or u+x someday - // current minimum for filemanager: chmod 0701 .ssh - shell_exec("sudo chmod o+x " . quoteshellarg("/home/" . basename($v_user) . "/.ssh")); - } - - if (!isset($_SESSION["SFTP_PORT"])) { - exec("sudo /usr/local/hestia/bin/v-list-sys-sshd-port json", $output, $result); - $port = json_decode(implode("", $output)); - if (is_numeric($port[0]) && $port[0] > 0) { - $_SESSION["SFTP_PORT"] = $port[0]; - } elseif ( - preg_match('/^\s*Port\s+(\d+)$/im', file_get_contents("/etc/ssh/sshd_config"), $matches) - ) { - $_SESSION["SFTP_PORT"] = $matches[1] ?? 22; - } else { - $_SESSION["SFTP_PORT"] = 22; - } - } - - preg_match( - '/(Hestia SFTP Chroot\nMatch User)(.*)/i', - file_get_contents("/etc/ssh/sshd_config"), - $matches, - ); - $user_list = explode(",", $matches[2]); - if (in_array($v_user, $user_list)) { - $root = "/"; - } else { - $root = "/home/" . $v_user; - } - - return new \League\Flysystem\Sftp\SftpAdapter([ - "host" => "127.0.0.1", - "port" => intval($_SESSION["SFTP_PORT"]), - "username" => basename($v_user), - "privateKey" => "/home/" . basename($v_user) . "/.ssh/hst-filemanager-key", - "root" => $root, - "timeout" => 10, - "directoryPerm" => 0755, - ]); -}; - -$dist_config["services"]["Filegator\Services\Archiver\ArchiverInterface"] = [ - "handler" => "\Filegator\Services\Archiver\Adapters\HestiaZipArchiver", - "config" => [], -]; - -$dist_config["services"]["Filegator\Services\Auth\AuthInterface"] = [ - "handler" => "\Filegator\Services\Auth\Adapters\HestiaAuth", - "config" => [ - "permissions" => ["read", "write", "upload", "download", "batchdownload", "zip"], - "private_repos" => false, - ], -]; - -$dist_config["services"]["Filegator\Services\View\ViewInterface"]["config"] = [ - "add_to_head" => ' - - ', - "add_to_body" => ' -', -]; - -return $dist_config; diff --git a/install/deb/filemanager/install-fm.sh b/install/deb/filemanager/install-fm.sh deleted file mode 100755 index 7d3a0e4..0000000 --- a/install/deb/filemanager/install-fm.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -# Checking root permissions -if [ "x$(id -u)" != 'x0' ]; then - echo "Error: Script can be run executed only by root" - exit 10 -fi - -if [ -z "$HESTIA" ]; then - HESTIA="/usr/local/hestia" -fi - -user='admin' -fm_error='no' -source $HESTIA/func/main.sh -source $HESTIA/install/upgrade/upgrade.conf - -if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then - echo "Error: Hestia environment vars not present" - exit 2 -fi - -FM_INSTALL_DIR="$HESTIA/web/fm" - -FM_FILE="filegator_latest" -FM_URL="https://github.com/filegator/static/raw/master/builds/filegator_latest.zip" - -COMPOSER_BIN="$HOMEDIR/$user/.composer/composer" -if [ ! -f "$COMPOSER_BIN" ]; then - $BIN/v-add-user-composer "$user" - if [ $? -ne 0 ]; then - $BIN/v-add-user-notification admin 'Composer installation failed!' '

The File Manager will not work without Composer.

Please try running the installer from a shell session:
bash $HESTIA/install/deb/filemanager/install-fm.sh

If this issue continues, please open an issue on GitHub.

' - fm_error='yes' - fi -fi - -if [ "$fm_error" != "yes" ]; then - rm --recursive --force "$FM_INSTALL_DIR" - mkdir -p "$FM_INSTALL_DIR" - cd "$FM_INSTALL_DIR" - - [ ! -f "${FM_INSTALL_DIR}/${FM_FILE}" ] && wget "$FM_URL" --quiet -O "${FM_INSTALL_DIR}/${FM_FILE}.zip" - - unzip -qq "${FM_INSTALL_DIR}/${FM_FILE}.zip" - mv --force ${FM_INSTALL_DIR}/filegator/* "${FM_INSTALL_DIR}" - rm --recursive --force ${FM_INSTALL_DIR}/${FM_FILE} - [[ -f "${FM_INSTALL_DIR}/${FM_FILE}" ]] && rm "${FM_INSTALL_DIR}/${FM_FILE}" - - cp --recursive --force ${HESTIA_INSTALL_DIR}/filemanager/filegator/* "${FM_INSTALL_DIR}" - - chown $user: -R "${FM_INSTALL_DIR}" - - # Check if php7.3 is available and run the installer - if [ -f "/usr/bin/php7.3" ]; then - COMPOSER_HOME="$HOMEDIR/$user/.config/composer" user_exec /usr/bin/php7.3 $COMPOSER_BIN --quiet --no-dev install - if [ $? -ne 0 ]; then - $BIN/v-add-user-notification admin 'File Manager installation failed!' '

Please try running the installer from a shell session:
bash $HESTIA/install/deb/filemanager/install-fm.sh

If this issue continues, please open an issue on GitHub.

' - fm_error="yes" - fi - else - $BIN/v-add-user-notification admin 'File Manager installation failed!' '

Unable to proceed with installation of File Manager.

Package php7.3-cli is missing from your system. Please check your PHP installation and environment settings.

' - fm_error="yes" - fi - - if [ "$fm_error" != "yes" ]; then - chown root: -R "${FM_INSTALL_DIR}" - chown $user: "${FM_INSTALL_DIR}/private" - chown $user: "${FM_INSTALL_DIR}/private/logs" - chown $user: "${FM_INSTALL_DIR}/repository" - fi -fi diff --git a/install/deb/logrotate/apache2 b/install/deb/logrotate/apache2 deleted file mode 100644 index 75aa4dd..0000000 --- a/install/deb/logrotate/apache2 +++ /dev/null @@ -1,19 +0,0 @@ -/var/log/apache2/*.log /var/log/apache2/domains/*log { - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - create 640 - sharedscripts - postrotate - /etc/init.d/apache2 reload > /dev/null || true - [ ! -f /run/nginx.pid ] || kill -USR1 `cat /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/deb/logrotate/dovecot b/install/deb/logrotate/dovecot deleted file mode 100644 index b51ce18..0000000 --- a/install/deb/logrotate/dovecot +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/dovecot*.log { - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - sharedscripts - postrotate - doveadm log reopen - endscript -} \ No newline at end of file diff --git a/install/deb/logrotate/hestia b/install/deb/logrotate/hestia deleted file mode 100644 index 4317535..0000000 --- a/install/deb/logrotate/hestia +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/hestia/*.log { - rotate 12 - monthly - missingok - notifempty - create 0600 root root -} \ No newline at end of file diff --git a/install/deb/logrotate/httpd-prerotate/awstats b/install/deb/logrotate/httpd-prerotate/awstats deleted file mode 100755 index 2403b69..0000000 --- a/install/deb/logrotate/httpd-prerotate/awstats +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# Changes made by HestiaCP due to https://github.com/hestiacp/hestiacp/issues/3289 -/usr/local/hestia/bin/v-update-sys-queue webstats diff --git a/install/deb/logrotate/nginx b/install/deb/logrotate/nginx deleted file mode 100644 index 5504a61..0000000 --- a/install/deb/logrotate/nginx +++ /dev/null @@ -1,13 +0,0 @@ -/var/log/nginx/*log /var/log/nginx/domains/*log { - rotate 4 - weekly - missingok - notifempty - compress - delaycompress - create 640 - sharedscripts - postrotate - [ -f /run/nginx.pid ] && kill -USR1 `cat /run/nginx.pid` - endscript -} diff --git a/install/deb/logrotate/roundcube b/install/deb/logrotate/roundcube deleted file mode 100644 index 5038dca..0000000 --- a/install/deb/logrotate/roundcube +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/roundcube/*.log { - rotate 12 - monthly - missingok - notifempty - create 644 www-data www-data -} \ No newline at end of file diff --git a/install/deb/mysql/my-large.cnf b/install/deb/mysql/my-large.cnf deleted file mode 100644 index 431e6ff..0000000 --- a/install/deb/mysql/my-large.cnf +++ /dev/null @@ -1,50 +0,0 @@ -[client] -port=3306 -socket=/run/mysqld/mysqld.sock -default-character-set=utf8mb4 - -[mysql] -default-character-set=utf8mb4 - -[mysqld_safe] -socket=/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/run/mysqld/mysqld.pid -socket=/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 -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 - -symbolic-links=0 -local-infile=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/ -!includedir /etc/mysql/mariadb.conf.d/ diff --git a/install/deb/mysql/my-medium.cnf b/install/deb/mysql/my-medium.cnf deleted file mode 100644 index aca20d2..0000000 --- a/install/deb/mysql/my-medium.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -port=3306 -socket=/run/mysqld/mysqld.sock -default-character-set=utf8mb4 - -[mysql] -default-character-set=utf8mb4 - -[mysqld_safe] -socket=/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/run/mysqld/mysqld.pid -socket=/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 -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 - -symbolic-links=0 -local-infile=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/ -!includedir /etc/mysql/mariadb.conf.d/ diff --git a/install/deb/mysql/my-small.cnf b/install/deb/mysql/my-small.cnf deleted file mode 100644 index 74ee06c..0000000 --- a/install/deb/mysql/my-small.cnf +++ /dev/null @@ -1,49 +0,0 @@ -[client] -port=3306 -socket=/run/mysqld/mysqld.sock -default-character-set=utf8mb4 - -[mysql] -default-character-set=utf8mb4 - -[mysqld_safe] -socket=/run/mysqld/mysqld.sock - -[mysqld] -user=mysql -pid-file=/run/mysqld/mysqld.pid -socket=/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 -collation-server = utf8mb4_unicode_520_ci -init-connect='SET NAMES utf8mb4' -character-set-server = utf8mb4 - -symbolic-links=0 -local-infile=0 - -skip-external-locking -key_buffer_size = 16K -max_allowed_packet = 1M -table_open_cache = 10 -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/ -!includedir /etc/mysql/mariadb.conf.d/ diff --git a/install/deb/nginx/0rtt-anti-replay.conf b/install/deb/nginx/0rtt-anti-replay.conf deleted file mode 100644 index 13168e0..0000000 --- a/install/deb/nginx/0rtt-anti-replay.conf +++ /dev/null @@ -1,39 +0,0 @@ -# Implement TLS 1.3 0-RTT anti-replay for NGINX - -# Requires: NGINX directive "ssl_early_data" on - -# Usage: - -# Make sure these "map" blocks are included in "http" block -# Put the following two lines in SSL "server" block, before any "location" blocks - -# if ($anti_replay = 307) { return 307 https://$host$request_uri; } -# if ($anti_replay = 425) { return 425; } - -# Pass "Early-Data" header to backend/upstream -# Only for 0-RTT requests from clients that understand 425 status code (RFC 8470) - -# fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; -# proxy_set_header Early-Data $rfc_early_data; - -# Copyright © myrevery -# Copyright © 7677333 (An anagram of a Anonymous Cybersecurity Research Team) - -map "$request_method:$is_args" $ar_idempotent { - default 0; - "~^GET:$|^(HEAD|OPTIONS|TRACE):\?*$" 1; -} - -map $http_user_agent $ar_support_425 { - default 0; - "~Firefox/((58|59)|([6-9]\d)|([1-9]\d{2,}))\.\d+" 1; -} - -map "$ssl_early_data:$ar_idempotent:$ar_support_425" $anti_replay { - 1:0:0 307; - 1:0:1 425; -} - -map "$ssl_early_data:$ar_support_425" $rfc_early_data { - 1:1 1; -} diff --git a/install/deb/nginx/agents.conf b/install/deb/nginx/agents.conf deleted file mode 100644 index 00df1b4..0000000 --- a/install/deb/nginx/agents.conf +++ /dev/null @@ -1,16 +0,0 @@ -map $http_user_agent $mobile_request { - default desktopversion; - "~*ipad" mobileversion; - "~*android.*mobile" mobileversion; - "~*iphone" mobileversion; - "~*ipod.*mobile" mobileversion; - "~*BlackBerry*Mobile Safari" mobileversion; - "~*BB*Mobile Safari" mobileversion; - "~*Opera.*Mini/7" mobileversion; - "~*IEMobile/10.*Touch" mobileversion; - "~*IEMobile/11.*Touch" mobileversion; - "~*IEMobile/7.0" mobileversion; - "~*IEMobile/9.0" mobileversion; - "~*Firefox.*Mobile" mobileversion; - "~*webOS" mobileversion; -} \ No newline at end of file diff --git a/install/deb/nginx/nginx.conf b/install/deb/nginx/nginx.conf deleted file mode 100644 index a462864..0000000 --- a/install/deb/nginx/nginx.conf +++ /dev/null @@ -1,130 +0,0 @@ -# Server globals -user www-data; -worker_processes auto; -worker_rlimit_nofile 65535; -error_log /var/log/nginx/error.log; -pid /run/nginx.pid; -include /etc/nginx/conf.d/main/*.conf; -include /etc/nginx/modules-enabled/*.conf; - -# 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 180s; - client_body_timeout 180s; - client_header_buffer_size 2k; - client_body_buffer_size 256k; - client_max_body_size 1024m; - large_client_header_buffers 4 8k; - send_timeout 60s; - keepalive_timeout 30s; - keepalive_requests 10000; - reset_timedout_connection on; - server_tokens off; - server_name_in_redirect off; - server_names_hash_max_size 512; - server_names_hash_bucket_size 512; - charset utf-8; - # FastCGI settings - fastcgi_buffers 512 4k; - fastcgi_buffer_size 256k; - fastcgi_busy_buffers_size 256k; - fastcgi_temp_file_write_size 256k; - fastcgi_connect_timeout 30s; - fastcgi_read_timeout 300s; - fastcgi_send_timeout 180s; - fastcgi_cache_lock on; - fastcgi_cache_lock_timeout 5s; - fastcgi_cache_background_update on; - fastcgi_cache_revalidate on; - # Proxy settings - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header Early-Data $rfc_early_data; - 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 256 4k; - proxy_buffer_size 32k; - proxy_busy_buffers_size 32k; - proxy_temp_file_write_size 256k; - proxy_connect_timeout 30s; - proxy_read_timeout 300s; - proxy_send_timeout 180s; - # 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'; - log_not_found off; - access_log off; - # Mime settings - include /etc/nginx/mime.types; - default_type application/octet-stream; - # Compression - gzip on; - gzip_vary on; - gzip_static on; - gzip_comp_level 6; - gzip_min_length 1024; - gzip_buffers 128 4k; - gzip_http_version 1.1; - gzip_types text/css text/javascript text/js text/plain text/richtext text/shtml text/x-component text/x-java-source text/x-markdown text/x-script text/xml image/bmp image/svg+xml image/vnd.microsoft.icon image/x-icon font/otf font/ttf font/x-woff multipart/bag multipart/mixed application/eot application/font application/font-sfnt application/font-woff application/javascript application/javascript-binast application/json application/ld+json application/manifest+json application/opentype application/otf application/rss+xml application/ttf application/truetype application/vnd.api+json application/vnd.ms-fontobject application/wasm application/xhtml+xml application/xml application/xml+rss application/x-httpd-cgi application/x-javascript application/x-opentype application/x-otf application/x-perl application/x-protobuf application/x-ttf; - gzip_proxied any; - # Cloudflare IPs - include /etc/nginx/conf.d/cloudflare.inc; - # SSL PCI compliance - ssl_buffer_size 1369; - ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256"; - ssl_dhparam /etc/ssl/dhparam.pem; - ssl_early_data on; - ssl_ecdh_curve auto; - ssl_prefer_server_ciphers on; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_session_cache shared:SSL:20m; - ssl_session_tickets on; - ssl_session_timeout 7d; - resolver 1.0.0.1 8.8.4.4 1.1.1.1 8.8.8.8 valid=300s ipv6=off; - resolver_timeout 5s; - # Error pages - error_page 403 /error/404.html; - error_page 404 /error/404.html; - error_page 410 /error/410.html; - error_page 500 501 502 503 504 505 /error/50x.html; - # Proxy cache - proxy_cache_path /var/cache/nginx levels=2 keys_zone=cache:10m inactive=60m max_size=1024m; - proxy_cache_key "$scheme$request_method$host$request_uri"; - proxy_temp_path /var/cache/nginx/temp; - proxy_ignore_headers Cache-Control Expires; - proxy_cache_use_stale error timeout invalid_header updating http_502; - proxy_cache_valid any 1d; - # FastCGI cache - fastcgi_cache_path /var/cache/nginx/micro levels=1:2 keys_zone=microcache:10m inactive=30m max_size=1024m; - fastcgi_cache_key "$scheme$request_method$host$request_uri"; - fastcgi_ignore_headers Cache-Control Expires Set-Cookie; - fastcgi_cache_use_stale error timeout invalid_header updating http_500 http_503; - add_header X-FastCGI-Cache $upstream_cache_status; - - # Cache bypass - map $http_cookie $no_cache { - default 0; - ~SESS 1; - ~wordpress_logged_in 1; - } - - # File cache (static assets) - 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; - include /etc/nginx/conf.d/domains/*.conf; -} diff --git a/install/deb/nginx/phpmyadmin.inc b/install/deb/nginx/phpmyadmin.inc deleted file mode 100644 index 4200da5..0000000 --- a/install/deb/nginx/phpmyadmin.inc +++ /dev/null @@ -1,26 +0,0 @@ -location /%pma_alias% { - alias /usr/share/phpmyadmin/; - - location ~ /(libraries|setup|templates|locale) { - deny all; - return 404; - } - - location ~ /(.+\.(json|lock|md)) { - deny all; - return 404; - } - - location ~ ^/%pma_alias%/(.*\.php)$ { - alias /usr/share/phpmyadmin/$1; - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_pass 127.0.0.1:9000; - } - - location /%pma_alias%/(.+\.(jpg|jpeg|gif|css|png|webp|js|ico|html|xml|txt))$ { - root /usr/share/phpmyadmin/; - } -} \ No newline at end of file diff --git a/install/deb/nginx/phppgadmin.inc b/install/deb/nginx/phppgadmin.inc deleted file mode 100644 index 47a27fe..0000000 --- a/install/deb/nginx/phppgadmin.inc +++ /dev/null @@ -1,12 +0,0 @@ -location /%pga_alias% { - alias /usr/share/phppgadmin/; - - location ~ ^/%pga_alias%/(.*\.php)$ { - alias /usr/share/phppgadmin/$1; - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_pass 127.0.0.1:9000; - } -} \ No newline at end of file diff --git a/install/deb/nginx/status.conf b/install/deb/nginx/status.conf deleted file mode 100644 index 7fcdd62..0000000 --- a/install/deb/nginx/status.conf +++ /dev/null @@ -1,11 +0,0 @@ -server { - listen 127.0.0.1:8084 default_server; - server_name _; - server_name_in_redirect off; - - location / { - stub_status on; - access_log off; - error_log /dev/null; - } -} diff --git a/install/deb/nginx/unassigned.inc b/install/deb/nginx/unassigned.inc deleted file mode 100644 index 74c914b..0000000 --- a/install/deb/nginx/unassigned.inc +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen directIP:80 default_server; - server_name _; - access_log off; - error_log /dev/null; - - location / { - root /var/www/html; - - location /phpmyadmin/ { - alias /var/www/document_errors/; - return 404; - } - - location /phppgadmin/ { - alias /var/www/document_errors/; - return 404; - } - - location /webmail { - alias /var/www/document_errors/; - return 404; - } - - location /webmail/ { - alias /var/www/document_errors/; - return 404; - } - - location /error/ { - alias /var/www/document_errors/; - } - } -} - -server { - listen directIP:443 default_server ssl; - server_name _; - access_log off; - error_log /dev/null; - ssl_certificate /usr/local/hestia/ssl/certificate.crt; - ssl_certificate_key /usr/local/hestia/ssl/certificate.key; - return 301 http://$host$request_uri; - - location / { - root /var/www/document_errors/; - } - - location /error/ { - alias /var/www/document_errors/; - } -} \ No newline at end of file diff --git a/install/deb/pga/config.inc.php b/install/deb/pga/config.inc.php deleted file mode 100644 index 1bfe912..0000000 --- a/install/deb/pga/config.inc.php +++ /dev/null @@ -1,166 +0,0 @@ - diff --git a/install/deb/pga/phppgadmin.conf b/install/deb/pga/phppgadmin.conf deleted file mode 100644 index 204d25a..0000000 --- a/install/deb/pga/phppgadmin.conf +++ /dev/null @@ -1,37 +0,0 @@ -Alias /%pga_alias% /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 . - - - # Use www.conf instead - - SetHandler "proxy:fcgi://127.0.0.1:9000" - - - - - - 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/deb/php-fpm/dummy.conf b/install/deb/php-fpm/dummy.conf deleted file mode 100644 index 781ec89..0000000 --- a/install/deb/php-fpm/dummy.conf +++ /dev/null @@ -1,13 +0,0 @@ -; origin-src: deb/php-fpm/dummy.conf - -[www] -listen = 127.0.0.1:9999 -listen.allowed_clients = 127.0.0.1 - -user = www-data -group = www-data - -pm = ondemand -pm.max_children = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/deb/php-fpm/multiphp.tpl b/install/deb/php-fpm/multiphp.tpl deleted file mode 100644 index 6f0c874..0000000 --- a/install/deb/php-fpm/multiphp.tpl +++ /dev/null @@ -1,31 +0,0 @@ -; origin-src: deb/php-fpm/multiphp.tpl -;#=========================================================================# -;# Default Web Domain Template # -;# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -;# https://hestiacp.com/docs/server-administration/web-templates.html # -;#=========================================================================# - -[%domain%] -listen = /run/php/php%backend_version%-fpm-%domain%.sock -listen.owner = %user% -listen.group = www-data -listen.mode = 0660 - -user = %user% -group = %user% - -pm = ondemand -pm.max_children = 8 -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 -php_admin_value[open_basedir] = /home/%user%/.composer:/home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/private:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/tmp:/var/www/html:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt -php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f admin@%domain% - -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/deb/php-fpm/php-fpm.conf b/install/deb/php-fpm/php-fpm.conf deleted file mode 100644 index 2fe1690..0000000 --- a/install/deb/php-fpm/php-fpm.conf +++ /dev/null @@ -1,145 +0,0 @@ -;;;;;;;;;;;;;;;;;;;;; -; FPM Configuration ; -;;;;;;;;;;;;;;;;;;;;; - -; All relative paths in this configuration file are relative to PHP's install -; prefix (/usr). This prefix can be dynamically changed by using the -; '-p' argument from the command line. - -;;;;;;;;;;;;;;;;;; -; Global Options ; -;;;;;;;;;;;;;;;;;; - -[global] -; Pid file -; Note: the default prefix is /var -; Default Value: none -; Warning: if you change the value here, you need to modify systemd -; service PIDFile= setting to match the value here. -pid = /run/php/phpfpm_v-fpm.pid - -; Error log file -; If it's set to "syslog", log is sent to syslogd instead of being written -; into a local file. -; Note: the default prefix is /var -; Default Value: log/php-fpm.log -error_log = /var/log/phpfpm_v-fpm.log - -; syslog_facility is used to specify what type of program is logging the -; message. This lets syslogd specify that messages from different facilities -; will be handled differently. -; See syslog(3) for possible values (ex daemon equiv LOG_DAEMON) -; Default Value: daemon -;syslog.facility = daemon - -; syslog_ident is prepended to every message. If you have multiple FPM -; instances running on the same server, you can change the default value -; which must suit common needs. -; Default Value: php-fpm -;syslog.ident = php$fpm_v-fpm - -; Log level -; Possible Values: alert, error, warning, notice, debug -; Default Value: notice -log_level = error - -; Log limit on number of characters in the single line (log entry). If the -; line is over the limit, it is wrapped on multiple lines. The limit is for -; all logged characters including message prefix and suffix if present. However -; the new line character does not count into it as it is present only when -; logging to a file descriptor. It means the new line character is not present -; when logging to syslog. -; Default Value: 1024 -;log_limit = 4096 - -; Log buffering specifies if the log line is buffered which means that the -; line is written in a single write operation. If the value is false, then the -; data is written directly into the file descriptor. It is an experimental -; option that can potentially improve logging performance and memory usage -; for some heavy logging scenarios. This option is ignored if logging to syslog -; as it has to be always buffered. -; Default value: yes -;log_buffering = no - -; If this number of child processes exit with SIGSEGV or SIGBUS within the time -; interval set by emergency_restart_interval then FPM will restart. A value -; of '0' means 'Off'. -; Default Value: 0 -emergency_restart_threshold = 10 - -; Interval of time used by emergency_restart_interval to determine when -; a graceful restart will be initiated. This can be useful to work around -; accidental corruptions in an accelerator's shared memory. -; Available Units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -emergency_restart_interval = 60s - -; Time limit for child processes to wait for a reaction on signals from master. -; Available units: s(econds), m(inutes), h(ours), or d(ays) -; Default Unit: seconds -; Default Value: 0 -process_control_timeout = 10s - -; The maximum number of processes FPM will fork. This has been designed to control -; the global number of processes when using dynamic PM within a lot of pools. -; Use it with caution. -; Note: A value of 0 indicates no limit -; Default Value: 0 -; process.max = 128 - -; Specify the nice(2) priority to apply to the master process (only if set) -; The value can vary from -19 (highest priority) to 20 (lowest priority) -; Note: - It will only work if the FPM master process is launched as root -; - The pool process will inherit the master process priority -; unless specified otherwise -; Default Value: no set -; process.priority = -19 - -; Send FPM to background. Set to 'no' to keep FPM in foreground for debugging. -; Default Value: yes -;daemonize = yes - -; Set open file descriptor rlimit for the master process. -; Default Value: system defined value -;rlimit_files = 1024 - -; Set max core size rlimit for the master process. -; Possible Values: 'unlimited' or an integer greater or equal to 0 -; Default Value: system defined value -;rlimit_core = 0 - -; Specify the event mechanism FPM will use. The following is available: -; - select (any POSIX os) -; - poll (any POSIX os) -; - epoll (linux >= 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 - -; When FPM is built with systemd integration, specify the interval, -; in seconds, between health report notification to systemd. -; Set to 0 to disable. -; Available Units: s(econds), m(inutes), h(ours) -; Default Unit: seconds -; Default value: 10 -;systemd_interval = 10 - -;;;;;;;;;;;;;;;;;;;; -; 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 :) - -; Include one or more files. If glob(3) exists, it is used to include a bunch of -; files from a glob(3) pattern. This directive can be used everywhere in the -; file. -; Relative path can also be used. They will be prefixed by: -; - the global prefix if it's been set (-p argument) -; - /usr otherwise -include=/etc/php/fpm_v/fpm/pool.d/*.conf diff --git a/install/deb/php-fpm/www.conf b/install/deb/php-fpm/www.conf deleted file mode 100644 index c27207c..0000000 --- a/install/deb/php-fpm/www.conf +++ /dev/null @@ -1,13 +0,0 @@ -; origin-src: deb/php-fpm/www.conf - -[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 = 4 -pm.max_requests = 4000 -pm.process_idle_timeout = 10s diff --git a/install/deb/phpmyadmin/config.inc.php b/install/deb/phpmyadmin/config.inc.php deleted file mode 100644 index ca747a6..0000000 --- a/install/deb/phpmyadmin/config.inc.php +++ /dev/null @@ -1,36 +0,0 @@ - */ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * All directives are explained in documentation in the doc/ folder - * or at . - * - * @package PhpMyAdmin - */ -declare(strict_types=1); - -/** - * This is needed for cookie based authentication to encrypt password in - * cookie. Needs to be 32 chars long. - */ -$cfg["blowfish_secret"] = "%blowfish_secret%"; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */ - -/** - * Directories for saving/loading files from server - */ -$cfg["UploadDir"] = ""; -$cfg["SaveDir"] = ""; - -/** - * You can find more configuration options in the documentation - * in the doc/ folder or at . - */ - -//start with 1 other wise it doesn't work -$i = 1; -foreach (glob("/etc/phpmyadmin/conf.d/*.php") as $filename) { - include $filename; - /*Don't remove / alter code here below this will add SSO support for all servers*/ - //Add Hestia SSO code here - $i++; -} diff --git a/install/deb/phpmyadmin/create_tables.sql b/install/deb/phpmyadmin/create_tables.sql deleted file mode 100644 index f2b28c0..0000000 --- a/install/deb/phpmyadmin/create_tables.sql +++ /dev/null @@ -1,389 +0,0 @@ --- -------------------------------------------------------- --- SQL Commands to set up the pmadb as described in the documentation. --- --- This file is meant for use with MySQL 5 and above! --- --- This script expects the user pma to already be existing. If we would put a --- line here to create him too many users might just use this script and end --- up with having the same password for the controluser. --- --- This user "pma" must be defined in config.inc.php (controluser/controlpass) --- --- Please don't forget to set up the tablenames in config.inc.php --- --- -------------------------------------------------------- --- --- Database : `phpmyadmin` --- -CREATE DATABASE IF NOT EXISTS `phpmyadmin` DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - -USE phpmyadmin; - --- -------------------------------------------------------- --- --- Privileges --- --- (activate this statement if necessary) --- GRANT SELECT, INSERT, DELETE, UPDATE, ALTER ON `phpmyadmin`.* TO --- 'pma'@localhost; --- -------------------------------------------------------- --- --- Table structure for table `pma__usergroups` --- -CREATE TABLE - IF NOT EXISTS `pma__usergroups` ( - `usergroup` varchar(64) NOT NULL, - `tab` varchar(64) NOT NULL, - `allowed` enum ('Y', 'N') NOT NULL DEFAULT 'N', - PRIMARY KEY (`usergroup`, `tab`, `allowed`) - ) COMMENT = 'User groups with configured menu items' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__designer_coords` --- -CREATE TABLE - IF NOT EXISTS `pma__designer_coords` ( - `db_name` varchar(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `table_name` varchar(64) COLLATE utf8_bin NOT NULL DEFAULT '', - `x` int (11) DEFAULT NULL, - `y` int (11) DEFAULT NULL, - `v` tinyint (4) DEFAULT NULL, - `h` tinyint (4) DEFAULT NULL, - PRIMARY KEY (`db_name`, `table_name`) - ) ENGINE = MyISAM DEFAULT CHARSET = utf8 COLLATE = utf8_bin COMMENT = 'Table coordinates for Designer'; - --- -------------------------------------------------------- --- --- Table structure for table `pma__bookmark` --- -CREATE TABLE - IF NOT EXISTS `pma__bookmark` ( - `id` int (11) NOT NULL auto_increment, - `dbase` varchar(255) NOT NULL default '', - `user` varchar(255) NOT NULL default '', - `label` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `query` text NOT NULL, - PRIMARY KEY (`id`) - ) COMMENT = 'Bookmarks' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__column_info` --- -CREATE TABLE - IF NOT EXISTS `pma__column_info` ( - `id` int (5) unsigned NOT NULL auto_increment, - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `column_name` varchar(64) NOT NULL default '', - `comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '', - `transformation` varchar(255) NOT NULL default '', - `transformation_options` varchar(255) NOT NULL default '', - `input_transformation` varchar(255) NOT NULL default '', - `input_transformation_options` varchar(255) NOT NULL default '', - PRIMARY KEY (`id`), - UNIQUE KEY `db_name` (`db_name`, `table_name`, `column_name`) - ) COMMENT = 'Column information for phpMyAdmin' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__history` --- -CREATE TABLE - IF NOT EXISTS `pma__history` ( - `id` bigint (20) unsigned NOT NULL auto_increment, - `username` varchar(64) NOT NULL default '', - `db` varchar(64) NOT NULL default '', - `table` varchar(64) NOT NULL default '', - `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP, - `sqlquery` text NOT NULL, - PRIMARY KEY (`id`), - KEY `username` (`username`, `db`, `table`, `timevalue`) - ) COMMENT = 'SQL history for phpMyAdmin' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__pdf_pages` --- -CREATE TABLE - IF NOT EXISTS `pma__pdf_pages` ( - `db_name` varchar(64) NOT NULL default '', - `page_nr` int (10) unsigned NOT NULL auto_increment, - `page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '', - PRIMARY KEY (`page_nr`), - KEY `db_name` (`db_name`) - ) COMMENT = 'PDF relation pages for phpMyAdmin' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__recent` --- -CREATE TABLE - IF NOT EXISTS `pma__recent` ( - `username` varchar(64) NOT NULL, - `tables` text NOT NULL, - PRIMARY KEY (`username`) - ) COMMENT = 'Recently accessed tables' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__favorite` --- -CREATE TABLE - IF NOT EXISTS `pma__favorite` ( - `username` varchar(64) NOT NULL, - `tables` text NOT NULL, - PRIMARY KEY (`username`) - ) COMMENT = 'Favorite tables' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__table_uiprefs` --- -CREATE TABLE - IF NOT EXISTS `pma__table_uiprefs` ( - `username` varchar(64) NOT NULL, - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `prefs` text NOT NULL, - `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - PRIMARY KEY (`username`, `db_name`, `table_name`) - ) COMMENT = 'Tables'' UI preferences' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__relation` --- -CREATE TABLE - IF NOT EXISTS `pma__relation` ( - `master_db` varchar(64) NOT NULL default '', - `master_table` varchar(64) NOT NULL default '', - `master_field` varchar(64) NOT NULL default '', - `foreign_db` varchar(64) NOT NULL default '', - `foreign_table` varchar(64) NOT NULL default '', - `foreign_field` varchar(64) NOT NULL default '', - PRIMARY KEY (`master_db`, `master_table`, `master_field`), - KEY `foreign_field` (`foreign_db`, `foreign_table`) - ) COMMENT = 'Relation table' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__table_coords` --- -CREATE TABLE - IF NOT EXISTS `pma__table_coords` ( - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `pdf_page_number` int (11) NOT NULL default '0', - `x` float unsigned NOT NULL default '0', - `y` float unsigned NOT NULL default '0', - PRIMARY KEY (`db_name`, `table_name`, `pdf_page_number`) - ) COMMENT = 'Table coordinates for phpMyAdmin PDF output' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__table_info` --- -CREATE TABLE - IF NOT EXISTS `pma__table_info` ( - `db_name` varchar(64) NOT NULL default '', - `table_name` varchar(64) NOT NULL default '', - `display_field` varchar(64) NOT NULL default '', - PRIMARY KEY (`db_name`, `table_name`) - ) COMMENT = 'Table information for phpMyAdmin' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__tracking` --- -CREATE TABLE - IF NOT EXISTS `pma__tracking` ( - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - `version` int (10) unsigned NOT NULL, - `date_created` datetime NOT NULL, - `date_updated` datetime NOT NULL, - `schema_snapshot` text NOT NULL, - `schema_sql` text, - `data_sql` longtext, - `tracking` - set - ( - 'UPDATE', - 'REPLACE', - 'INSERT', - 'DELETE', - 'TRUNCATE', - 'CREATE DATABASE', - 'ALTER DATABASE', - 'DROP DATABASE', - 'CREATE TABLE', - 'ALTER TABLE', - 'RENAME TABLE', - 'DROP TABLE', - 'CREATE INDEX', - 'DROP INDEX', - 'CREATE VIEW', - 'ALTER VIEW', - 'DROP VIEW' - ) default NULL, - `tracking_active` int (1) unsigned NOT NULL default '1', - PRIMARY KEY (`db_name`, `table_name`, `version`) - ) COMMENT = 'Database changes tracking for phpMyAdmin' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__userconfig` --- -CREATE TABLE - IF NOT EXISTS `pma__userconfig` ( - `username` varchar(64) NOT NULL, - `timevalue` timestamp NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - `config_data` text NOT NULL, - PRIMARY KEY (`username`) - ) COMMENT = 'User preferences storage for phpMyAdmin' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__users` --- -CREATE TABLE - IF NOT EXISTS `pma__users` ( - `username` varchar(64) NOT NULL, - `usergroup` varchar(64) NOT NULL, - PRIMARY KEY (`username`, `usergroup`) - ) COMMENT = 'Users and their assignments to user groups' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__usergroups` --- -CREATE TABLE - IF NOT EXISTS `pma__usergroups` ( - `usergroup` varchar(64) NOT NULL, - `tab` varchar(64) NOT NULL, - `allowed` enum ('Y', 'N') NOT NULL DEFAULT 'N', - PRIMARY KEY (`usergroup`, `tab`, `allowed`) - ) COMMENT = 'User groups with configured menu items' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__navigationhiding` --- -CREATE TABLE - IF NOT EXISTS `pma__navigationhiding` ( - `username` varchar(64) NOT NULL, - `item_name` varchar(64) NOT NULL, - `item_type` varchar(64) NOT NULL, - `db_name` varchar(64) NOT NULL, - `table_name` varchar(64) NOT NULL, - PRIMARY KEY ( - `username`, - `item_name`, - `item_type`, - `db_name`, - `table_name` - ) - ) COMMENT = 'Hidden items of navigation tree' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__savedsearches` --- -CREATE TABLE - IF NOT EXISTS `pma__savedsearches` ( - `id` int (5) unsigned NOT NULL auto_increment, - `username` varchar(64) NOT NULL default '', - `db_name` varchar(64) NOT NULL default '', - `search_name` varchar(64) NOT NULL default '', - `search_data` text NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `u_savedsearches_username_dbname` (`username`, `db_name`, `search_name`) - ) COMMENT = 'Saved searches' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__central_columns` --- -CREATE TABLE - IF NOT EXISTS `pma__central_columns` ( - `db_name` varchar(64) NOT NULL, - `col_name` varchar(64) NOT NULL, - `col_type` varchar(64) NOT NULL, - `col_length` text, - `col_collation` varchar(64) NOT NULL, - `col_isNull` boolean NOT NULL, - `col_extra` varchar(255) default '', - `col_default` text, - PRIMARY KEY (`db_name`, `col_name`) - ) COMMENT = 'Central list of columns' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__designer_settings` --- -CREATE TABLE - IF NOT EXISTS `pma__designer_settings` ( - `username` varchar(64) NOT NULL, - `settings_data` text NOT NULL, - PRIMARY KEY (`username`) - ) COMMENT = 'Settings related to Designer' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; - --- -------------------------------------------------------- --- --- Table structure for table `pma__export_templates` --- -CREATE TABLE - IF NOT EXISTS `pma__export_templates` ( - `id` int (5) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(64) NOT NULL, - `export_type` varchar(10) NOT NULL, - `template_name` varchar(64) NOT NULL, - `template_data` text NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `u_user_type_template` (`username`, `export_type`, `template_name`) - ) COMMENT = 'Saved export templates' DEFAULT CHARACTER -SET - utf8 COLLATE utf8_bin; diff --git a/install/deb/phpmyadmin/hestia-sso.php b/install/deb/phpmyadmin/hestia-sso.php deleted file mode 100644 index 8701844..0000000 --- a/install/deb/phpmyadmin/hestia-sso.php +++ /dev/null @@ -1,213 +0,0 @@ -hostname = "https://" . API_HOST_NAME . ":" . API_HESTIA_PORT . "/api/"; - $this->key = API_KEY; - $this->pma_key = PHPMYADMIN_KEY; - } - - /* Creates curl request */ - public function request($postvars) { - $postdata = http_build_query($postvars); - $curl = curl_init(); - curl_setopt($curl, CURLOPT_URL, $this->hostname); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); - curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); - curl_setopt($curl, CURLOPT_POST, true); - curl_setopt($curl, CURLOPT_POSTFIELDS, $postdata); - $answer = curl_exec($curl); - return $answer; - } - - /* Creates an new temp user in mysql */ - public function create_temp_user($database, $user, $host) { - $post_request = [ - "hash" => $this->key, - "returncode" => "no", - "cmd" => "v-add-database-temp-user", - "arg1" => $user, - "arg2" => $database, - "arg3" => "mysql", - "arg4" => $host, - ]; - $request = $this->request($post_request); - $json = json_decode($request); - if (json_last_error() == JSON_ERROR_NONE) { - return $json; - } else { - trigger_error("Unable to connect over API please check api connection", E_USER_WARNING); - return false; - } - } - - /* Delete an new temp user in mysql */ - public function delete_temp_user($database, $user, $dbuser, $host) { - $post_request = [ - "hash" => $this->key, - "returncode" => "yes", - "cmd" => "v-delete-database-temp-user", - "arg1" => $user, - "arg2" => $database, - "arg3" => $dbuser, - "arg4" => "mysql", - "arg5" => $host, - ]; - $request = $this->request($post_request); - if (is_numeric($request) && $request == 0) { - return true; - } else { - return false; - } - } - - public function get_user_ip() { - // Saving user IPs to the session for preventing session hijacking - $user_combined_ip = []; - if ($_SERVER["REMOTE_ADDR"] != $_SERVER["SERVER_ADDR"]) { - $user_combined_ip[] = $_SERVER["REMOTE_ADDR"]; - } - if (isset($_SERVER["HTTP_CLIENT_IP"])) { - $user_combined_ip .= "|" . $_SERVER["HTTP_CLIENT_IP"]; - } - if (isset($_SERVER["HTTP_X_FORWARDED_FOR"])) { - if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_X_FORWARDED_FOR"]) { - $user_combined_ip[] = $_SERVER["HTTP_X_FORWARDED_FOR"]; - } - } - if (isset($_SERVER["HTTP_FORWARDED_FOR"])) { - if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_FORWARDED_FOR"]) { - $user_combined_ip[] = $_SERVER["HTTP_FORWARDED_FOR"]; - } - } - if (isset($_SERVER["HTTP_X_FORWARDED"])) { - if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_X_FORWARDED"]) { - $user_combined_ip[] = $_SERVER["HTTP_X_FORWARDED"]; - } - } - if (isset($_SERVER["HTTP_FORWARDED"])) { - if ($_SERVER["REMOTE_ADDR"] != $_SERVER["HTTP_FORWARDED"]) { - $user_combined_ip[] = "|" . $_SERVER["HTTP_FORWARDED"]; - } - } - if (isset($_SERVER["HTTP_CF_CONNECTING_IP"])) { - if (!empty($_SERVER["HTTP_CF_CONNECTING_IP"])) { - $user_combined_ip[] = $_SERVER["HTTP_CF_CONNECTING_IP"]; - } - } - return implode("|", $user_combined_ip); - } -} - -function verify_token($database, $user, $ip, $time, $token) { - if (!password_verify($database . $user . $ip . $time . PHPMYADMIN_KEY, $token)) { - if ( - !password_verify( - $database . $user . $_SERVER["SERVER_ADDR"] . "|" . $ip . $time . PHPMYADMIN_KEY, - $token, - ) - ) { - trigger_error( - "Access denied: There is a security token mismatch " . $time, - E_USER_WARNING, - ); - session_invalid(); - } - } - return; -} -/* Need to have cookie visible from parent directory */ -session_set_cookie_params(0, "/", "", true, true); -/* Create signon session */ -$session_name = "SignonSession"; -session_name($session_name); -@session_start(); - -function session_invalid() { - global $session_name; - //delete all current sessions - session_destroy(); - setcookie($session_name, null, -1, "/"); - header("Location: " . dirname($_SERVER["PHP_SELF"]) . "/index.php"); - die(); -} - -$api = new Hestia_API(); -if (!empty($_GET)) { - if (isset($_GET["logout"])) { - $api->delete_temp_user( - $_SESSION["HESTIA_sso_database"], - $_SESSION["HESTIA_sso_user"], - $_SESSION["PMA_single_signon_user"], - $_SESSION["HESTIA_sso_host"], - ); - //remove session - session_invalid(); - } else { - if (isset($_GET["user"]) && isset($_GET["hestia_token"])) { - $database = $_GET["database"]; - $user = $_GET["user"]; - $host = "localhost"; - $token = $_GET["hestia_token"]; - if (is_numeric($_GET["exp"])) { - $time = $_GET["exp"]; - } else { - $time = 0; - } - - if ($time + 60 > time()) { - //note: Possible issues with cloudflare due to ip obfuscation - $ip = $api->get_user_ip(); - verify_token($database, $user, $ip, $time, $token); - $id = session_id(); - //create a new temp user - $data = $api->create_temp_user($database, $user, $host); - if ($data) { - $_SESSION["PMA_single_signon_user"] = $data->login->user; - $_SESSION["PMA_single_signon_password"] = $data->login->password; - $_SESSION["PMA_single_signon_host"] = $host; - //save database / username to be used for sending logout notification. - $_SESSION["HESTIA_sso_user"] = $user; - $_SESSION["HESTIA_sso_database"] = $database; - $_SESSION["HESTIA_sso_host"] = $host; - - @session_write_close(); - setcookie($session_name, $id, 0, "/"); - header("Location: " . dirname($_SERVER["PHP_SELF"]) . "/index.php"); - die(); - } else { - session_invalid(); - } - } else { - trigger_error( - "Link has been expired: System time: " . - time() . - " / Time provided in link: " . - $time, - E_USER_WARNING, - ); - session_invalid(); - } - } - } -} else { - session_invalid(); -} diff --git a/install/deb/phpmyadmin/pma.sh b/install/deb/phpmyadmin/pma.sh deleted file mode 100644 index 1c4252d..0000000 --- a/install/deb/phpmyadmin/pma.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash -# -# phpmyadmin-fixer -# -# Fixes for phpmyadmin (configuration storage and some extended features) -# -# Original Version by Pavel Galkin (https://skurudo.ru) -# https://github.com/skurudo/phpmyadmin-fixer -# -# Changed some lines to fit to Hestia Configuration. -# - -PASS=$(gen_pass) - -#ubuntu phpmyadmin path -pmapath="/etc/phpmyadmin/conf.d/01-localhost.php" -echo "> $pmapath -echo "\$cfg['Servers'][\$i]['host'] = 'localhost';" >> $pmapath -echo "\$cfg['Servers'][\$i]['port'] = '3306';" >> $pmapath -echo "\$cfg['Servers'][\$i]['favorite'] = 'pma__favorite';" >> $pmapath -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath -echo "\$cfg['Servers'][\$i]['central_columns'] = 'pma__central_columns';" >> $pmapath -echo "\$cfg['Servers'][\$i]['designer_settings'] = 'pma__designer_settings';" >> $pmapath -echo "\$cfg['Servers'][\$i]['export_templates'] = 'pma__export_templates';" >> $pmapath -echo "\$cfg['Servers'][\$i]['savedsearches'] = 'pma__savedsearches';" >> $pmapath -echo "\$cfg['Servers'][\$i]['navigationhiding'] = 'pma__navigationhiding';" >> $pmapath -echo "\$cfg['Servers'][\$i]['users'] = 'pma__users';" >> $pmapath -echo "\$cfg['Servers'][\$i]['usergroups'] = 'pma__usergroups';" >> $pmapath -echo "\$cfg['Servers'][\$i]['pmadb'] = 'phpmyadmin';" >> $pmapath -echo "\$cfg['Servers'][\$i]['controluser'] = 'pma';" >> $pmapath -echo "\$cfg['Servers'][\$i]['controlpass'] = '$PASS';" >> $pmapath -echo "\$cfg['Servers'][\$i]['bookmarktable'] = 'pma__bookmark';" >> $pmapath -echo "\$cfg['Servers'][\$i]['relation'] = 'pma__relation';" >> $pmapath -echo "\$cfg['Servers'][\$i]['userconfig'] = 'pma__userconfig';" >> $pmapath -echo "\$cfg['Servers'][\$i]['table_info'] = 'pma__table_info';" >> $pmapath -echo "\$cfg['Servers'][\$i]['column_info'] = 'pma__column_info';" >> $pmapath -echo "\$cfg['Servers'][\$i]['history'] = 'pma__history';" >> $pmapath -echo "\$cfg['Servers'][\$i]['recent'] = 'pma__recent';" >> $pmapath -echo "\$cfg['Servers'][\$i]['table_uiprefs'] = 'pma__table_uiprefs';" >> $pmapath -echo "\$cfg['Servers'][\$i]['tracking'] = 'pma__tracking';" >> $pmapath -echo "\$cfg['Servers'][\$i]['table_coords'] = 'pma__table_coords';" >> $pmapath -echo "\$cfg['Servers'][\$i]['pdf_pages'] = 'pma__pdf_pages';" >> $pmapath -echo "\$cfg['Servers'][\$i]['designer_coords'] = 'pma__designer_coords';" >> $pmapath -echo "\$cfg['Servers'][\$i]['hide_db'] = 'information_schema';" >> $pmapath - -#SOME WORK with DATABASE (table / user) -PMADB=phpmyadmin -PMAUSER=pma - -#DROP USER and TABLE -#mysql -uroot < $mysql_out -mysql_ver=$(cat $mysql_out | tail -n1 | cut -f 1 -d -) -mysql_ver_sub=$(echo $mysql_ver | cut -d '.' -f1) -mysql_ver_sub_sub=$(echo $mysql_ver | cut -d '.' -f2) - -if [ "$mysql" = "mysql" ] && [ "$mysql_ver_sub" -ge 8 ]; then - query="CREATE USER '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';" - $mysql_server -uroot -e "$query" > /dev/null - - query="CREATE DATABASE $PMADB;" - $mysql_server -uroot -e "$query" > /dev/null - - query="GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost';" - $mysql_server -uroot -e "$query" > /dev/null - - query="GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';" - $mysql_server -uroot -e "$query" > /dev/null - - query="FLUSH PRIVILEGES;" - $mysql_server -uroot -e "$query" > /dev/null - -else - query="CREATE USER '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';" - $mysql_server -uroot -e "$query" > /dev/null - - query="CREATE DATABASE $PMADB;" - $mysql_server -uroot -e "$query" > /dev/null - - query="GRANT USAGE ON $PMADB.* TO '$PMAUSER'@'localhost' IDENTIFIED BY '$PASS';" - $mysql_server -uroot -e "$query" > /dev/null - - query="GRANT ALL PRIVILEGES ON $PMADB.* TO '$PMAUSER'@'localhost';" - $mysql_server -uroot -e "$query" > /dev/null - - query="FLUSH PRIVILEGES;" - $mysql_server -uroot -e "$query" > /dev/null -fi - -#MYSQL DB and TABLES ADDITION -$mysql_server -uroot < "$HESTIA_INSTALL_DIR/phpmyadmin/create_tables.sql" diff --git a/install/deb/pma/apache.conf b/install/deb/pma/apache.conf deleted file mode 100644 index 9ba5875..0000000 --- a/install/deb/pma/apache.conf +++ /dev/null @@ -1,40 +0,0 @@ -# phpMyAdmin default Apache configuration - -Alias /%pma_alias% /usr/share/phpmyadmin - - - Options FollowSymLinks - DirectoryIndex index.php - - # Use www.conf instead - - SetHandler "proxy:fcgi://127.0.0.1:9000" - - - - -# Disallow web access to directories that don't need it - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - - - Order Deny,Allow - Deny from All - diff --git a/install/deb/postgresql/pg_hba.conf b/install/deb/postgresql/pg_hba.conf deleted file mode 100644 index 1ba4394..0000000 --- a/install/deb/postgresql/pg_hba.conf +++ /dev/null @@ -1,11 +0,0 @@ -# "local" is for Unix domain socket connections only -local all all ident - -# IPv4 local connections: -host all all 127.0.0.1/32 md5 - -# IPv6 local connections: -host all all ::1/128 md5 - -# Others -host all all 0.0.0.0/0 md5 diff --git a/install/deb/proftpd/proftpd.conf b/install/deb/proftpd/proftpd.conf deleted file mode 100644 index 6158acd..0000000 --- a/install/deb/proftpd/proftpd.conf +++ /dev/null @@ -1,33 +0,0 @@ -ServerName "FTP" -ServerIdent on "FTP Server ready." -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 - - -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 - AllowOverwrite yes - - AllowAll - - diff --git a/install/deb/proftpd/tls.conf b/install/deb/proftpd/tls.conf deleted file mode 100644 index e1cc2b7..0000000 --- a/install/deb/proftpd/tls.conf +++ /dev/null @@ -1,65 +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 -TLSCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256 -TLSProtocol TLSv1.2 TLSv1.3 -TLSServerCipherPreference on -# -# 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/hestia/ssl/certificate.crt -TLSRSACertificateKeyFile /usr/local/hestia/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/deb/ssl/dhparam.pem b/install/deb/ssl/dhparam.pem deleted file mode 100644 index 58332c0..0000000 --- a/install/deb/ssl/dhparam.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN DH PARAMETERS----- -MIICCAKCAgEA7N3ZOcXgACR0Rat9G/7h8krD7ysVvmEmvAdg8o5l7eKVdtp/QSNK -anF0JyInJMBEgq05GY7YwvFovglJL73T/eEjTK3qPU6eHzxNGKfR0pM6rnAb+EXL -dSNJm3Xz9wH4IKn6OJ3nD9aLmBVI5FlIMV1R4QKX3sIWUxRqRSQIzjNQTnY1e/Pk -BT/ZrUUF7fPPVbg0nPD8Y48ISr7pB6M14Kr66cggGIqUVdBdkPYyt4RpFWR1n3Tv -rz1j0U+UoVnan2FgGsSiSFT9I/CiIxgC/SrdwxZLUgbAiKsnw9H7nGW92C4cRqY0 -2eKMVNEBk32GSPQXaA+Q5TILyzxuwDbXMxHMxnUVKQGFEcXjWXXyiv7tLAeu68Do -j5iNFOHbDp17SftnxYHi2vTsYk+9K6Pzc+NmUgibM52Rs92PPYd++HcgMeGrYcqi -temHP2jPtAymixch0wdqBMgeGTb29w51LR0BAU6D6BeR25pkZvPUag3bb6SU1Oli -E15DDWh3UnmfTw2M9W1uxlzQAlXOLL6/ZWuvwyqhCY6X7tIONtSgdYGjtiTFaPJp -ZBdOOrblodLxSu0ObR59SFjv8Pz3sTw4xiRFTG3lFtuIVHdBUbtJHR+2p4fHy/JG -Ccs+Z1KrmJfEzSMzKwfvZYJ526demNulglFBbcQV06ehqjc6MCG3HnMCAQI= ------END DH PARAMETERS----- diff --git a/install/deb/sudo/admin b/install/deb/sudo/admin deleted file mode 100644 index d002805..0000000 --- a/install/deb/sudo/admin +++ /dev/null @@ -1,10 +0,0 @@ -# Created by hestia installer -Defaults env_keep="VESTA" -Defaults env_keep+="HESTIA" -Defaults:admin !syslog -Defaults:admin !requiretty -Defaults:root !requiretty - -# sudo is limited to hestia scripts -admin ALL=NOPASSWD:/usr/local/vesta/bin/* -admin ALL=NOPASSWD:/usr/local/hestia/bin/* diff --git a/install/deb/templates/mail/apache2/rainloop.tpl b/install/deb/templates/mail/apache2/rainloop.tpl deleted file mode 100644 index 83afa1f..0000000 --- a/install/deb/templates/mail/apache2/rainloop.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - ServerName %domain_idn% - ServerAlias %alias_idn% - Alias / /var/lib/rainloop/ - Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ - #SuexecUserGroup %user% %group% - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf* - - - Options +FollowSymLinks - # This is needed to parse /var/lib/rainloop/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - - # Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_* - \ No newline at end of file diff --git a/install/deb/templates/mail/nginx/default.stpl b/install/deb/templates/mail/nginx/default.stpl deleted file mode 100644 index c86fb59..0000000 --- a/install/deb/templates/mail/nginx/default.stpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root /var/lib/roundcube; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - alias /var/lib/roundcube/; - - try_files $uri $uri/ =404; - - proxy_pass https://%ip%:%web_ssl_port%; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /error/ { - alias /var/www/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*; -} diff --git a/install/deb/templates/mail/nginx/default.tpl b/install/deb/templates/mail/nginx/default.tpl deleted file mode 100644 index 91a456f..0000000 --- a/install/deb/templates/mail/nginx/default.tpl +++ /dev/null @@ -1,43 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - root /var/lib/roundcube; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - alias /var/lib/roundcube/; - - try_files $uri $uri/ =404; - - proxy_pass http://%ip%:%web_port%; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location /error/ { - alias /var/www/document_errors/; - } - - include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*; -} diff --git a/install/deb/templates/mail/nginx/default_disabled.stpl b/install/deb/templates/mail/nginx/default_disabled.stpl deleted file mode 100644 index 3ff2253..0000000 --- a/install/deb/templates/mail/nginx/default_disabled.stpl +++ /dev/null @@ -1,29 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - proxy_pass http://%ip%:%web_port%; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*; -} diff --git a/install/deb/templates/mail/nginx/default_disabled.tpl b/install/deb/templates/mail/nginx/default_disabled.tpl deleted file mode 100644 index 89b2bd3..0000000 --- a/install/deb/templates/mail/nginx/default_disabled.tpl +++ /dev/null @@ -1,20 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - proxy_pass http://%ip%:%web_port%; - } - - include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*; -} diff --git a/install/deb/templates/mail/nginx/default_snappymail.stpl b/install/deb/templates/mail/nginx/default_snappymail.stpl deleted file mode 100644 index 5e1062c..0000000 --- a/install/deb/templates/mail/nginx/default_snappymail.stpl +++ /dev/null @@ -1,52 +0,0 @@ -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root /var/lib/snappymail; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - location ^~ /data { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - alias /var/lib/snappymail/; - - try_files $uri $uri/ =404; - - proxy_pass https://%ip%:%web_ssl_port%; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /error/ { - alias /var/www/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.ssl.conf_*; -} diff --git a/install/deb/templates/mail/nginx/default_snappymail.tpl b/install/deb/templates/mail/nginx/default_snappymail.tpl deleted file mode 100644 index 87a9ff1..0000000 --- a/install/deb/templates/mail/nginx/default_snappymail.tpl +++ /dev/null @@ -1,48 +0,0 @@ -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - root /var/lib/snappymail; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ^~ /data { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - alias /var/lib/snappymail/; - - try_files $uri $uri/ =404; - - proxy_pass http://%ip%:%web_port%; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location /error/ { - alias /var/www/document_errors/; - } - - include %home%/%user%/conf/mail/%root_domain%/%proxy_system%.conf_*; -} diff --git a/install/deb/templates/mail/nginx/disabled.stpl b/install/deb/templates/mail/nginx/disabled.stpl deleted file mode 100644 index 8458ebe..0000000 --- a/install/deb/templates/mail/nginx/disabled.stpl +++ /dev/null @@ -1,34 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root /var/www/html; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ =404; - } - - location /error/ { - alias /var/www/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*; -} diff --git a/install/deb/templates/mail/nginx/disabled.tpl b/install/deb/templates/mail/nginx/disabled.tpl deleted file mode 100644 index c094b88..0000000 --- a/install/deb/templates/mail/nginx/disabled.tpl +++ /dev/null @@ -1,25 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root /var/www/html; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ =404; - } - - location /error/ { - alias /var/www/document_errors/; - } - - include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*; -} diff --git a/install/deb/templates/mail/nginx/snappymail.stpl b/install/deb/templates/mail/nginx/snappymail.stpl deleted file mode 100644 index 769f873..0000000 --- a/install/deb/templates/mail/nginx/snappymail.stpl +++ /dev/null @@ -1,59 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root /var/lib/snappymail; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ^~ /data { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ =404; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ ^/(.*\.php)$ { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_pass 127.0.0.1:9000; - } - } - - location /error/ { - alias /var/www/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*; -} diff --git a/install/deb/templates/mail/nginx/snappymail.tpl b/install/deb/templates/mail/nginx/snappymail.tpl deleted file mode 100644 index 293ed50..0000000 --- a/install/deb/templates/mail/nginx/snappymail.tpl +++ /dev/null @@ -1,49 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root /var/lib/snappymail; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ^~ /data { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ =404; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ ^/(.*\.php)$ { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_pass 127.0.0.1:9000; - } - } - - location /error/ { - alias /var/www/document_errors/; - } - - include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*; -} diff --git a/install/deb/templates/mail/nginx/web_system.stpl b/install/deb/templates/mail/nginx/web_system.stpl deleted file mode 100644 index e31ff6e..0000000 --- a/install/deb/templates/mail/nginx/web_system.stpl +++ /dev/null @@ -1,54 +0,0 @@ -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root /var/lib/roundcube; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ =404; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ ^/(.*\.php)$ { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_pass 127.0.0.1:9000; - } - } - - location /error/ { - alias /var/www/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_*; -} diff --git a/install/deb/templates/mail/nginx/web_system.tpl b/install/deb/templates/mail/nginx/web_system.tpl deleted file mode 100644 index 7bdaa9f..0000000 --- a/install/deb/templates/mail/nginx/web_system.tpl +++ /dev/null @@ -1,44 +0,0 @@ -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root /var/lib/roundcube; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/mail/%root_domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~ ^/(README.md|config|temp|logs|bin|SQL|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ =404; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 7d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ ^/(.*\.php)$ { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $request_filename; - - fastcgi_pass 127.0.0.1:9000; - } - } - - location /error/ { - alias /var/www/document_errors/; - } - - include %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_*; -} diff --git a/install/deb/templates/web/apache2/default.stpl b/install/deb/templates/web/apache2/default.stpl deleted file mode 100644 index 213de85..0000000 --- a/install/deb/templates/web/apache2/default.stpl +++ /dev/null @@ -1,49 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - php_admin_value sys_temp_dir %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/%domain%/%web_system%.ssl.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/default.tpl b/install/deb/templates/web/apache2/default.tpl deleted file mode 100644 index 2851acb..0000000 --- a/install/deb/templates/web/apache2/default.tpl +++ /dev/null @@ -1,46 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - - IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf* - - - 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 sys_temp_dir %home%/%user%/tmp - - - AllowOverride All - - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/hosting.stpl b/install/deb/templates/web/apache2/hosting.stpl deleted file mode 100644 index 09d9e31..0000000 --- a/install/deb/templates/web/apache2/hosting.stpl +++ /dev/null @@ -1,55 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - php_admin_value sys_temp_dir %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/%domain%/%web_system%.ssl.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc* - diff --git a/install/deb/templates/web/apache2/hosting.tpl b/install/deb/templates/web/apache2/hosting.tpl deleted file mode 100644 index 502de39..0000000 --- a/install/deb/templates/web/apache2/hosting.tpl +++ /dev/null @@ -1,52 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - - IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf* - - - 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 - php_admin_value sys_temp_dir %home%/%user%/tmp - - - AllowOverride All - - - RMode config - RUidGid %user% %group% - RGroups www-data - - - AssignUserID %user% %group% - - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/php-fpm/default.stpl b/install/deb/templates/web/apache2/php-fpm/default.stpl deleted file mode 100644 index ca7a019..0000000 --- a/install/deb/templates/web/apache2/php-fpm/default.stpl +++ /dev/null @@ -1,41 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 +ExecCGI - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - - SetHandler "proxy:%backend_lsnr%|fcgi://localhost" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/php-fpm/default.tpl b/install/deb/templates/web/apache2/php-fpm/default.tpl deleted file mode 100644 index 0cc22c6..0000000 --- a/install/deb/templates/web/apache2/php-fpm/default.tpl +++ /dev/null @@ -1,38 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - - IncludeOptional %home%/%user%/conf/web/%domain%/apache2.forcessl.conf* - - - AllowOverride All - - - AllowOverride All - Options +Includes -Indexes +ExecCGI - - - - SetHandler "proxy:%backend_lsnr%|fcgi://localhost" - - SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0 - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/phpcgi.sh b/install/deb/templates/web/apache2/phpcgi.sh deleted file mode 100755 index 6565e10..0000000 --- a/install/deb/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/deb/templates/web/apache2/phpcgi.stpl b/install/deb/templates/web/apache2/phpcgi.stpl deleted file mode 100644 index f0b4bf7..0000000 --- a/install/deb/templates/web/apache2/phpcgi.stpl +++ /dev/null @@ -1,44 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - php_admin_value sys_temp_dir %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/%domain%/%web_system%.ssl.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/phpcgi.tpl b/install/deb/templates/web/apache2/phpcgi.tpl deleted file mode 100644 index 2a1b06d..0000000 --- a/install/deb/templates/web/apache2/phpcgi.tpl +++ /dev/null @@ -1,40 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - - IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf* - - - 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 sys_temp_dir %home%/%user%/tmp - Action phpcgi-script /cgi-bin/php - - SetHandler phpcgi-script - - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/phpfcgid.sh b/install/deb/templates/web/apache2/phpfcgid.sh deleted file mode 100755 index e805824..0000000 --- a/install/deb/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/deb/templates/web/apache2/phpfcgid.stpl b/install/deb/templates/web/apache2/phpfcgid.stpl deleted file mode 100644 index d19a7bb..0000000 --- a/install/deb/templates/web/apache2/phpfcgid.stpl +++ /dev/null @@ -1,45 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - php_admin_value sys_temp_dir %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/%domain%/%web_system%.ssl.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/phpfcgid.tpl b/install/deb/templates/web/apache2/phpfcgid.tpl deleted file mode 100644 index 6923210..0000000 --- a/install/deb/templates/web/apache2/phpfcgid.tpl +++ /dev/null @@ -1,40 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - - - - 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 - - IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf* - - - 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 sys_temp_dir %home%/%user%/tmp - - SetHandler fcgid-script - - FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php - - - AllowOverride All - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/www-data.stpl b/install/deb/templates/web/apache2/www-data.stpl deleted file mode 100644 index a5800d9..0000000 --- a/install/deb/templates/web/apache2/www-data.stpl +++ /dev/null @@ -1,41 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -# PHPMyAdmin and phppgadmin require access as www-data instead of user for security reasons - - - 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 - php_admin_value sys_temp_dir %home%/%user%/tmp - - - AllowOverride All - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %ssl_crt% - SSLCertificateKeyFile %ssl_key% - %ssl_ca_str%SSLCertificateChainFile %ssl_ca% - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/apache2/www-data.tpl b/install/deb/templates/web/apache2/www-data.tpl deleted file mode 100644 index 3950899..0000000 --- a/install/deb/templates/web/apache2/www-data.tpl +++ /dev/null @@ -1,38 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -# phpMyAdmin and phpPgAdmin require access as www-data instead of user for security reasons - - - 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 - - IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf* - - - 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 sys_temp_dir %home%/%user%/tmp - - - AllowOverride All - - - IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_* - IncludeOptional /etc/apache2/conf.d/*.inc - diff --git a/install/deb/templates/web/awstats/awstats.tpl b/install/deb/templates/web/awstats/awstats.tpl deleted file mode 100755 index 6bb51c5..0000000 --- a/install/deb/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/deb/templates/web/awstats/index.tpl b/install/deb/templates/web/awstats/index.tpl deleted file mode 100755 index e3a308e..0000000 --- a/install/deb/templates/web/awstats/index.tpl +++ /dev/null @@ -1,10 +0,0 @@ - - - - Awstats log analyzer - - - - - - diff --git a/install/deb/templates/web/awstats/nav.tpl b/install/deb/templates/web/awstats/nav.tpl deleted file mode 100755 index 205a812..0000000 --- a/install/deb/templates/web/awstats/nav.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - Awstats navigation - - - - - - - - -
- -
-
- - diff --git a/install/deb/templates/web/nginx/caching.sh b/install/deb/templates/web/nginx/caching.sh deleted file mode 100755 index b3c9077..0000000 --- a/install/deb/templates/web/nginx/caching.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -user="$1" -domain="$2" -ip="$3" -home="$4" -docroot="$5" - -str="proxy_cache_path /var/cache/nginx/$domain levels=1:2 use_temp_path=off keys_zone=$domain:10m inactive=60m max_size=256m;" -conf="/etc/nginx/conf.d/01_caching_pool.conf" - -if grep -q "=${domain}:" "$conf" 2> /dev/null; then - sed -i "/=${domain}:/d" "$conf" -fi - -echo "$str" >> $conf diff --git a/install/deb/templates/web/nginx/caching.stpl b/install/deb/templates/web/nginx/caching.stpl deleted file mode 100755 index b66b6d0..0000000 --- a/install/deb/templates/web/nginx/caching.stpl +++ /dev/null @@ -1,76 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - proxy_cache %domain%; - proxy_cache_valid 200 5m; - proxy_cache_valid 301 302 10m; - proxy_cache_valid 404 10m; - proxy_cache_bypass $no_cache $cookie_session $http_x_update; - proxy_no_cache $no_cache; - - set $no_cache 0; - - if ($request_uri ~* "/wp-admin/|/wp-json/|wp-.*.php|xmlrpc.php|/store.*|/cart.*|/my-account.*|/checkout.*|/user/|/admin/|/administrator/|/manager/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart|woocommerce_cart_hash|PHPSESSID") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - - location ~* ^.+\.(%proxy_extensions%)$ { - try_files $uri @fallback; - - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - - expires max; - - proxy_cache off; - } - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/caching.tpl b/install/deb/templates/web/nginx/caching.tpl deleted file mode 100755 index be5db54..0000000 --- a/install/deb/templates/web/nginx/caching.tpl +++ /dev/null @@ -1,65 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - location / { - proxy_pass http://%ip%:%web_port%; - - proxy_cache %domain%; - proxy_cache_valid 200 5m; - proxy_cache_valid 301 302 10m; - proxy_cache_valid 404 10m; - proxy_cache_bypass $no_cache $cookie_session $http_x_update; - proxy_no_cache $no_cache; - - set $no_cache 0; - - if ($request_uri ~* "/wp-admin/|/wp-json/|wp-.*.php|xmlrpc.php|/store.*|/cart.*|/my-account.*|/checkout.*|/user/|/admin/|/administrator/|/manager/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~* "comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_no_cache|wordpress_logged_in|woocommerce_items_in_cart|woocommerce_cart_hash|PHPSESSID") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - - location ~* ^.+\.(%proxy_extensions%)$ { - try_files $uri @fallback; - - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - - expires max; - - proxy_cache off; - } - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - include %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/default.stpl b/install/deb/templates/web/nginx/default.stpl deleted file mode 100755 index 13f652c..0000000 --- a/install/deb/templates/web/nginx/default.stpl +++ /dev/null @@ -1,53 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - location ~* ^.+\.(%proxy_extensions%)$ { - try_files $uri @fallback; - - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - - expires max; - } - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/default.tpl b/install/deb/templates/web/nginx/default.tpl deleted file mode 100755 index 2f310fd..0000000 --- a/install/deb/templates/web/nginx/default.tpl +++ /dev/null @@ -1,42 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - location / { - proxy_pass http://%ip%:%web_port%; - - location ~* ^.+\.(%proxy_extensions%)$ { - try_files $uri @fallback; - - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - - expires max; - } - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - include %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/hosting.sh b/install/deb/templates/web/nginx/hosting.sh deleted file mode 100755 index f27f63a..0000000 --- a/install/deb/templates/web/nginx/hosting.sh +++ /dev/null @@ -1,12 +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/deb/templates/web/nginx/hosting.stpl b/install/deb/templates/web/nginx/hosting.stpl deleted file mode 100755 index 6591c47..0000000 --- a/install/deb/templates/web/nginx/hosting.stpl +++ /dev/null @@ -1,55 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%proxy_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - ssl_certificate %ssl_pem%; - ssl_certificate_key %ssl_key%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - location / { - proxy_pass https://%ip%:%web_ssl_port%; - - location ~* ^.+\.(%proxy_extensions%)$ { - try_files $uri @fallback; - - root %sdocroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - - expires max; - } - } - - location @fallback { - proxy_pass https://%ip%:%web_ssl_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - disable_symlinks if_not_owner from=%sdocroot%; - - proxy_hide_header Upgrade; - - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/hosting.tpl b/install/deb/templates/web/nginx/hosting.tpl deleted file mode 100755 index ebebf68..0000000 --- a/install/deb/templates/web/nginx/hosting.tpl +++ /dev/null @@ -1,44 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%proxy_port%; - server_name %domain_idn% %alias_idn%; - error_log /var/log/%web_system%/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - location / { - proxy_pass http://%ip%:%web_port%; - - location ~* ^.+\.(%proxy_extensions%)$ { - try_files $uri @fallback; - - root %docroot%; - access_log /var/log/%web_system%/domains/%domain%.log combined; - access_log /var/log/%web_system%/domains/%domain%.bytes bytes; - - expires max; - } - } - - location @fallback { - proxy_pass http://%ip%:%web_port%; - } - - location /error/ { - alias %home%/%user%/web/%domain%/document_errors/; - } - - disable_symlinks if_not_owner from=%docroot%; - - include %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/chevereto.stpl b/install/deb/templates/web/nginx/php-fpm/chevereto.stpl deleted file mode 100644 index 79f2116..0000000 --- a/install/deb/templates/web/nginx/php-fpm/chevereto.stpl +++ /dev/null @@ -1,99 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - client_max_body_size 1G; - client_body_buffer_size 1024k; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~* /(app|content|lib)/.*\.(po|php|lock|sql)$ { - deny all; - } - - location ~* /.*\.(ttf|ttc|otf|eot|woff|woff2|font.css|css|js) { - add_header Access-Control-Allow-Origin "*"; - } - - location ^~ /images/ { - location ~* (jpe?g|png|webp|gif) { - log_not_found off; - error_page 404 /content/images/system/default/404.gif; - } - return 403; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/chevereto.tpl b/install/deb/templates/web/nginx/php-fpm/chevereto.tpl deleted file mode 100644 index 3448c92..0000000 --- a/install/deb/templates/web/nginx/php-fpm/chevereto.tpl +++ /dev/null @@ -1,87 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - client_max_body_size 1G; - client_body_buffer_size 1024k; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~* /(app|content|lib)/.*\.(po|php|lock|sql)$ { - deny all; - } - - location ~* /.*\.(ttf|ttc|otf|eot|woff|woff2|font.css|css|js) { - add_header Access-Control-Allow-Origin "*"; - } - - location ^~ /images/ { - location ~* (jpe?g|png|webp|gif) { - log_not_found off; - error_page 404 /content/images/system/default/404.gif; - } - return 403; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl b/install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl deleted file mode 100644 index 49ff802..0000000 --- a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.stpl +++ /dev/null @@ -1,69 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl b/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl deleted file mode 100644 index 65ec3b8..0000000 --- a/install/deb/templates/web/nginx/php-fpm/cms_made_simple.tpl +++ /dev/null @@ -1,57 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?page=$request_uri; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter.stpl b/install/deb/templates/web/nginx/php-fpm/codeigniter.stpl deleted file mode 100644 index 175df9e..0000000 --- a/install/deb/templates/web/nginx/php-fpm/codeigniter.stpl +++ /dev/null @@ -1,85 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~ /(application|system|README.md|CHANGELOG.md|LICENSE) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/codeigniter.tpl b/install/deb/templates/web/nginx/php-fpm/codeigniter.tpl deleted file mode 100644 index 4e79eb4..0000000 --- a/install/deb/templates/web/nginx/php-fpm/codeigniter.tpl +++ /dev/null @@ -1,73 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location ~ /(application|system|README.md|CHANGELOG.md|LICENSE) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/craftcms.stpl b/install/deb/templates/web/nginx/php-fpm/craftcms.stpl deleted file mode 100644 index 3851bcd..0000000 --- a/install/deb/templates/web/nginx/php-fpm/craftcms.stpl +++ /dev/null @@ -1,88 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/web; - index index.php index.html index.htm; - access_log /var/log/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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - # Craft-specific location handlers to ensure AdminCP requests route through index.php - # If you change your "cpTrigger", change it here as well - location ^~ /admin { - try_files $uri $uri/ /index.php?$query_string; - } - - location ^~ /cpresources { - try_files $uri $uri/ /index.php?$query_string; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/craftcms.tpl b/install/deb/templates/web/nginx/php-fpm/craftcms.tpl deleted file mode 100644 index c48f184..0000000 --- a/install/deb/templates/web/nginx/php-fpm/craftcms.tpl +++ /dev/null @@ -1,75 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/web; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$args; - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - # Craft-specific location handlers to ensure AdminCP requests route through index.php - # If you change your "cpTrigger", change it here as well - location ^~ /admin { - try_files $uri $uri/ /index.php?$query_string; - } - - location ^~ /cpresources { - try_files $uri $uri/ /index.php?$query_string; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl b/install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl deleted file mode 100644 index 359a24d..0000000 --- a/install/deb/templates/web/nginx/php-fpm/datalife_engine.stpl +++ /dev/null @@ -1,140 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - 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|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl b/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl deleted file mode 100644 index 36c2722..0000000 --- a/install/deb/templates/web/nginx/php-fpm/datalife_engine.tpl +++ /dev/null @@ -1,128 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - 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|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/default.stpl b/install/deb/templates/web/nginx/php-fpm/default.stpl deleted file mode 100644 index 86bc9cc..0000000 --- a/install/deb/templates/web/nginx/php-fpm/default.stpl +++ /dev/null @@ -1,67 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/default.tpl b/install/deb/templates/web/nginx/php-fpm/default.tpl deleted file mode 100644 index 70134dd..0000000 --- a/install/deb/templates/web/nginx/php-fpm/default.tpl +++ /dev/null @@ -1,55 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl b/install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl deleted file mode 100644 index a6e21a7..0000000 --- a/install/deb/templates/web/nginx/php-fpm/dokuwiki.stpl +++ /dev/null @@ -1,85 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - index doku.php; - - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - location ~ ^/lib.*\.(gif|png|webp|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; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl b/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl deleted file mode 100644 index efaf389..0000000 --- a/install/deb/templates/web/nginx/php-fpm/dokuwiki.tpl +++ /dev/null @@ -1,73 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - index doku.php; - - try_files $uri $uri/ @dokuwiki; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - location ~ ^/lib.*\.(gif|png|webp|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; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl b/install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl deleted file mode 100644 index 5295486..0000000 --- a/install/deb/templates/web/nginx/php-fpm/drupal-composer.stpl +++ /dev/null @@ -1,119 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/web; - index index.php index.html index.htm; - access_log /var/log/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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ ^/sites/.*/private/ { - deny all; - return 404; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - try_files $uri @rewrite; - - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$)|^/update.php { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - set $no_cache 0; - - if ($request_uri ~* "/user/|/admin/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - rewrite ^/index.php/(.*) /$1 permanent; - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/drupal-composer.tpl b/install/deb/templates/web/nginx/php-fpm/drupal-composer.tpl deleted file mode 100644 index 4817c0a..0000000 --- a/install/deb/templates/web/nginx/php-fpm/drupal-composer.tpl +++ /dev/null @@ -1,108 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/web; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ ^/sites/.*/private/ { - deny all; - return 404; - } - - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - try_files $uri @rewrite; - - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$)|^/update.php { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - set $no_cache 0; - - if ($request_uri ~* "/user/|/admin/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - rewrite ^/index.php/(.*) /$1 permanent; - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/drupal-social.stpl b/install/deb/templates/web/nginx/php-fpm/drupal-social.stpl deleted file mode 100644 index 2030ba6..0000000 --- a/install/deb/templates/web/nginx/php-fpm/drupal-social.stpl +++ /dev/null @@ -1,119 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/html; - index index.php index.html index.htm; - access_log /var/log/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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ ^/sites/.*/private/ { - deny all; - return 404; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - try_files $uri @rewrite; - - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$)|^/update.php { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - set $no_cache 0; - - if ($request_uri ~* "/user/|/admin/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - rewrite ^/index.php/(.*) /$1 permanent; - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/drupal-social.tpl b/install/deb/templates/web/nginx/php-fpm/drupal-social.tpl deleted file mode 100644 index 507aac1..0000000 --- a/install/deb/templates/web/nginx/php-fpm/drupal-social.tpl +++ /dev/null @@ -1,107 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/html; - index index.php index.html index.htm; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ ^/sites/.*/private/ { - deny all; - return 404; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - try_files $uri @rewrite; - - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$)|^/update.php { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - set $no_cache 0; - - if ($request_uri ~* "/user/|/admin/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - rewrite ^/index.php/(.*) /$1 permanent; - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/drupal.stpl b/install/deb/templates/web/nginx/php-fpm/drupal.stpl deleted file mode 100644 index 14162ea..0000000 --- a/install/deb/templates/web/nginx/php-fpm/drupal.stpl +++ /dev/null @@ -1,129 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /(changelog.txt|copyright.txt|install.mysql.txt|install.pgsql.txt|install.sqlite.txt|install.txt|license.txt|maintainers.txt|license|license.txt|readme.txt|readme.md|upgrade.txt) { - deny all; - return 404; - } - - location ~ ^/sites/.*/private/ { - deny all; - return 404; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - try_files $uri @rewrite; - - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$)|^/update.php { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - set $no_cache 0; - - if ($request_uri ~* "/user/|/admin/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - rewrite ^/index.php/(.*) /$1 permanent; - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/drupal.tpl b/install/deb/templates/web/nginx/php-fpm/drupal.tpl deleted file mode 100644 index a2a628d..0000000 --- a/install/deb/templates/web/nginx/php-fpm/drupal.tpl +++ /dev/null @@ -1,117 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /(changelog.txt|copyright.txt|install.mysql.txt|install.pgsql.txt|install.sqlite.txt|install.txt|license.txt|maintainers.txt|license|license.txt|readme.txt|readme.md|upgrade.txt) { - deny all; - return 404; - } - - location ~ ^/sites/.*/private/ { - deny all; - return 404; - } - - location ~ /vendor/.*\.php$ { - deny all; - return 404; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - try_files $uri @rewrite; - - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - deny all; - return 404; - } - - location ~ ^/sites/[^/]+/files/.*\.php$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$)|^/update.php { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_split_path_info ^(.+?\.php)(|/.*)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - set $no_cache 0; - - if ($request_uri ~* "/user/|/admin/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - - location ~ ^/sites/.*/files/styles/ { - try_files $uri @rewrite; - } - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - rewrite ^/index.php/(.*) /$1 permanent; - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/flarum.stpl b/install/deb/templates/web/nginx/php-fpm/flarum.stpl deleted file mode 100644 index 5f3c1d1..0000000 --- a/install/deb/templates/web/nginx/php-fpm/flarum.stpl +++ /dev/null @@ -1,94 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - # Pass requests that don't refer directly to files in the filesystem to index.php - location / { - try_files $uri $uri/ /index.php?$query_string; - } - - location ~ \.php$ { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - # Uncomment the following lines if you are not using a "public" directory - # to prevent sensitive resources from being exposed. - location ~* ^/(\.git|composer\.(json|lock)|auth\.json|config\.php|flarum|storage|vendor) { - deny all; - return 404; - } - - # The following directives are based on best practices from H5BP Nginx Server Configs - # https://github.com/h5bp/server-configs-nginx - - # Expire rules for static content - location ~* \.(?:manifest|appcache|html?|xml|json)$ { - add_header Cache-Control "max-age=0"; - } - - location ~* \.(?:rss|atom)$ { - add_header Cache-Control "max-age=3600"; - } - - location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|mp4|ogg|ogv|webm|htc)$ { - add_header Cache-Control "max-age=2592000"; - access_log off; - } - - location ~* \.(?:css|js)$ { - add_header Cache-Control "max-age=31536000"; - access_log off; - } - - location ~* \.(?:ttf|ttc|otf|eot|woff|woff2)$ { - add_header Cache-Control "max-age=2592000"; - access_log off; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/flarum.tpl b/install/deb/templates/web/nginx/php-fpm/flarum.tpl deleted file mode 100644 index 3dc1450..0000000 --- a/install/deb/templates/web/nginx/php-fpm/flarum.tpl +++ /dev/null @@ -1,82 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - # Pass requests that don't refer directly to files in the filesystem to index.php - location / { - try_files $uri $uri/ /index.php?$query_string; - } - - location ~ \.php$ { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - # Uncomment the following lines if you are not using a "public" directory - # to prevent sensitive resources from being exposed. - location ~* ^/(\.git|composer\.(json|lock)|auth\.json|config\.php|flarum|storage|vendor) { - deny all; - return 404; - } - - # The following directives are based on best practices from H5BP Nginx Server Configs - # https://github.com/h5bp/server-configs-nginx - - # Expire rules for static content - location ~* \.(?:manifest|appcache|html?|xml|json)$ { - add_header Cache-Control "max-age=0"; - } - - location ~* \.(?:rss|atom)$ { - add_header Cache-Control "max-age=3600"; - } - - location ~* \.(?:jpg|jpeg|gif|png|ico|cur|gz|svg|mp4|ogg|ogv|webm|htc)$ { - add_header Cache-Control "max-age=2592000"; - access_log off; - } - - location ~* \.(?:css|js)$ { - add_header Cache-Control "max-age=31536000"; - access_log off; - } - - location ~* \.(?:ttf|ttc|otf|eot|woff|woff2)$ { - add_header Cache-Control "max-age=2592000"; - access_log off; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/gitea.stpl b/install/deb/templates/web/nginx/php-fpm/gitea.stpl deleted file mode 100644 index 73f4fa3..0000000 --- a/install/deb/templates/web/nginx/php-fpm/gitea.stpl +++ /dev/null @@ -1,61 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /.well-known { - allow all; - } - - location / { - client_max_body_size 512M; - - proxy_max_temp_file_size 0; - proxy_read_timeout 120; - proxy_redirect off; - - proxy_set_header Host $http_host; - proxy_set_header Early-Data $rfc_early_data; - 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_pass http://localhost:3000; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/gitea.tpl b/install/deb/templates/web/nginx/php-fpm/gitea.tpl deleted file mode 100644 index 2796e93..0000000 --- a/install/deb/templates/web/nginx/php-fpm/gitea.tpl +++ /dev/null @@ -1,49 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /.well-known { - allow all; - } - - location / { - client_max_body_size 512M; - - proxy_max_temp_file_size 0; - proxy_read_timeout 120; - proxy_redirect off; - - proxy_set_header Host $http_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_pass http://localhost:3000; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/grav.stpl b/install/deb/templates/web/nginx/php-fpm/grav.stpl deleted file mode 100644 index d8ffece..0000000 --- a/install/deb/templates/web/nginx/php-fpm/grav.stpl +++ /dev/null @@ -1,72 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - } - } - - location ~* /(\.git|cache|bin|logs|backup|tests)/.*$ { return 403; } - location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; } - location ~* /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; } - location ~ /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/grav.tpl b/install/deb/templates/web/nginx/php-fpm/grav.tpl deleted file mode 100644 index 8963958..0000000 --- a/install/deb/templates/web/nginx/php-fpm/grav.tpl +++ /dev/null @@ -1,60 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$query_string; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - } - } - - location ~* /(\.git|cache|bin|logs|backup|tests)/.*$ { return 403; } - location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; } - location ~* /user/.*\.(txt|md|yaml|yml|php|pl|py|cgi|twig|sh|bat)$ { return 403; } - location ~ /(LICENSE\.txt|composer\.lock|composer\.json|nginx\.conf|web\.config|htaccess\.txt|\.htaccess) { return 403; } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/joomla.stpl b/install/deb/templates/web/nginx/php-fpm/joomla.stpl deleted file mode 100644 index 827cdbe..0000000 --- a/install/deb/templates/web/nginx/php-fpm/joomla.stpl +++ /dev/null @@ -1,90 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - deny all; - return 404; - } - - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - if ($request_uri ~* "/administrator/|index.php") { - set $no_cache 1; - } - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/joomla.tpl b/install/deb/templates/web/nginx/php-fpm/joomla.tpl deleted file mode 100644 index 4b46ac1..0000000 --- a/install/deb/templates/web/nginx/php-fpm/joomla.tpl +++ /dev/null @@ -1,77 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~* /(images|cache|media|logs|tmp)/.*\.(php|pl|py|jsp|asp|sh|cgi)$ { - deny all; - return 404; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - if ($request_uri ~* "/administrator/|index.php") { - set $no_cache 1; - } - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/laravel.stpl b/install/deb/templates/web/nginx/php-fpm/laravel.stpl deleted file mode 100644 index 386fa01..0000000 --- a/install/deb/templates/web/nginx/php-fpm/laravel.stpl +++ /dev/null @@ -1,80 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/laravel.tpl b/install/deb/templates/web/nginx/php-fpm/laravel.tpl deleted file mode 100644 index 09bc180..0000000 --- a/install/deb/templates/web/nginx/php-fpm/laravel.tpl +++ /dev/null @@ -1,68 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ /index.php?$args; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/magento.stpl b/install/deb/templates/web/nginx/php-fpm/magento.stpl deleted file mode 100644 index fa74c48..0000000 --- a/install/deb/templates/web/nginx/php-fpm/magento.stpl +++ /dev/null @@ -1,208 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_ssl_port% ssl; - server_name %domain_idn% %alias_idn%; - root %sdocroot%/pub; - index index.php; - access_log /var/log/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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - add_header "X-UA-Compatible" "IE=Edge"; - error_page 404 403 = /errors/404.php; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %sdocroot%; - - location ~ ^/setup/index.php { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - 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 { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - # 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|webp|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|webp|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - try_files $uri $uri/ /get.php?$args; - - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - try_files $uri $uri/ /get.php?$args; - - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - } - - 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; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_buffers 1024 4k; - fastcgi_connect_timeout 600s; - fastcgi_read_timeout 600s; - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/magento.tpl b/install/deb/templates/web/nginx/php-fpm/magento.tpl deleted file mode 100644 index d699b00..0000000 --- a/install/deb/templates/web/nginx/php-fpm/magento.tpl +++ /dev/null @@ -1,193 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -server { - listen %ip%:%web_port%; - server_name %domain_idn% %alias_idn%; - root %docroot%/pub; - index index.php; - access_log /var/log/nginx/domains/%domain%.log combined; - access_log /var/log/nginx/domains/%domain%.bytes bytes; - error_log /var/log/nginx/domains/%domain%.error.log error; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - error_page 404 403 = /errors/404.php; - add_header "X-UA-Compatible" "IE=Edge"; - - # PHP entry point for setup application - location ~* ^/setup($|/) { - root %docroot%; - - location ~ ^/setup/index.php { - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - 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 { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(/update/index.php)(/.+)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - # 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|webp|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|webp|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ { - try_files $uri $uri/ /get.php?$args; - - add_header Cache-Control "public"; - add_header X-Frame-Options "SAMEORIGIN"; - expires +1y; - } - - location ~* \.(zip|gz|gzip|bz2|csv|xml)$ { - try_files $uri $uri/ /get.php?$args; - - add_header Cache-Control "no-store"; - add_header X-Frame-Options "SAMEORIGIN"; - expires off; - } - - 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; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_buffers 1024 4k; - fastcgi_connect_timeout 600s; - fastcgi_read_timeout 600s; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - # Banned locations (only reached if the earlier PHP entry point regexes don't match) - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/mautic.stpl b/install/deb/templates/web/nginx/php-fpm/mautic.stpl deleted file mode 100644 index 1a98289..0000000 --- a/install/deb/templates/web/nginx/php-fpm/mautic.stpl +++ /dev/null @@ -1,100 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - # redirect some entire folders - rewrite ^/(vendor|translations|build)/.* /index.php break; - - location / { - include %home%/%user%/conf/web/nginx.%domain%.rules.conf*; - - # First attempt to serve request as file, then - # as directory, then fall back to index.html - # one option: try_files $uri $uri/ /index.php$is_args$args; - - try_files $uri /index.php$is_args$args; - - # Uncomment to enable naxsi on this location - # include /etc/nginx/naxsi.rules - - location ~* ^.+\.(jpeg|jpg|png|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - } - - # Deny everything else in /app folder except Assets folder in bundles - location ~ /app/bundles/.*/Assets/ { - allow all; - access_log off; - } - - location ~ /app/ { deny all; } - - # Deny everything else in /addons or /plugins folder except Assets folder in bundles - location ~ /(addons|plugins)/.*/Assets/ { - allow all; - access_log off; - } - - # location ~ /(addons|plugins)/ { deny all; } - - # Deny all php files in themes folder - location ~* ^/themes/(.*)\.php { - deny all; - } - - location ~ [^/]\.php(/|$) { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(.+.php)(/.+)$; - - fastcgi_pass %backend_lsnr%; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/mautic.tpl b/install/deb/templates/web/nginx/php-fpm/mautic.tpl deleted file mode 100644 index 5185f23..0000000 --- a/install/deb/templates/web/nginx/php-fpm/mautic.tpl +++ /dev/null @@ -1,39 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location / { - rewrite ^(.*) https://%domain%$1 permanent; - } - - location ~* "/\.(htaccess|htpasswd)$" { - deny all; - return 404; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/modx.stpl b/install/deb/templates/web/nginx/php-fpm/modx.stpl deleted file mode 100644 index e16bbfa..0000000 --- a/install/deb/templates/web/nginx/php-fpm/modx.stpl +++ /dev/null @@ -1,97 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location /core/ { - deny all; - return 404; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - try_files $uri $uri/ @rewrite; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_paramsystem/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - if ($request_uri ~* "/manager/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/modx.tpl b/install/deb/templates/web/nginx/php-fpm/modx.tpl deleted file mode 100644 index c9bc19b..0000000 --- a/install/deb/templates/web/nginx/php-fpm/modx.tpl +++ /dev/null @@ -1,85 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location /core/ { - deny all; - return 404; - } - - location @rewrite { - rewrite ^/(.*)$ /index.php?q=$1; - } - - location / { - try_files $uri $uri/ @rewrite; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - expires 30d; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - if ($request_uri ~* "/manager/|index.php") { - set $no_cache 1; - } - - if ($http_cookie ~ SESS) { - set $no_cache 1; - } - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/moodle.stpl b/install/deb/templates/web/nginx/php-fpm/moodle.stpl deleted file mode 100644 index a654513..0000000 --- a/install/deb/templates/web/nginx/php-fpm/moodle.stpl +++ /dev/null @@ -1,98 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - 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; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ [^/]\.php(/|$) { - try_files $fastcgi_script_name =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_intercept_errors on; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param PHP_VALUE open_basedir="/home/%user%/web/%domain%/private/moodledata:/home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/var/www/html:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/phppgadmin:/etc/roundcube:/var/lib/roundcube:/tmp:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt"; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(.+\.php)($|/.*); - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/moodle.tpl b/install/deb/templates/web/nginx/php-fpm/moodle.tpl deleted file mode 100644 index eee5fe6..0000000 --- a/install/deb/templates/web/nginx/php-fpm/moodle.tpl +++ /dev/null @@ -1,86 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - 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; - } - - # No no for private - location ~ ^/sites/.*/private/ { - return 403; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ \..*/.*\.php$ { - return 403; - } - - location ~ [^/]\.php(/|$) { - try_files $fastcgi_script_name =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_intercept_errors on; - fastcgi_param PHP_VALUE open_basedir="/home/%user%/web/%domain%/private/moodledata:/home/%user%/web/%domain%/public_html:/home/%user%/web/%domain%/public_shtml:/home/%user%/tmp:/var/www/html:/etc/phpmyadmin:/var/lib/phpmyadmin:/etc/phppgadmin:/etc/roundcube:/var/lib/roundcube:/tmp:/bin:/usr/bin:/usr/local/bin:/usr/share:/opt"; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(.+\.php)($|/.*); - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/no-php.stpl b/install/deb/templates/web/nginx/php-fpm/no-php.stpl deleted file mode 100644 index 19eb251..0000000 --- a/install/deb/templates/web/nginx/php-fpm/no-php.stpl +++ /dev/null @@ -1,57 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - } - - location ~ [^/]\.php(/|$) { - types { } default_type "text/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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/no-php.tpl b/install/deb/templates/web/nginx/php-fpm/no-php.tpl deleted file mode 100644 index b64275f..0000000 --- a/install/deb/templates/web/nginx/php-fpm/no-php.tpl +++ /dev/null @@ -1,46 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - } - - location ~ [^/]\.php(/|$) { - types { } default_type "text/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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/odoo.stpl b/install/deb/templates/web/nginx/php-fpm/odoo.stpl deleted file mode 100644 index a5e1720..0000000 --- a/install/deb/templates/web/nginx/php-fpm/odoo.stpl +++ /dev/null @@ -1,78 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504; - proxy_redirect off; - - proxy_set_header Early-Data $rfc_early_data; - 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\/) { - deny all; - return 404; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - expires 864000; - - proxy_buffering on; - proxy_cache_valid 200 60m; - - proxy_pass http://127.0.0.1:8069; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/odoo.tpl b/install/deb/templates/web/nginx/php-fpm/odoo.tpl deleted file mode 100644 index c9ceb8d..0000000 --- a/install/deb/templates/web/nginx/php-fpm/odoo.tpl +++ /dev/null @@ -1,66 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - 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\/) { - deny all; - return 404; - } - - location / { - proxy_pass http://127.0.0.1:8069; - } - - location /longpolling { - proxy_pass http://127.0.0.1:8072; - } - - location ~* /web/static/ { - expires 864000; - - proxy_buffering on; - proxy_cache_valid 200 60m; - - proxy_pass http://127.0.0.1:8069; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/opencart.stpl b/install/deb/templates/web/nginx/php-fpm/opencart.stpl deleted file mode 100644 index 86b08ed..0000000 --- a/install/deb/templates/web/nginx/php-fpm/opencart.stpl +++ /dev/null @@ -1,78 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ @opencart; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /storage/ { - deny all; - return 404; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/opencart.tpl b/install/deb/templates/web/nginx/php-fpm/opencart.tpl deleted file mode 100644 index c811ed8..0000000 --- a/install/deb/templates/web/nginx/php-fpm/opencart.tpl +++ /dev/null @@ -1,66 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - try_files $uri $uri/ @opencart; - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - } - - location ~ [^/]\.php(/|$) { - try_files $uri =404; - - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - location @opencart { - rewrite ^/(.+)$ /index.php?_route_=$1 last; - } - - location /storage/ { - deny all; - return 404; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/openproject.stpl b/install/deb/templates/web/nginx/php-fpm/openproject.stpl deleted file mode 100644 index e9e278a..0000000 --- a/install/deb/templates/web/nginx/php-fpm/openproject.stpl +++ /dev/null @@ -1,56 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - proxy_set_header Host $host; - proxy_set_header Early-Data $rfc_early_data; - proxy_set_header X-Forwarded-Port 443; - proxy_set_header X-Forwarded-Proto https; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://127.0.0.1:6000; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/openproject.tpl b/install/deb/templates/web/nginx/php-fpm/openproject.tpl deleted file mode 100644 index c788c36..0000000 --- a/install/deb/templates/web/nginx/php-fpm/openproject.tpl +++ /dev/null @@ -1,42 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - - proxy_pass http://127.0.0.1:6000; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/osticket.stpl b/install/deb/templates/web/nginx/php-fpm/osticket.stpl deleted file mode 100644 index 745639a..0000000 --- a/install/deb/templates/web/nginx/php-fpm/osticket.stpl +++ /dev/null @@ -1,105 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - set $path_info ""; - - location ~ /include { - deny all; - return 403; - } - - if ($request_uri ~ "^/api(/[^\?]+)") { - set $path_info $1; - } - - location ~ ^/api/(?:tickets|tasks).*$ { - try_files $uri $uri/ /api/http.php?$query_string; - } - - if ($request_uri ~ "^/scp/.*\.php(/[^\?]+)") { - set $path_info $1; - } - - if ($request_uri ~ "^/.*\.php(/[^\?]+)") { - set $path_info $1; - } - - location ~ ^/scp/ajax.php/.*$ { - try_files $uri $uri/ /scp/ajax.php?$query_string; - } - - location ~ ^/ajax.php/.*$ { - try_files $uri $uri/ /ajax.php?$query_string; - } - - location / { - try_files $uri $uri/ index.php; - } - - location ~ \.php$ { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - fastcgi_param PATH_INFO $path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/osticket.tpl b/install/deb/templates/web/nginx/php-fpm/osticket.tpl deleted file mode 100644 index 5f9cd05..0000000 --- a/install/deb/templates/web/nginx/php-fpm/osticket.tpl +++ /dev/null @@ -1,93 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - set $path_info ""; - - location ~ /include { - deny all; - return 403; - } - - if ($request_uri ~ "^/api(/[^\?]+)") { - set $path_info $1; - } - - location ~ ^/api/(?:tickets|tasks).*$ { - try_files $uri $uri/ /api/http.php?$query_string; - } - - if ($request_uri ~ "^/scp/.*\.php(/[^\?]+)") { - set $path_info $1; - } - - if ($request_uri ~ "^/.*\.php(/[^\?]+)") { - set $path_info $1; - } - - location ~ ^/scp/ajax.php/.*$ { - try_files $uri $uri/ /scp/ajax.php?$query_string; - } - - location ~ ^/ajax.php/.*$ { - try_files $uri $uri/ /ajax.php?$query_string; - } - - location / { - try_files $uri $uri/ index.php; - } - - location ~ \.php$ { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_param PATH_INFO $path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/owncloud.stpl b/install/deb/templates/web/nginx/php-fpm/owncloud.stpl deleted file mode 100644 index 7444e13..0000000 --- a/install/deb/templates/web/nginx/php-fpm/owncloud.stpl +++ /dev/null @@ -1,103 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - 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; - error_page 500 502 503 504 /error/50x.html; - - location ~ ^/(?:\data|config|db_structure\.xml|README){ - deny all; - } - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - 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(?:$|/) { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - #fastcgi_param HTTPS on; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - - # 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"; - } - - 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*; - } - - proxy_hide_header Upgrade; - - include /etc/nginx/conf.d/phpmyadmin.inc*; - include /etc/nginx/conf.d/phppgadmin.inc*; - include %home%/%user%/conf/web/%domain%/nginx.ssl.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/owncloud.tpl b/install/deb/templates/web/nginx/php-fpm/owncloud.tpl deleted file mode 100644 index 6275fd8..0000000 --- a/install/deb/templates/web/nginx/php-fpm/owncloud.tpl +++ /dev/null @@ -1,91 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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; - - include %home%/%user%/conf/web/%domain%/nginx.forcessl.conf*; - - 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; - error_page 500 502 503 504 /error/50x.html; - - location ~ ^/(?:\data|config|db_structure\.xml|README){ - deny all; - } - - location ~ /\.(?!well-known\/|file) { - deny all; - return 404; - } - - 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(?:$|/) { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - #fastcgi_param HTTPS on; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - - fastcgi_pass %backend_lsnr%; - - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - } - } - - location ~* ^.+\.(jpeg|jpg|png|webp|gif|bmp|ico|svg|css|js)$ { - expires max; - fastcgi_hide_header "Set-Cookie"; - - # 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"; - } - - 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 %home%/%user%/conf/web/%domain%/nginx.conf_*; -} diff --git a/install/deb/templates/web/nginx/php-fpm/phpbb.stpl b/install/deb/templates/web/nginx/php-fpm/phpbb.stpl deleted file mode 100644 index dcc6364..0000000 --- a/install/deb/templates/web/nginx/php-fpm/phpbb.stpl +++ /dev/null @@ -1,117 +0,0 @@ -#=========================================================================# -# Default Web Domain Template # -# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS # -# https://hestiacp.com/docs/server-administration/web-templates.html # -#=========================================================================# - -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%; - ssl_stapling on; - ssl_stapling_verify on; - - # TLS 1.3 0-RTT anti-replay - if ($anti_replay = 307) { return 307 https://$host$request_uri; } - if ($anti_replay = 425) { return 425; } - - include %home%/%user%/conf/web/%domain%/nginx.hsts.conf*; - - location = /favicon.ico { - log_not_found off; - access_log off; - } - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location ~ /\.(?!well-known\/) { - deny all; - return 404; - } - - # Based on: https://github.com/phpbb/phpbb/blob/master/phpBB/docs/nginx.sample.conf - location / { - try_files $uri $uri/ @rewriteapp; - - location ~* ^.+\.(ogg|ogv|svg|svgz|swf|eot|otf|woff|woff2|mov|mp3|mp4|webm|flv|ttf|rss|atom|jpg|jpeg|gif|png|webp|ico|bmp|mid|midi|wav|rtf|css|js|jar)$ { - fastcgi_hide_header "Set-Cookie"; - } - - # Pass the php scripts to FastCGI server specified in upstream declaration. - location ~ \.php(/|$) { - include /usr/local/hestia/nginx-system/etc/nginx/fastcgi_params; - - fastcgi_index index.php; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; - fastcgi_param HTTP_EARLY_DATA $rfc_early_data if_not_empty; - - fastcgi_pass %backend_lsnr%; - include %home%/%user%/conf/web/%domain%/nginx.fastcgi_cache.conf*; - - try_files $uri $uri/ /app.php$is_args$args; - } - - # Deny access to internal phpbb files. - location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|(? - ServerName %domain_idn% - ServerAlias %alias% - Alias / /var/lib/roundcube/ - Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ - #SuexecUserGroup %user% %group% - - SSLEngine on - SSLVerifyClient none - SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt - SSLCertificateKeyFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key - - - 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 - - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_* - - \ No newline at end of file diff --git a/install/rpm/templates/mail/apache2/default.tpl b/install/rpm/templates/mail/apache2/default.tpl deleted file mode 100644 index acb3ee0..0000000 --- a/install/rpm/templates/mail/apache2/default.tpl +++ /dev/null @@ -1,48 +0,0 @@ - - ServerName %domain_idn% - ServerAlias %alias_idn% - Alias / /var/lib/roundcube/ - Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ - #SuexecUserGroup %user% %group% - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf* - - - 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 - - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_* - - \ No newline at end of file diff --git a/install/rpm/templates/mail/apache2/disabled.stpl b/install/rpm/templates/mail/apache2/disabled.stpl deleted file mode 100644 index 785a831..0000000 --- a/install/rpm/templates/mail/apache2/disabled.stpl +++ /dev/null @@ -1,12 +0,0 @@ - -ServerName %domain_idn% -ServerAlias %alias_idn% -DocumentRoot /var/www/html/ -Alias /error/ /var/www/document_errors/ - -SSLEngine on -SSLVerifyClient none -SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt -SSLCertificateKeyFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key - - \ No newline at end of file diff --git a/install/rpm/templates/mail/apache2/disabled.tpl b/install/rpm/templates/mail/apache2/disabled.tpl deleted file mode 100644 index aa65b0a..0000000 --- a/install/rpm/templates/mail/apache2/disabled.tpl +++ /dev/null @@ -1,7 +0,0 @@ - - ServerName %domain_idn% - ServerAlias %alias_idn% - DocumentRoot /var/www/html/ - Alias /error/ /var/www/document_errors/ - #SuexecUserGroup %user% %group% - \ No newline at end of file diff --git a/install/rpm/templates/mail/apache2/rainloop.stpl b/install/rpm/templates/mail/apache2/rainloop.stpl deleted file mode 100644 index 84b8244..0000000 --- a/install/rpm/templates/mail/apache2/rainloop.stpl +++ /dev/null @@ -1,31 +0,0 @@ - -ServerName %domain_idn% -ServerAlias %alias_idn% -Alias / /var/lib/rainloop/ -Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ -#SuexecUserGroup %user% %group% - -SSLEngine on -SSLVerifyClient none -SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt -SSLCertificateKeyFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key - - - Options +FollowSymLinks - # This is needed to parse /var/lib/rainloop/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - -IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_* - - \ No newline at end of file diff --git a/install/rpm/templates/mail/apache2/snappymail.stpl b/install/rpm/templates/mail/apache2/snappymail.stpl deleted file mode 100644 index 8376ce7..0000000 --- a/install/rpm/templates/mail/apache2/snappymail.stpl +++ /dev/null @@ -1,31 +0,0 @@ - -ServerName %domain_idn% -ServerAlias %alias_idn% -Alias / /var/lib/snappymail/ -Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ -#SuexecUserGroup %user% %group% - -SSLEngine on -SSLVerifyClient none -SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt -SSLCertificateKeyFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key - - - Options +FollowSymLinks - # This is needed to parse /var/lib/snappymail/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - -# Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - - -IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_* - - diff --git a/install/rpm/templates/mail/apache2/snappymail.tpl b/install/rpm/templates/mail/apache2/snappymail.tpl deleted file mode 100644 index ee4829c..0000000 --- a/install/rpm/templates/mail/apache2/snappymail.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - ServerName %domain_idn% - ServerAlias %alias_idn% - Alias / /var/lib/snappymail/ - Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ - #SuexecUserGroup %user% %group% - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf* - - - Options +FollowSymLinks - # This is needed to parse /var/lib/snappymail/.htaccess. See its - # content before setting AllowOverride to None. - AllowOverride All - order allow,deny - allow from all - - - # Protecting basic directories: - - Options -FollowSymLinks - AllowOverride None - - IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_* - diff --git a/install/deb/templates/mail/apache2/default.stpl b/install/rpm/templates/mail/httpd/default.stpl similarity index 96% rename from install/deb/templates/mail/apache2/default.stpl rename to install/rpm/templates/mail/httpd/default.stpl index 31b8834..61f5828 100644 --- a/install/deb/templates/mail/apache2/default.stpl +++ b/install/rpm/templates/mail/httpd/default.stpl @@ -5,6 +5,9 @@ Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ #SuexecUserGroup %user% %group% + DirectoryIndex index.php index.html + + SSLEngine on SSLVerifyClient none SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt @@ -48,4 +51,4 @@ IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_* - \ No newline at end of file + diff --git a/install/deb/templates/mail/apache2/default.tpl b/install/rpm/templates/mail/httpd/default.tpl similarity index 96% rename from install/deb/templates/mail/apache2/default.tpl rename to install/rpm/templates/mail/httpd/default.tpl index acb3ee0..ebbe284 100644 --- a/install/deb/templates/mail/apache2/default.tpl +++ b/install/rpm/templates/mail/httpd/default.tpl @@ -5,6 +5,8 @@ Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ #SuexecUserGroup %user% %group% + DirectoryIndex index.php index.html + IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf* @@ -45,4 +47,4 @@ IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_* - \ No newline at end of file + diff --git a/install/deb/templates/mail/apache2/disabled.stpl b/install/rpm/templates/mail/httpd/disabled.stpl similarity index 87% rename from install/deb/templates/mail/apache2/disabled.stpl rename to install/rpm/templates/mail/httpd/disabled.stpl index 785a831..5739fd8 100644 --- a/install/deb/templates/mail/apache2/disabled.stpl +++ b/install/rpm/templates/mail/httpd/disabled.stpl @@ -3,10 +3,11 @@ ServerName %domain_idn% ServerAlias %alias_idn% DocumentRoot /var/www/html/ Alias /error/ /var/www/document_errors/ +DirectoryIndex index.php index.html SSLEngine on SSLVerifyClient none SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt SSLCertificateKeyFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.key - \ No newline at end of file + diff --git a/install/deb/templates/mail/apache2/disabled.tpl b/install/rpm/templates/mail/httpd/disabled.tpl similarity index 77% rename from install/deb/templates/mail/apache2/disabled.tpl rename to install/rpm/templates/mail/httpd/disabled.tpl index aa65b0a..b9765f9 100644 --- a/install/deb/templates/mail/apache2/disabled.tpl +++ b/install/rpm/templates/mail/httpd/disabled.tpl @@ -4,4 +4,6 @@ DocumentRoot /var/www/html/ Alias /error/ /var/www/document_errors/ #SuexecUserGroup %user% %group% - \ No newline at end of file + DirectoryIndex index.php index.html + + diff --git a/install/deb/templates/mail/apache2/rainloop.stpl b/install/rpm/templates/mail/httpd/rainloop.stpl similarity index 94% rename from install/deb/templates/mail/apache2/rainloop.stpl rename to install/rpm/templates/mail/httpd/rainloop.stpl index 84b8244..238d574 100644 --- a/install/deb/templates/mail/apache2/rainloop.stpl +++ b/install/rpm/templates/mail/httpd/rainloop.stpl @@ -4,6 +4,7 @@ ServerAlias %alias_idn% Alias / /var/lib/rainloop/ Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ #SuexecUserGroup %user% %group% +DirectoryIndex index.php index.html SSLEngine on SSLVerifyClient none @@ -28,4 +29,4 @@ SSLCertificateKeyFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domai IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.ssl.conf_* - \ No newline at end of file + diff --git a/install/rpm/templates/mail/apache2/rainloop.tpl b/install/rpm/templates/mail/httpd/rainloop.tpl similarity index 93% rename from install/rpm/templates/mail/apache2/rainloop.tpl rename to install/rpm/templates/mail/httpd/rainloop.tpl index 83afa1f..4a39d1b 100644 --- a/install/rpm/templates/mail/apache2/rainloop.tpl +++ b/install/rpm/templates/mail/httpd/rainloop.tpl @@ -5,6 +5,8 @@ Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ #SuexecUserGroup %user% %group% + DirectoryIndex index.php index.html + IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf* @@ -22,4 +24,4 @@ AllowOverride None IncludeOptional %home%/%user%/conf/mail/%root_domain%/%web_system%.conf_* - \ No newline at end of file + diff --git a/install/deb/templates/mail/apache2/snappymail.stpl b/install/rpm/templates/mail/httpd/snappymail.stpl similarity index 96% rename from install/deb/templates/mail/apache2/snappymail.stpl rename to install/rpm/templates/mail/httpd/snappymail.stpl index 8376ce7..e8a9c4d 100644 --- a/install/deb/templates/mail/apache2/snappymail.stpl +++ b/install/rpm/templates/mail/httpd/snappymail.stpl @@ -5,6 +5,8 @@ Alias / /var/lib/snappymail/ Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ #SuexecUserGroup %user% %group% +DirectoryIndex index.php index.html + SSLEngine on SSLVerifyClient none SSLCertificateFile %home%/%user%/conf/mail/%root_domain%/ssl/%root_domain%.crt diff --git a/install/deb/templates/mail/apache2/snappymail.tpl b/install/rpm/templates/mail/httpd/snappymail.tpl similarity index 95% rename from install/deb/templates/mail/apache2/snappymail.tpl rename to install/rpm/templates/mail/httpd/snappymail.tpl index ee4829c..9a2ca12 100644 --- a/install/deb/templates/mail/apache2/snappymail.tpl +++ b/install/rpm/templates/mail/httpd/snappymail.tpl @@ -5,6 +5,8 @@ Alias /error/ %home%/%user%/web/%root_domain%/document_errors/ #SuexecUserGroup %user% %group% + DirectoryIndex index.php index.html + IncludeOptional %home%/%user%/conf/mail/%root_domain%/apache2.forcessl.conf* diff --git a/install/upgrade/manual/install_sieve.sh b/install/upgrade/manual/install_sieve.sh index 4b2a816..b19f791 100755 --- a/install/upgrade/manual/install_sieve.sh +++ b/install/upgrade/manual/install_sieve.sh @@ -21,7 +21,7 @@ source_conf "$HESTIA/install/upgrade/upgrade.conf" #----------------------------------------------------------# #check if string already exists -if grep "dovecot_virtual_delivery" /etc/exim4/exim4.conf.template; then +if grep "dovecot_virtual_delivery" /etc/exim/exim.conf.template; then echo "Plugin allready enabled" exit 0 fi @@ -60,10 +60,10 @@ if [ "$HAS_DOVECOT_SIEVE_INSTALLED" = "0" ]; then mkdir -p /etc/dovecot/sieve echo -e "require [\"fileinto\"];\n# rule:[SPAM]\nif header :contains \"X-Spam-Flag\" \"YES\" {\n fileinto \"INBOX.Spam\";\n}\n" > /etc/dovecot/sieve/default - # exim4 install - sed -i "s/\stransport = local_delivery/ transport = dovecot_virtual_delivery/" /etc/exim4/exim4.conf.template + # exim install + sed -i "s/\stransport = local_delivery/ transport = dovecot_virtual_delivery/" /etc/exim/exim.conf.template - sed -i "s/address_pipe:/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \${extract{1}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\/accounts}}}}@\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n\naddress_pipe:/g" /etc/exim4/exim4.conf.template + sed -i "s/address_pipe:/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \${extract{1}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim\/domains\/}}\/accounts}}}}@\${lookup{\$domain}dsearch{\/etc\/exim\/domains\/}}\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n\naddress_pipe:/g" /etc/exim/exim.conf.template # roundcube install mkdir -p $RC_CONFIG_DIR/plugins/managesieve @@ -82,9 +82,9 @@ if [ "$HAS_DOVECOT_SIEVE_INSTALLED" = "0" ]; then sed -i "s/\"archive\"/\"archive\", \"managesieve\"/g" $RC_CONFIG_DIR/config.inc.php - #restart dovecot and exim4 + #restart dovecot and exim systemctl restart dovecot > /dev/null 2>&1 - systemctl restart exim4 > /dev/null 2>&1 + systemctl restart exim > /dev/null 2>&1 else # Uninstall sieve if it exist if [ -f "/etc/dovecot/conf.d/90-sieve.conf" ]; then @@ -111,17 +111,17 @@ else # If sieve is installed... remove it. apt-get -qq remove --purge dovecot-sieve -y - # Exim4 - sed -i "s/\stransport = dovecot_virtual_delivery/ transport = local_delivery/" /etc/exim4/exim4.conf.template - sed -i "s/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \${extract{1}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains/}}\/accounts}}}}@\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim4\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim4\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n//g" /etc/exim4/exim4.conf.template + # Exim + sed -i "s/\stransport = dovecot_virtual_delivery/ transport = local_delivery/" /etc/exim/exim.conf.template + sed -i "s/dovecot_virtual_delivery:\n driver = pipe\n command = \/usr\/lib\/dovecot\/dovecot-lda -e -d \${extract{1}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim\/domains/}}\/accounts}}}}@\${lookup{\$domain}dsearch{\/etc\/exim\/domains\/}}\n delivery_date_add\n envelope_to_add\n return_path_add\n log_output = true\n log_defer_output = true\n user = \${extract{2}{:}{\${lookup{\$local_part}lsearch{\/etc\/exim\/domains\/\${lookup{\$domain}dsearch{\/etc\/exim\/domains\/}}\/passwd}}}}\n group = mail\n return_output\n//g" /etc/exim/exim.conf.template # Roundcube rm -f -r $RC_CONFIG_DIR/plugins/managesieve rm -f $RC_INSTALL_DIR/plugins/managesieve/config.inc.php sed -i "s/\"archive\", \"managesieve\"/\"archive\"/g" $RC_CONFIG_DIR/config.inc.php - #restart dovecot and exim4 + #restart dovecot and exim systemctl restart dovecot > /dev/null 2>&1 - systemctl restart exim4 > /dev/null 2>&1 + systemctl restart exim > /dev/null 2>&1 fi fi diff --git a/install/upgrade/manual/remove-mail-stack.sh b/install/upgrade/manual/remove-mail-stack.sh index 5ced801..1fa67f5 100644 --- a/install/upgrade/manual/remove-mail-stack.sh +++ b/install/upgrade/manual/remove-mail-stack.sh @@ -46,8 +46,8 @@ if [ "$IMAP_SYSTEM" == "dovecot" ]; then systemctl disable --now dovecot fi -if [ "$MAIL_SYSTEM" == "exim4" ]; then - echo Removing Exim4 +if [ "$MAIL_SYSTEM" == "exim" ]; then + echo Removing Exim sed -i "/^MAIL_SYSTEM/d" $HESTIA/conf/hestia.conf - systemctl disable --now exim4 + systemctl disable --now exim fi diff --git a/install/upgrade/patch/3661-exim-srs-support.patch b/install/upgrade/patch/3661-exim-srs-support.patch index ade59bb..252b849 100644 --- a/install/upgrade/patch/3661-exim-srs-support.patch +++ b/install/upgrade/patch/3661-exim-srs-support.patch @@ -1,5 +1,5 @@ 17a18,19 -> SRS_SECRET = ${readfile{/etc/exim4/srs.conf}} +> SRS_SECRET = ${readfile{/etc/exim/srs.conf}} > 326a332,348 > inbound_srs: @@ -20,7 +20,7 @@ > data = :fail: Invalid SRS recipient address > 358d379 -< condition = ${lookup{$local_part@$domain}lsearch{/etc/exim4/domains/${lookup{$domain}dsearch{/etc/exim4/domains/}}/aliases}{false}{true}} +< condition = ${lookup{$local_part@$domain}lsearch{/etc/exim/domains/${lookup{$domain}dsearch{/etc/exim/domains/}}/aliases}{false}{true}} 387a409,422 > remote_forwarded_smtp: > driver = smtp diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec index e7470d2..2bd69cf 100644 --- a/src/rpm/hestia/hestia.spec +++ b/src/rpm/hestia/hestia.spec @@ -3,7 +3,7 @@ Name: hestia Version: 1.9.6 -Release: 11%{dist} +Release: 12%{dist} Summary: Hestia Control Panel Group: System Environment/Base License: GPLv3 @@ -183,6 +183,9 @@ fi %{_tmpfilesdir}/%{name}.conf %changelog +* Mon Aug 10 2026 Alexey Berezhok - 1.9.6-12 +- Fixed work with exim and dovecot + * Mon May 04 2026 Alexey Berezhok - 1.9.6-11 - Added support bunkerweb diff --git a/src/rpm/nginx/hestia-nginx.spec b/src/rpm/nginx/hestia-nginx.spec index 78e9662..5a3a49d 100644 --- a/src/rpm/nginx/hestia-nginx.spec +++ b/src/rpm/nginx/hestia-nginx.spec @@ -6,8 +6,8 @@ %global _prefix /usr/local/hestia/nginx Name: hestia-nginx -Version: 1.27.1 -Release: 2%{dist} +Version: 1.31.3 +Release: 1%{dist} Summary: Hestia internal nginx web server Group: System Environment/Base URL: https://www.hestiacp.com @@ -116,6 +116,9 @@ mv %{buildroot}/usr/local/hestia/nginx/sbin/nginx %{buildroot}/usr/local/hestia/ %changelog +* Mon Aug 10 2026 Alexey Berezhok - 1.31.3-1 +- Upgrade to NGINX 1.31.3 mainline version + * Fri Jun 16 2023 myrevery - 1.25.1-1 - Upgrade to NGINX 1.25.1 mainline version - Implement TLS 1.3 0-RTT anti-replay diff --git a/src/rpm/php/hestia-php.spec b/src/rpm/php/hestia-php.spec index 5f98a37..c29aea4 100644 --- a/src/rpm/php/hestia-php.spec +++ b/src/rpm/php/hestia-php.spec @@ -2,7 +2,7 @@ %global _prefix /usr/local/hestia/php Name: hestia-php -Version: 8.2.28 +Version: 8.2.33 Release: 1%{dist} Summary: Hestia internal PHP Group: System Environment/Base @@ -103,6 +103,9 @@ cp %{SOURCE3} %{buildroot}/usr/local/hestia/php/lib/ %{_unitdir}/hestia-php.service %changelog +* Mon Aug 10 2026 Alexey Berezhok - 8.2.33-1 +- Update PHP version up to 8.2.33 + * Tue Jun 3 2025 Alexey Berezhok - 8.2.28-1 - Update PHP version up to 8.2.28 diff --git a/test/restore.bats b/test/restore.bats index 8771d17..a53e0f3 100644 --- a/test/restore.bats +++ b/test/restore.bats @@ -339,10 +339,10 @@ function validate_web_domain() { run v-list-mail-account $userbk $domain testaccount assert_success # Check if alias is created - assert_file_contains /etc/exim4/domains/$domain/aliases "testaccount@$domain" + assert_file_contains /etc/exim/domains/$domain/aliases "testaccount@$domain" # Check if expected rate limits are set - assert_file_contains /etc/exim4/domains/$domain/limits "testaccount@$domain:20" - assert_file_contains /etc/exim4/domains/$domain/limits "support@$domain:10" + assert_file_contains /etc/exim/domains/$domain/limits "testaccount@$domain:20" + assert_file_contains /etc/exim/domains/$domain/limits "support@$domain:10" } @test "Restore[3]: From Hestia [DB]" { @@ -432,10 +432,10 @@ function validate_web_domain() { run v-list-mail-account $userbk $domain testaccount assert_success # Check if alias is created - assert_file_contains /etc/exim4/domains/$domain/aliases "testaccount@$domain" + assert_file_contains /etc/exim/domains/$domain/aliases "testaccount@$domain" # Check if expected rate limits are set - assert_file_contains /etc/exim4/domains/$domain/limits "testaccount@$domain:20" - assert_file_contains /etc/exim4/domains/$domain/limits "support@$domain:10" + assert_file_contains /etc/exim/domains/$domain/limits "testaccount@$domain:20" + assert_file_contains /etc/exim/domains/$domain/limits "support@$domain:10" } @test "Restore[4]: From Hestia [DB]" { diff --git a/test/test.bats b/test/test.bats index cb98a3b..bf9a9c3 100755 --- a/test/test.bats +++ b/test/test.bats @@ -1610,7 +1610,7 @@ function check_ip_not_banned(){ @test "MAIL: Add account" { run v-add-mail-account $user $domain test "$userpass2" assert_success - assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain" + assert_file_contains /etc/exim/domains/$domain/limits "test@$domain" refute_output } @@ -1622,42 +1622,42 @@ function check_ip_not_banned(){ @test "MAIL: Add account 2" { run v-add-mail-account $user $domain random "$userpass2" assert_success - assert_file_contains /etc/exim4/domains/$domain/limits "random@$domain" + assert_file_contains /etc/exim/domains/$domain/limits "random@$domain" refute_output } @test "MAIL: Add account alias" { run v-add-mail-account-alias $user $domain test hestiacprocks assert_success - assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacprocks@$domain" + assert_file_contains /etc/exim/domains/$domain/aliases "hestiacprocks@$domain" refute_output } @test "MAIL: Add account alias 2" { run v-add-mail-account-alias $user $domain test hestiacprocks2 assert_success - assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacprocks2@$domain" + assert_file_contains /etc/exim/domains/$domain/aliases "hestiacprocks2@$domain" refute_output } @test "MAIL: Add account alias 3" { run v-add-mail-account-alias $user $domain test hestiacp assert_success - assert_file_contains /etc/exim4/domains/$domain/aliases "hestiacp@$domain" + assert_file_contains /etc/exim/domains/$domain/aliases "hestiacp@$domain" refute_output } @test "MAIL: Add account 3" { run v-add-mail-account $user $domain hestia "$userpass2" assert_success - assert_file_contains /etc/exim4/domains/$domain/limits "hestia@$domain" + assert_file_contains /etc/exim/domains/$domain/limits "hestia@$domain" refute_output } @test "MAIL: Add account 4" { run v-add-mail-account $user $domain hestiarocks3 "$userpass2" assert_success - assert_file_contains /etc/exim4/domains/$domain/limits "hestiarocks3@$domain" + assert_file_contains /etc/exim/domains/$domain/limits "hestiarocks3@$domain" refute_output } @@ -1694,7 +1694,7 @@ function check_ip_not_banned(){ @test "MAIL: Change rate limit" { run v-change-mail-account-rate-limit $user $domain test 10 - assert_file_contains /etc/exim4/domains/$domain/limits "test@$domain:10" + assert_file_contains /etc/exim/domains/$domain/limits "test@$domain:10" } @test "MAIL: Delete account" { @@ -2034,14 +2034,14 @@ function check_ip_not_banned(){ run v-add-sys-smtp-relay $domain info@$domain 1234-test 587 assert_success refute_output - assert_file_exist /etc/exim4/smtp_relay.conf + assert_file_exist /etc/exim/smtp_relay.conf } @test "System: Delete SMTP relay" { run v-delete-sys-smtp-relay assert_success refute_output - assert_file_not_exist /etc/exim4/smtp_relay.conf + assert_file_not_exist /etc/exim/smtp_relay.conf } #----------------------------------------------------------# diff --git a/web/edit/server/exim/index.php b/web/edit/server/exim/index.php index 44b08d3..8b6305e 100644 --- a/web/edit/server/exim/index.php +++ b/web/edit/server/exim/index.php @@ -45,7 +45,7 @@ if (!empty($_POST["save"])) { } } -$v_config_path = "/etc/exim/exim.conf"; +$v_config_path = "/etc/exim/exim.conf.template"; $v_service_name = strtoupper("exim"); // Read config diff --git a/web/edit/server/exim4/index.php b/web/edit/server/exim4/index.php index 9a88bec..8b6305e 100644 --- a/web/edit/server/exim4/index.php +++ b/web/edit/server/exim4/index.php @@ -30,7 +30,7 @@ if (!empty($_POST["save"])) { fwrite($fp, str_replace("\r\n", "\n", $_POST["v_config"])); fclose($fp); exec( - HESTIA_CMD . "v-change-sys-service-config " . $new_conf . " exim4 " . $v_restart, + HESTIA_CMD . "v-change-sys-service-config " . $new_conf . " exim " . $v_restart, $output, $return_var, ); @@ -45,7 +45,7 @@ if (!empty($_POST["save"])) { } } -$v_config_path = "/etc/exim4/exim4.conf.template"; +$v_config_path = "/etc/exim/exim.conf.template"; $v_service_name = strtoupper("exim"); // Read config