pterodactyl/development
1
0
Fork 0
mirror of https://github.com/pterodactyl/development.git synced 2025-12-10 10:44:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

PHP8 and mimsc cleanup

Browse Source
This commit is contained in:
Dane Everitt 2021-01-21 20:43:35 -08:00
parent 4951aaebf4
commit 5ea2907be8
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
7 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -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"

28
build/Dockerfile-panel
View File

@ -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

4
build/configs/nginx/pterodactyl.test.conf
View File

@ -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";

2
build/configs/supervisor/pterodactyl.conf
View File

@ -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

6
scripts/deploy_app.sh
View File

@ -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 <<EOF
sudo cat | sudo tee -a /etc/php/8.0/cli/conf.d/10-opcache.ini > /dev/null <<EOF
opcache.revalidate_freq = 0
opcache.max_accelerated_files = 11003
opcache.memory_consumption = 192
@ -47,7 +47,7 @@ opcache.enable = 1
opcache.enable_cli = 1
EOF
sudo cat | sudo tee -a /etc/php/7.4/fpm/conf.d/20-xdebug.ini > /dev/null <<EOF
sudo cat | sudo tee -a /etc/php/8.0/fpm/conf.d/20-xdebug.ini > /dev/null <<EOF
xdebug.remote_enable = 1
xdebug.remote_host = host.docker.internal
xdebug.remote_port = 9000
@ -68,4 +68,4 @@ sudo supervisorctl update
sudo supervisorctl start pteroq:*
sudo supervisorctl restart nginx
echo "done."
echo "done."

11
scripts/provision_wings.sh
View File

@ -10,7 +10,7 @@ add-apt-repository ppa:longsleep/golang-backports
# Perform the installation of the required software.
apt -y update
apt -y --no-install-recommends install tar zip unzip make gcc g++ gdb python docker-ce docker-ce-cli containerd.io golang-go
apt -y --no-install-recommends install iputils-ping tar zip unzip make gcc g++ gdb python docker-ce docker-ce-cli containerd.io golang-go
# Install delve for Go debugging support.
GOBIN=/usr/local/bin go get github.com/go-delve/delve/cmd/dlv
@ -25,14 +25,9 @@ systemctl enable docker --now
curl -fsSL https://github.com/bcicen/ctop/releases/download/v0.7.1/ctop-0.7.1-linux-amd64 -o /usr/local/bin/ctop
chmod +x /usr/local/bin/ctop
# Move certificates to sensible default locations
cp /etc/ssl/pterodactyl/rootCA.pem /etc/ssl/certs/mkcert.pem
mkdir -p /etc/letsencrypt/live/wings.pterodactyl.test/
cp /etc/ssl/pterodactyl/pterodactyl.test.pem /etc/letsencrypt/live/wings.pterodactyl.test/fullchain.pem
cp /etc/ssl/pterodactyl/pterodactyl.test-key.pem /etc/letsencrypt/live/wings.pterodactyl.test/privkey.pem
# create config directory
mkdir /etc/pterodactyl /var/log/pterodactyl
mkdir -p /etc/pterodactyl /var/log/pterodactyl
cp /etc/ssl/pterodactyl/root_ca.pem /etc/ssl/certs/mkcert.pem
# ensure permissions are set correctly
chown -R vagrant:vagrant /home/vagrant /etc/pterodactyl /var/log/pterodactyl

4
setup.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
CURRENT_DIRECTORY=$(pwd)
CURRENT_DIRECTORY="$(pwd)"
cd /tmp
vagrant plugin install vagrant-vbguest
@ -19,7 +19,7 @@ mkcert pterodactyl.test '*.pterodactyl.test'
mv *pterodactyl.test*-key.pem .data/certificates/pterodactyl.test-key.pem
mv *pterodactyl.test*.pem .data/certificates/pterodactyl.test.pem
cp $(mkcert -CAROOT)/rootCA.pem .data/certificates/
cp "$(mkcert -CAROOT)/rootCA.pem" .data/certificates/root_ca.pem
# sudo gem install docker-sync
# docker-sync start