Skip to content

Commit b279e00

Browse files
OSPanelOSPanel
committed
Update configs
1 parent 7bb63a5 commit b279e00

11 files changed

Lines changed: 97 additions & 123 deletions

File tree

‎resources/modules/Apache/conf/snippets/compression.conf‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
# Requires: mod_filter; mod_headers; plus mod_brotli and/or mod_deflate
66
# ======================================================================
77

8-
<IfModule mod_filter.c>
8+
<IfModule filter_module>
99

10-
<IfModule mod_brotli.c>
10+
<IfModule brotli_module>
11+
BrotliAlterETag NoChange
1112
BrotliCompressionQuality 3
1213
AddOutputFilterByType BROTLI_COMPRESS \
1314
text/html \
@@ -44,7 +45,8 @@
4445
font/otf
4546
</IfModule>
4647

47-
<IfModule mod_deflate.c>
48+
<IfModule deflate_module>
49+
DeflateAlterETag NoChange
4850
DeflateCompressionLevel 3
4951
AddOutputFilterByType DEFLATE \
5052
text/html \
@@ -83,7 +85,7 @@
8385

8486
</IfModule>
8587

86-
<IfModule mod_headers.c>
88+
<IfModule headers_module>
8789
<FilesMatch "\.(html?|css|js|mjs|json|xml|svg|txt|csv|map|webmanifest|vtt|wasm|eot|ttf|otf)$">
8890
Header merge Vary Accept-Encoding
8991
</FilesMatch>

‎resources/modules/Apache/conf/snippets/force_https.conf‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎resources/modules/Apache/conf/snippets/force_non_www.conf‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎resources/modules/Apache/ospanel_data/default/templates/httpd.conf‎

Lines changed: 59 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ LoadModule authz_host_module modules/mod_authz_host.so
5555
# LoadModule authz_owner_module modules/mod_authz_owner.so
5656
LoadModule authz_user_module modules/mod_authz_user.so
5757
LoadModule autoindex_module modules/mod_autoindex.so
58-
# LoadModule brotli_module modules/mod_brotli.so
58+
LoadModule brotli_module modules/mod_brotli.so
5959
# LoadModule bucketeer_module modules/mod_bucketeer.so
6060
# LoadModule buffer_module modules/mod_buffer.so
6161
# LoadModule cache_module modules/mod_cache.so
@@ -71,7 +71,7 @@ LoadModule autoindex_module modules/mod_autoindex.so
7171
# LoadModule dav_fs_module modules/mod_dav_fs.so
7272
# LoadModule dav_lock_module modules/mod_dav_lock.so
7373
# LoadModule dbd_module modules/mod_dbd.so
74-
# LoadModule deflate_module modules/mod_deflate.so
74+
LoadModule deflate_module modules/mod_deflate.so
7575
# LoadModule dialup_module modules/mod_dialup.so
7676
LoadModule dir_module modules/mod_dir.so
7777
# LoadModule dumpio_module modules/mod_dumpio.so
@@ -438,7 +438,7 @@ AddDefaultCharset utf-8
438438
</IfModule>
439439
</Macro>
440440

441-
<Macro Host_Static $host $bind_ip $server_aliases $base_dir $web_root>
441+
<Macro Host_Static $host $bind_ip $server_aliases $web_root>
442442
<VirtualHost $bind_ip>
443443
<Directory "$web_root">
444444
AllowOverride All
@@ -456,19 +456,23 @@ AddDefaultCharset utf-8
456456
ServerName $host
457457
ServerAlias $server_aliases
458458
DocumentRoot "$web_root"
459+
460+
# Include "${SRVROOT}/conf/snippets/block_hidden_files.conf"
461+
# Include "${SRVROOT}/conf/snippets/block_sensitive_files.conf"
462+
# Include "${SRVROOT}/conf/snippets/compression.conf"
463+
# Include "${SRVROOT}/conf/snippets/quiet_static_logs.conf"
464+
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
465+
459466
CustomLog "${ROOTDIR}/logs/domains/$host_access.log" combined env=!dontlog
460467
ErrorLog "${ROOTDIR}/logs/domains/$host_error.log"
461468
# SetEnvIf status 404 log_404
462469
# CustomLog "${ROOTDIR}/logs/domains/$host_404.log" combined env=log_404
463470

