Merge branch 'pterodactyl:develop' into patch-1

pterodactyl · Nov 28, 2022 · e4b7138 · e4b7138
2 parents 255b439 + a1a5275
commit e4b7138
Show file tree

Hide file tree

Showing 82 changed files with 745 additions and 883 deletions.
diff --git a/.github/docker/Caddyfile b/.github/docker/Caddyfile
@@ -0,0 +1,30 @@
+:8080 {
+	root * /var/www/pterodactyl/public/
+	file_server
+
+	header {
+		-Server
+		-X-Powered-By
+		Referrer-Policy "same-origin"
+		X-Frame-Options "deny"
+		X-XSS-Protection "1; mode=block"
+		X-Content-Type-Options "nosniff"
+	}
+
+	encode gzip zstd
+
+	php_fastcgi 127.0.0.1:9000 {
+		trusted_proxies 172.20.0.0/16
+	}
+
+	@startsWithDot {
+		path \/\.
+		not path .well-known
+	}
+	rewrite @startsWithDot /index.php{uri}
+
+	@phpRewrite {
+		not file favicon.ico
+	}
+	try_files @phpRewrite {path} {path}/ /index.php?{query}
+}
diff --git a/.github/docker/README.md b/.github/docker/README.md
diff --git a/.github/docker/default.conf b/.github/docker/default.conf
diff --git a/.github/docker/default_ssl.conf b/.github/docker/default_ssl.conf
diff --git a/.github/docker/entrypoint.sh b/.github/docker/entrypoint.sh
diff --git a/.github/docker/php-fpm.conf b/.github/docker/php-fpm.conf
@@ -0,0 +1,21 @@
+[global]
+error_log = /dev/stderr
+daemonize = no
+
+[www]
+user  = nobody
+group = nobody
+
+listen = 127.0.0.1:9000
+
+pm                      = dynamic
+pm.start_servers        = 4
+pm.min_spare_servers    = 4
+pm.max_spare_servers    = 16
+pm.max_children         = 64
+pm.max_requests         = 256
+
+clear_env = no
+catch_workers_output = yes
+
+decorate_workers_output = no