diff --git a/.dev/vagrant/provision.sh b/.dev/vagrant/provision.sh index 41b3fa920..38dc27ad8 100644 --- a/.dev/vagrant/provision.sh +++ b/.dev/vagrant/provision.sh @@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password password pterodactyl' debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password_again password pterodactyl' # actually install -apt-get install -y php7.1 php7.1-cli php7.1-gd php7.1-mysql php7.1-pdo php7.1-mbstring php7.1-tokenizer php7.1-bcmath php7.1-xml php7.1-fpm php7.1-memcached php7.1-curl php7.1-zip php-xdebug mariadb-server nginx curl tar unzip git memcached > /dev/null +apt-get install -y php7.2 php7.2-cli php7.2-gd php7.2-mysql php7.2-pdo php7.2-mbstring php7.2-tokenizer php7.2-bcmath php7.2-xml php7.2-fpm php7.2-memcached php7.2-curl php7.2-zip php-xdebug mariadb-server nginx curl tar unzip git memcached > /dev/null echo "Install composer" curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer @@ -32,8 +32,8 @@ systemctl enable mailhog.service systemctl start mailhog echo "Configure xDebug" -cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.1/mods-available/ -systemctl restart php7.1-fpm +cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.2/mods-available/ +systemctl restart php7.2-fpm echo "Configure nginx" cp /var/www/html/pterodactyl/.dev/vagrant/pterodactyl.conf /etc/nginx/sites-available/ diff --git a/.dev/vagrant/pterodactyl.conf b/.dev/vagrant/pterodactyl.conf index d83849a97..343cbad5f 100644 --- a/.dev/vagrant/pterodactyl.conf +++ b/.dev/vagrant/pterodactyl.conf @@ -31,7 +31,7 @@ server { location ~ \.php$ { fastcgi_split_path_info ^(.+\.php)(/.+)$; # the fastcgi_pass path needs to be changed accordingly when using CentOS - fastcgi_pass unix:/var/run/php/php7.1-fpm.sock; + fastcgi_pass unix:/var/run/php/php7.2-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/.gitignore b/.gitignore index 2422de18a..8c2fb9405 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,7 @@ docker-compose.yml # for image related files misc .phpstorm.meta.php -.php_cs.cache +.php_cs.cache + +# Vagrant +*.log