saibotk/pterodactyl-panel-docker
Archived
1
0
Fork 0
Code Releases Activity

adjust trusted proxies setup | Panel 0.7.15

Browse source
This commit is contained in:
saibotk 2019-08-18 12:35:04 +02:00
parent 63b7ef7f48
commit 9496f05331
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -21,8 +21,7 @@ of containers and Dockerfiles.
that Nginx performs better than Caddy in handling requests. In addition to this, that Nginx performs better than Caddy in handling requests. In addition to this,
Nginx, while having a more complicated configuration file, doesn't enforce HTTPS, Nginx, while having a more complicated configuration file, doesn't enforce HTTPS,
a feature of Caddy which only complicates the setup of the HTTP Docker container. a feature of Caddy which only complicates the setup of the HTTP Docker container.
3. Additionally, if the nginx receives a request from a reverse proxy, it will set the HSTS header
Also if the nginx receives a request from a reverse proxy, it will set the HSTS header
and redirect to HTTPS automatically. If you do not want this behaviour, adjust the `nginx.conf` and redirect to HTTPS automatically. If you do not want this behaviour, adjust the `nginx.conf`
as you like. as you like.

2
services/php/Dockerfile
View file

@ -1,6 +1,6 @@
FROM php:7.2-fpm-alpine FROM php:7.2-fpm-alpine
ENV PANEL_VERSION=v0.7.14 ENV PANEL_VERSION=v0.7.15
# Set up all the dependencies for the PHP container. # Set up all the dependencies for the PHP container.
RUN apk add --no-cache curl git supervisor tar unzip; \ RUN apk add --no-cache curl git supervisor tar unzip; \

4
services/php/install.sh
View file

@ -12,7 +12,7 @@ fi
echo "Are you sure you want to continue the install script? (Y/n)" echo "Are you sure you want to continue the install script? (Y/n)"
read -n1 run read -n1 run
if [ "$run" = "y" ] || [ "$run" = "Y" ] || [ "$run" = "" ]; then if [ "$run" = "y" ] || [ "$run" = "Y" ]; then
echo "Running install script." echo "Running install script."
echo "Waiting 15 seconds for MariaDB to be ready." echo "Waiting 15 seconds for MariaDB to be ready."
sleep 15 sleep 15
@ -25,7 +25,7 @@ if [ "$run" = "y" ] || [ "$run" = "Y" ] || [ "$run" = "" ]; then
if [ "$configureTPval" = "" ]; then if [ "$configureTPval" = "" ]; then
configureTPval="*" configureTPval="*"
fi fi
printf "\n\nTRUSTED_PROXIES=$configureTPval" >> .env grep -q 'TRUSTED_PROXIES.*' .env && sed -i .env -e 's/TRUSTED_PROXIES.*/TRUSTED_PROXIES='$configureTPval'/' || printf "\nTRUSTED_PROXIES=$configureTPval\n" >> .env
fi fi
php artisan key:generate --force php artisan key:generate --force