464-
# Include "${SRVROOT}/conf/snippets/compression.conf"
465-
# Include "${SRVROOT}/conf/snippets/force_https.conf"
466-
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
467471
IncludeOptional "${SRVROOT}/conf/custom/$host.conf"
468472
</VirtualHost>
469473
</Macro>
470474

471-
<Macro Host_Static_SSL $host $bind_ip $server_aliases $base_dir $web_root $tls_cert_file $tls_key_file>
475+
<Macro Host_Static_SSL $host $bind_ip $server_aliases $web_root $tls_cert_file $tls_key_file>
472476
<IfModule ssl_module>
473477
<VirtualHost $bind_ip>
474478
ServerName $host
@@ -493,20 +497,24 @@ AddDefaultCharset utf-8
493497
</FilesMatch>
494498
</Directory>
495499
DocumentRoot "$web_root"
500+
501+
# Include "${SRVROOT}/conf/snippets/block_hidden_files.conf"
502+
# Include "${SRVROOT}/conf/snippets/block_sensitive_files.conf"
503+
# Include "${SRVROOT}/conf/snippets/compression.conf"
504+
# Include "${SRVROOT}/conf/snippets/quiet_static_logs.conf"
505+
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
506+
496507
CustomLog "${ROOTDIR}/logs/domains/$host_access.log" combined env=!dontlog
497508
ErrorLog "${ROOTDIR}/logs/domains/$host_error.log"
498509
# SetEnvIf status 404 log_404
499510
# CustomLog "${ROOTDIR}/logs/domains/$host_404.log" combined env=log_404
500-
501-
# Include "${SRVROOT}/conf/snippets/compression.conf"
502-
# Include "${SRVROOT}/conf/snippets/force_https.conf"
503-
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
511+
504512
IncludeOptional "${SRVROOT}/conf/custom/$host.conf"
505513
</VirtualHost>
506514
</IfModule>
507515
</Macro>
508516

509-
<Macro Host_PHP $host $bind_ip $server_aliases $base_dir $web_root $backend_ip $backend_port>
517+
<Macro Host_PHP $host $bind_ip $server_aliases $web_root $backend_ip $backend_port>
510518
<VirtualHost $bind_ip>
511519
<Directory "$web_root">
512520
AllowOverride All
@@ -524,15 +532,18 @@ AddDefaultCharset utf-8
524532
ServerName $host
525533
ServerAlias $server_aliases
526534
DocumentRoot "$web_root"
535+
536+
# Include "${SRVROOT}/conf/snippets/block_hidden_files.conf"
537+
# Include "${SRVROOT}/conf/snippets/block_sensitive_files.conf"
538+
# Include "${SRVROOT}/conf/snippets/compression.conf"
539+
# Include "${SRVROOT}/conf/snippets/quiet_static_logs.conf"
540+
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
541+
527542
CustomLog "${ROOTDIR}/logs/domains/$host_access.log" combined env=!dontlog
528543
ErrorLog "${ROOTDIR}/logs/domains/$host_error.log"
529544
# SetEnvIf status 404 log_404
530545
# CustomLog "${ROOTDIR}/logs/domains/$host_404.log" combined env=log_404
531546

532-
# Include "${SRVROOT}/conf/snippets/compression.conf"
533-
# Include "${SRVROOT}/conf/snippets/force_https.conf"
534-
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
535-
536547
<IfModule dir_module>
537548
DirectoryIndex index.php index.html index.htm index.shtml
538549
# FallbackResource /index.php
@@ -561,7 +572,7 @@ AddDefaultCharset utf-8
561572
</VirtualHost>
562573
</Macro>
563574

