From 85290ee3cd1d13326181428d0428d3612b1b9a47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils-B=C3=B6rge=20Margotti?= Date: Sun, 25 Feb 2018 17:56:47 +0100 Subject: [PATCH 1/3] Update php to version 7.2 in vagrant file (#978) --- .dev/vagrant/provision.sh | 6 +++--- .dev/vagrant/pterodactyl.conf | 2 +- .gitignore | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) 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 From 5f3fdb6646d4471ac1563683166b49c275f54191 Mon Sep 17 00:00:00 2001 From: Jakob Date: Sun, 25 Feb 2018 17:58:49 +0100 Subject: [PATCH 2/3] improve issue template (#981) --- .github/ISSUE_TEMPLATE.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 2f3c18c72..505094c62 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,14 +1,24 @@ -Please describe your issue in full below. Include what products are affected, as well as what version(s) you are running. Please also include information about your system, such as `uname -a` and `php -v` and `docker info` if applicable. + + + * Panel or Daemon: * Version of Panel/Daemon: * Server's OS: * Your Computer's OS & Browser: -## Add Details Below: +------------------------ + From f46a97cd29472ba4f9e57cbebd9eb65add5a7a14 Mon Sep 17 00:00:00 2001 From: ShadowKitten Date: Sun, 25 Feb 2018 09:59:11 -0700 Subject: [PATCH 3/3] Fix language files after permission change. (#979) --- resources/lang/de/server.php | 2 +- resources/lang/en/server.php | 2 +- resources/lang/es/server.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/de/server.php b/resources/lang/de/server.php index d207dc4ad..355802b5e 100644 --- a/resources/lang/de/server.php +++ b/resources/lang/de/server.php @@ -124,7 +124,7 @@ return [ 'title' => 'Send Console Command', 'description' => 'Der User darf die Konsole benutzen.', ], - 'view_sftp' => [ + 'access_sftp' => [ 'title' => 'SFTP erlaubt', 'description' => 'Ermöglicht dem Benutzer, eine Verbindung mit dem vom Daemon bereitgestellten SFTP-Server herzustellen.', ], diff --git a/resources/lang/en/server.php b/resources/lang/en/server.php index 0d266835a..cd89e1f85 100644 --- a/resources/lang/en/server.php +++ b/resources/lang/en/server.php @@ -128,7 +128,7 @@ return [ 'title' => 'Send Console Command', 'description' => 'Allows sending a command from the console. If the user does not have stop or restart permissions they cannot send the application\'s stop command.', ], - 'view_sftp' => [ + 'access_sftp' => [ 'title' => 'SFTP Allowed', 'description' => 'Allows user to connect to the SFTP server provided by the daemon.', ], diff --git a/resources/lang/es/server.php b/resources/lang/es/server.php index 41aca3558..1cbe4701a 100644 --- a/resources/lang/es/server.php +++ b/resources/lang/es/server.php @@ -124,7 +124,7 @@ return [ 'title' => 'Enviar Comandos De La Consola', 'description' => 'Permite el envío de un comando desde la consola. Si el usuario no tiene permiso para detener o reiniciar, no puede enviar el comando de detención de la aplicación.', ], - 'view_sftp' => [ + 'access_sftp' => [ 'title' => 'SFTP permitido', 'description' => 'Permite al usuario conectarse al servidor SFTP proporcionado por el daemon.', ],