From b7b58d840e9fa0c80fb208525145203eefee78ab Mon Sep 17 00:00:00 2001 From: Jakob Date: Wed, 7 Mar 2018 06:10:43 +0100 Subject: [PATCH 1/5] Improve the Vagrantfile a little (#1025) --- Vagrantfile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index ed4b5bd4c..1eb62f5dc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,13 +1,9 @@ Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/xenial64" + config.vm.box = "bento/ubuntu-16.04" config.vm.synced_folder "./", "/var/www/html/pterodactyl", owner: "www-data", group: "www-data" - #config.vm.provision :file, source: ".dev/vagrant/pterdactyl.conf", destination: "/etc/nginx/sites-available/pterodactyl.conf" - #config.vm.provision :file, source: ".dev/vagrant/pteroq.service", destination: "/etc/systemd/system/pteroq.service" - #config.vm.provision :file, source: ".dev/vagrant/mailhog.service", destination: "/etc/systemd/system/mailhog.service" - #config.vm.provision :file, source: ".dev/vagrant/.env", destination: "/var/www/html/pterodactyl/.env" config.vm.provision :shell, path: ".dev/vagrant/provision.sh" config.vm.network :private_network, ip: "192.168.50.2" @@ -16,6 +12,6 @@ Vagrant.configure("2") do |config| config.vm.network :forwarded_port, guest: 3306, host: 53306 # Config for the vagrant-dns plugin (https://github.com/BerlinVagrant/vagrant-dns) - config.dns.tld = "app" - config.dns.patterns = [/^pterodactyl.app$/] + config.dns.tld = "test" + config.dns.patterns = [/^pterodactyl.test$/] end From 1d623a319bd9b6997de40be29af575e860641147 Mon Sep 17 00:00:00 2001 From: arajdon Date: Wed, 7 Mar 2018 06:11:05 +0100 Subject: [PATCH 2/5] Update Teamspeak 3.1.1 (#1022) Added "\n\ntouch \/mnt\/server\/.ts3server_license_accepted" and changed version number. I've tested this changes on my installation. Works fine. Thats my first PR. Hope thats ok so. --- .../seeds/eggs/voice-servers/egg-teamspeak3-server.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json index fe73a1665..927978d23 100644 --- a/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json +++ b/database/seeds/eggs/voice-servers/egg-teamspeak3-server.json @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/tmp\n\ncurl -sSLO http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\n\ntar -xjvf teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\ncp -r teamspeak3-server_linux_amd64\/* \/mnt\/server\n\necho \"machine_id=\ndefault_voice_port=${SERVER_PORT}\nvoice_ip=0.0.0.0\nlicensepath=\nfiletransfer_port=30033\nfiletransfer_ip=\nquery_port=${SERVER_PORT}\nquery_ip=0.0.0.0\nquery_ip_whitelist=query_ip_whitelist.txt\nquery_ip_blacklist=query_ip_blacklist.txt\ndbplugin=ts3db_sqlite3\ndbpluginparameter=\ndbsqlpath=sql\/\ndbsqlcreatepath=create_sqlite\/\ndbconnections=10\nlogpath=logs\nlogquerycommands=0\ndbclientkeepdays=30\nlogappend=0\nquery_skipbruteforcecheck=0\" > \/mnt\/server\/ts3server.ini", + "script": "#!\/bin\/ash\n# TS3 Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add tar curl\n\ncd \/tmp\n\ncurl -sSLO http:\/\/dl.4players.de\/ts\/releases\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\n\ntar -xjvf teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\ncp -r teamspeak3-server_linux_amd64\/* \/mnt\/server\n\necho \"machine_id=\ndefault_voice_port=${SERVER_PORT}\nvoice_ip=0.0.0.0\nlicensepath=\nfiletransfer_port=30033\nfiletransfer_ip=\nquery_port=${SERVER_PORT}\nquery_ip=0.0.0.0\nquery_ip_whitelist=query_ip_whitelist.txt\nquery_ip_blacklist=query_ip_blacklist.txt\ndbplugin=ts3db_sqlite3\ndbpluginparameter=\ndbsqlpath=sql\/\ndbsqlcreatepath=create_sqlite\/\ndbconnections=10\nlogpath=logs\nlogquerycommands=0\ndbclientkeepdays=30\nlogappend=0\nquery_skipbruteforcecheck=0\" > \/mnt\/server\/ts3server.ini\n\ntouch \/mnt\/server\/.ts3server_license_accepted", "container": "alpine:3.4", "entrypoint": "ash" } @@ -27,10 +27,10 @@ "name": "Server Version", "description": "The version of Teamspeak 3 to use when running the server.", "env_variable": "TS_VERSION", - "default_value": "3.0.13.8", + "default_value": "3.1.1", "user_viewable": 1, "user_editable": 1, "rules": "required|regex:\/^([0-9_\\.-]{5,10})$\/" } ] -} \ No newline at end of file +} From 018a7a658c31eca5fec0100de7c93fddcce20344 Mon Sep 17 00:00:00 2001 From: Lance Pioch Date: Wed, 7 Mar 2018 00:11:24 -0500 Subject: [PATCH 3/5] Fix #1018 with nav color change (#1020) --- resources/themes/pterodactyl/layouts/admin.blade.php | 2 +- resources/themes/pterodactyl/layouts/auth.blade.php | 2 +- resources/themes/pterodactyl/layouts/error.blade.php | 2 +- resources/themes/pterodactyl/layouts/master.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/themes/pterodactyl/layouts/admin.blade.php b/resources/themes/pterodactyl/layouts/admin.blade.php index aac3507c2..d67eb6b41 100644 --- a/resources/themes/pterodactyl/layouts/admin.blade.php +++ b/resources/themes/pterodactyl/layouts/admin.blade.php @@ -19,7 +19,7 @@ - + @include('layouts.scripts') diff --git a/resources/themes/pterodactyl/layouts/auth.blade.php b/resources/themes/pterodactyl/layouts/auth.blade.php index 33664d074..0157864eb 100644 --- a/resources/themes/pterodactyl/layouts/auth.blade.php +++ b/resources/themes/pterodactyl/layouts/auth.blade.php @@ -18,7 +18,7 @@ - + @section('scripts') {!! Theme::css('vendor/bootstrap/bootstrap.min.css?t={cache-version}') !!} diff --git a/resources/themes/pterodactyl/layouts/error.blade.php b/resources/themes/pterodactyl/layouts/error.blade.php index f7c60b1bf..0ec1b00fa 100644 --- a/resources/themes/pterodactyl/layouts/error.blade.php +++ b/resources/themes/pterodactyl/layouts/error.blade.php @@ -19,7 +19,7 @@ - + @section('scripts') {!! Theme::css('vendor/bootstrap/bootstrap.min.css?t={cache-version}') !!} diff --git a/resources/themes/pterodactyl/layouts/master.blade.php b/resources/themes/pterodactyl/layouts/master.blade.php index 1d8cd8380..32b75823a 100644 --- a/resources/themes/pterodactyl/layouts/master.blade.php +++ b/resources/themes/pterodactyl/layouts/master.blade.php @@ -19,7 +19,7 @@ - + @include('layouts.scripts') From 0c07577d3b210be53880f20378af16dbbba0704a Mon Sep 17 00:00:00 2001 From: William Cody Ardoin Date: Tue, 6 Mar 2018 23:11:58 -0600 Subject: [PATCH 4/5] Allow for 3 decimals, future proof (#999) The GET_VERSIONS Grep Command will fail with 1.12.2 but will work with 1.12. Added optional check for 3rd decimal place in the MC Version of Forge and future proofed the forge version for Double Numeric SubMinor version. --- database/seeds/eggs/minecraft/egg-forge-minecraft.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/database/seeds/eggs/minecraft/egg-forge-minecraft.json b/database/seeds/eggs/minecraft/egg-forge-minecraft.json index a4ab2c4b9..731d8844c 100644 --- a/database/seeds/eggs/minecraft/egg-forge-minecraft.json +++ b/database/seeds/eggs/minecraft/egg-forge-minecraft.json @@ -3,7 +3,7 @@ "meta": { "version": "PTDL_v1" }, - "exported_at": "2017-11-03T22:15:10-05:00", + "exported_at": "2018-02-27T00:57:04-06:00", "name": "Forge Minecraft", "author": "support@pterodactyl.io", "description": "Minecraft Forge Server. Minecraft Forge is a modding API (Application Programming Interface), which makes it easier to create mods, and also make sure mods are compatible with each other.", @@ -17,7 +17,7 @@ }, "scripts": { "installation": { - "script": "#!\/bin\/ash\n# Forge Installation Script\n#\n# Server Files: \/mnt\/server\napk update\napk add curl\n\nGET_VERSIONS=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A1 Latest | grep -o -e '[1]\\.[0-9][0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\.[0-9][0-9][0-9][0-9]')\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\n\ncd \/mnt\/server\n\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\n\njava -jar installer.jar --installServer\nrm -rf installer.jar", + "script": "#!\/bin\/ash\r\n# Forge Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napk update\r\napk add curl\r\n\r\nGET_VERSIONS=$(curl -sl http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/ | grep -A1 Latest | grep -o -e '[1]\\.[0-9][0-9]]\\?\\.\\?[0-9]\\?[0-9] - [0-9][0-9]\\.[0-9][0-9]\\.[0-9]\\?[0-9]\\.[0-9][0-9][0-9][0-9]')\r\nLATEST_VERSION=$(echo $GET_VERSIONS | sed 's\/ \/\/g')\r\n\r\ncd \/mnt\/server\r\n\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-installer.jar -o installer.jar\r\ncurl -sS http:\/\/files.minecraftforge.net\/maven\/net\/minecraftforge\/forge\/$LATEST_VERSION\/forge-$LATEST_VERSION-universal.jar -o server.jar\r\n\r\njava -jar installer.jar --installServer\r\nrm -rf installer.jar", "container": "frolvlad\/alpine-oraclejdk8:cleaned", "entrypoint": "ash" } @@ -33,4 +33,4 @@ "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/" } ] -} \ No newline at end of file +} From cee656fd5cc9d51eebd53a4629bb74f002461f97 Mon Sep 17 00:00:00 2001 From: CodeHat Date: Thu, 8 Mar 2018 16:21:55 +0100 Subject: [PATCH 5/5] Feature/PTDL-1030 (#1033) * Swap reCAPTCHA secret key position with website key --- CHANGELOG.md | 1 + .../pterodactyl/admin/settings/advanced.blade.php | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac930b8c9..80160f956 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines. ### Changed * Panel now throws proper 504: Gateway Timeout errors on server listing when daemon is offline. * Sessions handled through redis now use a seperate database (default `1`) to store session database to avoid logging users out when flushing the cache. +* reCAPTCHA's secret key position swapped with website key in advanced panel settings to be consistent with Google's reCAPTCHA dashboard. ## v0.7.5 (Derelict Dermodactylus) ### Fixed diff --git a/resources/themes/pterodactyl/admin/settings/advanced.blade.php b/resources/themes/pterodactyl/admin/settings/advanced.blade.php index 5a7b4d724..7a1d616c5 100644 --- a/resources/themes/pterodactyl/admin/settings/advanced.blade.php +++ b/resources/themes/pterodactyl/admin/settings/advanced.blade.php @@ -34,6 +34,12 @@

If enabled, login forms and password reset forms will do a silent captcha check and display a visible captcha if needed.

+
+ +
+ +
+
@@ -41,12 +47,6 @@

Used for communication between your site and Google. Be sure to keep it a secret.

-
- -
- -
-
@if($showRecaptchaWarning)