564-
<Macro Host_PHP_SSL $host $bind_ip $server_aliases $base_dir $web_root $tls_cert_file $tls_key_file $backend_ip $backend_port>
575+
<Macro Host_PHP_SSL $host $bind_ip $server_aliases $web_root $tls_cert_file $tls_key_file $backend_ip $backend_port>
565576
<IfModule ssl_module>
566577
<VirtualHost $bind_ip>
567578
ServerName $host
@@ -586,14 +597,17 @@ AddDefaultCharset utf-8
586597
</FilesMatch>
587598
</Directory>
588599
DocumentRoot "$web_root"
600+
601+
# Include "${SRVROOT}/conf/snippets/block_hidden_files.conf"
602+
# Include "${SRVROOT}/conf/snippets/block_sensitive_files.conf"
603+
# Include "${SRVROOT}/conf/snippets/compression.conf"
604+
# Include "${SRVROOT}/conf/snippets/quiet_static_logs.conf"
605+
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
606+
589607
CustomLog "${ROOTDIR}/logs/domains/$host_access.log" combined env=!dontlog
590608
ErrorLog "${ROOTDIR}/logs/domains/$host_error.log"
591609
# SetEnvIf status 404 log_404
592610
# CustomLog "${ROOTDIR}/logs/domains/$host_404.log" combined env=log_404
593-
594-
# Include "${SRVROOT}/conf/snippets/compression.conf"
595-
# Include "${SRVROOT}/conf/snippets/force_https.conf"
596-
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
597611

598612
<IfModule dir_module>
599613
DirectoryIndex index.php index.html index.htm index.shtml
@@ -621,7 +635,7 @@ AddDefaultCharset utf-8
621635
</IfModule>
622636
</Macro>
623637

624-
<Macro Host_Proxy $host $bind_ip $server_aliases $base_dir $web_root $backend_ip $backend_port>
638+
<Macro Host_Proxy $host $bind_ip $server_aliases $web_root $backend_ip $backend_port>
625639
<VirtualHost $bind_ip>
626640
<Directory "$web_root">
627641
AllowOverride All
@@ -638,18 +652,22 @@ AddDefaultCharset utf-8
638652
ServerName $host
639653
ServerAlias $server_aliases
640654
DocumentRoot "$web_root"
655+
656+
# Include "${SRVROOT}/conf/snippets/block_hidden_files.conf"
657+
# Include "${SRVROOT}/conf/snippets/block_sensitive_files.conf"
658+
# Include "${SRVROOT}/conf/snippets/compression.conf"
659+
# Include "${SRVROOT}/conf/snippets/quiet_static_logs.conf"
660+
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
661+
641662
CustomLog "${ROOTDIR}/logs/domains/$host_access.log" combined env=!dontlog
642663
ErrorLog "${ROOTDIR}/logs/domains/$host_error.log"
643664
# SetEnvIf status 404 log_404
644665
# CustomLog "${ROOTDIR}/logs/domains/$host_404.log" combined env=log_404
645666

646-
# Include "${SRVROOT}/conf/snippets/compression.conf"
647-
# Include "${SRVROOT}/conf/snippets/force_https.conf"
648-
649-
# ProxyPassMatch "\.(svg|png|jpe?g|gif|webp|avif|jxl|ico|tiff?|heic)$" "!"
650-
# ProxyPassMatch "\.(css|m?js|map|webmanifest|wasm|json|jsonld|geojson|xml|txt|csv|pdf)$" "!"
651-
# ProxyPassMatch "\.(eot|otf|ttc?|woff2?)$" "!"
652-
# ProxyPassMatch "\.(mp[34g]|mov|webm|mpe?g|avi|ogv|wav|ogg|m4a|aac|midi?)$" "!"
667+
ProxyPassMatch "\.(svg|png|jpe?g|gif|webp|avif|jxl|ico|tiff?|heic)$" "!"
668+
ProxyPassMatch "\.(css|m?js|map|webmanifest|wasm|json|jsonld|geojson|xml|txt|csv|pdf)$" "!"
669+
ProxyPassMatch "\.(eot|otf|ttc?|woff2?)$" "!"
670+
ProxyPassMatch "\.(mp[34g]|mov|webm|mpe?g|avi|ogv|wav|ogg|m4a|aac|midi?)$" "!"
653671

