diff --git a/Vagrantfile b/Vagrantfile index 5516d34..1896eb9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -91,7 +91,6 @@ Vagrant.configure("2") do |config| wings.vm.synced_folder ".", "/vagrant", disabled: true wings.vm.synced_folder "#{vagrant_root}/code/wings", "/home/vagrant/wings", owner: "vagrant", group: "vagrant" - wings.vm.synced_folder "#{vagrant_root}/code/sftp-server", "/home/vagrant/sftp-server", owner: "vagrant", group: "vagrant" wings.vm.synced_folder "#{vagrant_root}/.data/certificates", "/etc/ssl/pterodactyl", owner: "vagrant", group: "vagrant" wings.vm.network :private_network, ip: "192.168.50.3" diff --git a/build/Dockerfile-panel b/build/Dockerfile-panel index c9ae7b7..199fe29 100644 --- a/build/Dockerfile-panel +++ b/build/Dockerfile-panel @@ -4,26 +4,25 @@ LABEL maintainer="dane@daneeveritt.com" \ description="Docker image allowing Pterodactyl Panel to run using Vagrant." \ org.opencontainers.image.source=https://github.com/pterodactyl/development -RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - \ +RUN curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - \ && curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list \ && sudo add-apt-repository -y ppa:ondrej/php \ && sudo apt -y update \ && sudo apt -y upgrade \ && sudo apt -y --no-install-recommends install software-properties-common \ - php7.4 \ - php7.4-cli \ - php7.4-gd \ - php7.4-mysql \ - php7.4-pdo \ - php7.4-mbstring \ - php7.4-tokenizer \ - php7.4-bcmath \ - php7.4-xml \ - php7.4-fpm \ - php7.4-curl \ - php7.4-zip \ - php7.4-xdebug \ + php8.0 \ + php8.0-cli \ + php8.0-common \ + php8.0-gd \ + php8.0-mysql \ + php8.0-mbstring \ + php8.0-bcmath \ + php8.0-xml \ + php8.0-fpm \ + php8.0-curl \ + php8.0-zip \ + php8.0-xdebug \ nginx \ tar \ unzip \ @@ -34,6 +33,7 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - \ yarn \ nano \ && curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer \ + && sudo apt autoremove -y \ && sudo rm -rf /var/lib/apt/lists/* EXPOSE 80 diff --git a/build/configs/nginx/pterodactyl.test.conf b/build/configs/nginx/pterodactyl.test.conf index ef86f19..5731c45 100644 --- a/build/configs/nginx/pterodactyl.test.conf +++ b/build/configs/nginx/pterodactyl.test.conf @@ -35,8 +35,6 @@ server { ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256'; ssl_prefer_server_ciphers on; - # See https://hstspreload.org/ before uncommenting the line below. - # add_header Strict-Transport-Security "max-age=15768000; preload;"; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; @@ -46,7 +44,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/var/run/php/php7.4-fpm.sock; + fastcgi_pass unix:/var/run/php/php8.0-fpm.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; diff --git a/build/configs/supervisor/pterodactyl.conf b/build/configs/supervisor/pterodactyl.conf index 64f2823..90c3837 100644 --- a/build/configs/supervisor/pterodactyl.conf +++ b/build/configs/supervisor/pterodactyl.conf @@ -9,7 +9,7 @@ redirect_stderr=true stdout_logfile=/srv/www/storage/logs/supervisor-worker.log [program:php-fpm] -command=/usr/sbin/php-fpm7.4 -F +command=/usr/sbin/php-fpm8.0 -F autostart=true autorestart=true priority=5 diff --git a/scripts/deploy_app.sh b/scripts/deploy_app.sh index acb8dd7..b495b92 100644 --- a/scripts/deploy_app.sh +++ b/scripts/deploy_app.sh @@ -37,7 +37,7 @@ sudo rm -f /srv/www sudo ln -s /home/vagrant/app /srv/www # Configure OPCache -sudo cat | sudo tee -a /etc/php/7.4/cli/conf.d/10-opcache.ini > /dev/null < /dev/null < /dev/null < /dev/null <