Skip to content

Commit 85290ee

Browse files
Nols1000DaneEveritt
authored andcommitted
Update php to version 7.2 in vagrant file (pterodactyl#978)
1 parent bdbed77 commit 85290ee

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.dev/vagrant/provision.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export DEBIAN_FRONTEND=noninteractive
1919
debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password password pterodactyl'
2020
debconf-set-selections <<< 'mariadb-server-5.5 mysql-server/root_password_again password pterodactyl'
2121
# actually install
22-
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
22+
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
2323

2424
echo "Install composer"
2525
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
@@ -32,8 +32,8 @@ systemctl enable mailhog.service
3232
systemctl start mailhog
3333

3434
echo "Configure xDebug"
35-
cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.1/mods-available/
36-
systemctl restart php7.1-fpm
35+
cp /var/www/html/pterodactyl/.dev/vagrant/xdebug.ini /etc/php/7.2/mods-available/
36+
systemctl restart php7.2-fpm
3737

3838
echo "Configure nginx"
3939
cp /var/www/html/pterodactyl/.dev/vagrant/pterodactyl.conf /etc/nginx/sites-available/

.dev/vagrant/pterodactyl.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ server {
3131
location ~ \.php$ {
3232
fastcgi_split_path_info ^(.+\.php)(/.+)$;
3333
# the fastcgi_pass path needs to be changed accordingly when using CentOS
34-
fastcgi_pass unix:/var/run/php/php7.1-fpm.sock;
34+
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
3535
fastcgi_index index.php;
3636
include fastcgi_params;
3737
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,7 @@ docker-compose.yml
2525
# for image related files
2626
misc
2727
.phpstorm.meta.php
28-
.php_cs.cache
28+
.php_cs.cache
29+
30+
# Vagrant
31+
*.log

0 commit comments

Comments
 (0)