654672
<IfModule proxy_module>
655673
<IfModule proxy_http_module>
@@ -674,7 +692,7 @@ AddDefaultCharset utf-8
674692
</VirtualHost>
675693
</Macro>
676694

677-
<Macro Host_Proxy_SSL $host $bind_ip $server_aliases $base_dir $web_root $tls_cert_file $tls_key_file $backend_ip $backend_port>
695+
<Macro Host_Proxy_SSL $host $bind_ip $server_aliases $web_root $tls_cert_file $tls_key_file $backend_ip $backend_port>
678696
<IfModule ssl_module>
679697
<VirtualHost $bind_ip>
680698
ServerName $host
@@ -698,18 +716,22 @@ AddDefaultCharset utf-8
698716
</FilesMatch>
699717
</Directory>
700718
DocumentRoot "$web_root"
719+
720+
# Include "${SRVROOT}/conf/snippets/block_hidden_files.conf"
721+
# Include "${SRVROOT}/conf/snippets/block_sensitive_files.conf"
722+
# Include "${SRVROOT}/conf/snippets/compression.conf"
723+
# Include "${SRVROOT}/conf/snippets/quiet_static_logs.conf"
724+
Include "${SRVROOT}/conf/snippets/static_cache_control.conf"
725+
701726
CustomLog "${ROOTDIR}/logs/domains/$host_access.log" combined env=!dontlog
702727
ErrorLog "${ROOTDIR}/logs/domains/$host_error.log"
703728
# SetEnvIf status 404 log_404
704729
# CustomLog "${ROOTDIR}/logs/domains/$host_404.log" combined env=log_404
705730

706-
# Include "${SRVROOT}/conf/snippets/compression.conf"
707-
# Include "${SRVROOT}/conf/snippets/force_https.conf"
708-
709-
# ProxyPassMatch "\.(svg|png|jpe?g|gif|webp|avif|jxl|ico|tiff?|heic)$" "!"
710-
# ProxyPassMatch "\.(css|m?js|map|webmanifest|wasm|json|jsonld|geojson|xml|txt|csv|pdf)$" "!"
711-
# ProxyPassMatch "\.(eot|otf|ttc?|woff2?)$" "!"
712-
# ProxyPassMatch "\.(mp[34g]|mov|webm|mpe?g|avi|ogv|wav|ogg|m4a|aac|midi?)$" "!"
731+
ProxyPassMatch "\.(svg|png|jpe?g|gif|webp|avif|jxl|ico|tiff?|heic)$" "!"
732+
ProxyPassMatch "\.(css|m?js|map|webmanifest|wasm|json|jsonld|geojson|xml|txt|csv|pdf)$" "!"
733+
ProxyPassMatch "\.(eot|otf|ttc?|woff2?)$" "!"
734+
ProxyPassMatch "\.(mp[34g]|mov|webm|mpe?g|avi|ogv|wav|ogg|m4a|aac|midi?)$" "!"
713735

714736
<IfModule proxy_module>
715737
<IfModule proxy_http_module>

‎resources/modules/Caddy/ospanel_data/default/templates/caddy.conf‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,8 @@
492492
# Works only if trusted_proxies_strict is enabled
493493
(block_untrusted_proxy) {
494494
@untrusted {
495-
not remote_ip forwarded
495+
# not remote_ip cloudflare
496+
not remote_ip private_ranges
496497
}
497498
handle @untrusted {
498499
abort
@@ -525,7 +526,6 @@
525526
# Timeouts
526527
(timeouts_config) {
527528
dial_timeout 5s
528-
response_header_timeout 15m
529529
read_timeout 15m
530530
write_timeout 60s
531531
}
@@ -609,10 +609,10 @@
609609
}
610610
}
611611
rewrite @indexphp {file_match.relative}
612+
request_header X-Request-Id {http.request.uuid}
612613

613614
@php path *.php
614615
php_fastcgi @php {args[1]}:{args[2]} {
615-
env X_REQUEST_ID {http.request.uuid}
616616
import env_{args[0]}
617617
# env COUNTRY_CODE {geoip2.country_code}
618618
# env COUNTRY_NAME {geoip2.country_name}
@@ -642,6 +642,8 @@
642642

643643
# import webdav_config
644644

645+
request_header X-Request-Id {http.request.uuid}
646+
645647
php_fastcgi {args[1]}:{args[2]} {
646648
env X_REQUEST_ID {http.request.uuid}
647649
import env_{args[0]}
@@ -675,9 +677,9 @@
675677
# file_server
676678
# }
677679

678-
reverse_proxy {args[1]}:{args[2]} {
679-
header_up X-Request-Id {http.request.uuid}
680+
request_header X-Request-Id {http.request.uuid}
680681

682+
reverse_proxy {args[1]}:{args[2]} {
681683
transport http {
682684
import timeouts_config
683685
}

‎resources/modules/Nginx/conf/snippets/force_non_www.conf‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
# Redirect www.example.com to example.com
22

3-
if ($http_host ~* '^www\.(.+)$') {
4-
if ($http_x_forwarded_proto ~* '^https$') {
5-
return 301 https://$1$request_uri;
6-
}
7-
}
8-
9-
if ($http_host ~* '^www\.(.+)$') {
10-
if ($scheme = "https") {
11-
if ($http_x_forwarded_proto = "") {
12-
return 301 https://$1$request_uri;
13-
}
14-
}
15-
}
16-
17-
if ($http_host ~* '^www\.(.+)$') {
18-
if ($scheme != "https") {
19-
if ($http_x_forwarded_proto !~* '^https$') {
20-
return 301 http://$1$request_uri;
21-
}
22-
}
3+
if ($non_www_host != "") {
4+
return 301 $redirect_proto://$non_www_host$request_uri;
235
}

‎resources/modules/Nginx/conf/snippets/static_cache_control.conf‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎resources/modules/Nginx/ospanel_data/default/templates/host_php.conf‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
# include snippets/block_hidden_files.conf; # block hidden files and folders
66
# include snippets/block_sensitive_files.conf; # block backup/config/log files
77
# include snippets/quiet_static_logs.conf; # disable logs for favicon/robots
8-
9-
include snippets/static_cache_control.conf; # enable Cache-Control header for static files
108
include snippets/maintenance_mode.conf; # enable site-wide maintenance mode
119
include snippets/friendly_errors.conf; # enable friendly error pages
12-
1310
# include snippets/disable_buffering.conf; # disable fastcgi & proxy buffering
1411
# include snippets/security_fcgi_headers.conf; # add security headers for fastcgi host
1512
# include snippets/fallback_redirect.conf; # fallback to index.php
16-
13+
14+
location ~* \.(svg|png|jpe?g|gif|webp|avif|jxl|ico|tiff?|heic|css|js|mjs|map|webmanifest|wasm|json|jsonld|geojson|xml|txt|csv|pdf|eot|otf|ttf|ttc|woff2?|mp4|mov|webm|mpe?g|avi|ogv|mp3|wav|ogg|m4a|aac|mid|midi)$ {
15+
add_header Cache-Control "max-age=0, must-revalidate" always;
16+
try_files $uri =404;
17+
}
18+
1719
# Enable directory listing
1820
autoindex on;
1921

0 commit comments

Comments
 (0)