From c300dbe640e5fee5e14f27a1c5bd6334a4faf91f Mon Sep 17 00:00:00 2001 From: Dane Everitt Date: Sun, 8 Nov 2020 15:35:41 -0800 Subject: [PATCH] Bump versions --- panel/1.0/getting_started.md | 4 ++-- panel/1.0/upgrade/0.7_to_1.0.md | 4 ++-- panel/1.0/upgrade/1.0.md | 14 +++++++++----- wings/1.0/installing.md | 2 +- wings/1.0/migrating.md | 2 +- wings/1.0/upgrading.md | 7 ++++++- 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/panel/1.0/getting_started.md b/panel/1.0/getting_started.md index b5196a27..c7a4a199 100644 --- a/panel/1.0/getting_started.md +++ b/panel/1.0/getting_started.md @@ -84,7 +84,7 @@ and then set the correct permissions on the `storage/` and `bootstrap/cache/` di allow us to store files as well as keep a speedy cache available to reduce load times. ``` bash -curl -Lo panel.tar.gz https://github.com/pterodactyl/panel/releases/download/v1.0.3/panel.tar.gz +curl -Lo panel.tar.gz https://github.com/pterodactyl/panel/releases/download/v1.1.0/panel.tar.gz tar -xzvf panel.tar.gz chmod -R 755 storage/* bootstrap/cache/ ``` @@ -133,7 +133,7 @@ may take some time to run depending on your machine. Please _DO NOT_ exit the pr command will setup the database tables and then add all of the Nests & Eggs that power Pterodactyl. ``` bash -php artisan migrate --seed +php artisan migrate --seed --force ``` ### Add The First User diff --git a/panel/1.0/upgrade/0.7_to_1.0.md b/panel/1.0/upgrade/0.7_to_1.0.md index a617df9f..fb8bee8f 100644 --- a/panel/1.0/upgrade/0.7_to_1.0.md +++ b/panel/1.0/upgrade/0.7_to_1.0.md @@ -1,5 +1,5 @@ # Upgrading 0.7 Series to 1.0 Series -This upgrade guide is for **upgrading from 0.7.X to 1.0.0**. If you are trying to do an upgrade on a 1.0.X Panel +This upgrade guide is for **upgrading from 0.7.X to 1.1.0**. If you are trying to do an upgrade on a 1.X Panel please [use this guide instead](/panel/1.0/upgrade/1.0.md). ::: danger No Downgrade Path @@ -43,7 +43,7 @@ are not always detected properly, so simply uppacking over this location will re ``` bash # Delete the app directory to ensure we start with a clean slate here. This will not affect any # of your settings or servers. -curl -L -o panel.tar.gz https://github.com/pterodactyl/panel/releases/download/v1.0.3/panel.tar.gz +curl -L -o panel.tar.gz https://github.com/pterodactyl/panel/releases/download/v1.1.0/panel.tar.gz rm -rf $(find app public resources -depth | head -n -1 | grep -Fv "$(tar -tf panel.tar.gz)") # Download the updated files and delete the archive file. diff --git a/panel/1.0/upgrade/1.0.md b/panel/1.0/upgrade/1.0.md index 24f11383..6c7ff4d9 100644 --- a/panel/1.0/upgrade/1.0.md +++ b/panel/1.0/upgrade/1.0.md @@ -1,6 +1,6 @@ # Upgrading 1.0 Series -This documentation covers the process for upgrading within the `1.0.X` series of releases. This means upgrading from -— for example — `1.0.0` to `1.0.2`. **Do not use this guide for upgrading from `0.7`.** +This documentation covers the process for upgrading within the `1.X` series of releases. This means upgrading from +— for example — `1.0.3` to `1.1.0`. **Do not use this guide for upgrading from `0.7`.** ::: danger Seriously, **stop** and read this warning. **Do not use this guide to upgrade from the 0.7 series.** You _will_ @@ -13,8 +13,13 @@ the release archive for the most recent version of Pterodactyl and save it in th to ensure that you're in the `/var/www/pterodactyl` directory as the command below will automatically unpack the archive into your current folder. +::: warning +`Panel@1.1.0` requires `Wings@1.1.0` in order for Wings to run properly. Internal API changes were made +that will cause Wings to not boot properly if you do not also update Wings. +::: + ``` bash -curl -L https://github.com/pterodactyl/panel/releases/download/v1.0.3/panel.tar.gz | tar -xzv +curl -L https://github.com/pterodactyl/panel/releases/download/v1.1.0/panel.tar.gz | tar -xzv ``` Once all of the files are downloaded we need to set the correct permissions on the cache and storage directories to avoid @@ -47,8 +52,7 @@ will update the schema and ensure the default eggs we ship are up to date (and a remember, _never edit core eggs we ship_! They will be overwritten by this update process. ``` bash -php artisan migrate --force -php artisan db:seed --force +php artisan migrate --seed --force ``` ## Set Permissions diff --git a/wings/1.0/installing.md b/wings/1.0/installing.md index 733c5d4f..75bcad96 100644 --- a/wings/1.0/installing.md +++ b/wings/1.0/installing.md @@ -95,7 +95,7 @@ run the commands below which will create the base directory and download the win ``` bash mkdir -p /etc/pterodactyl -curl -L -o /usr/local/bin/wings https://github.com/pterodactyl/wings/releases/download/v1.0.1/wings_linux_amd64 +curl -L -o /usr/local/bin/wings https://github.com/pterodactyl/wings/releases/download/v1.1.0/wings_linux_amd64 chmod u+x /usr/local/bin/wings ``` diff --git a/wings/1.0/migrating.md b/wings/1.0/migrating.md index 742a9564..0a38a670 100644 --- a/wings/1.0/migrating.md +++ b/wings/1.0/migrating.md @@ -17,7 +17,7 @@ run the commands below which will create the base directory and download the win ``` bash mkdir -p /etc/pterodactyl -curl -L -o /usr/local/bin/wings https://github.com/pterodactyl/wings/releases/download/v1.0.1/wings_linux_amd64 +curl -L -o /usr/local/bin/wings https://github.com/pterodactyl/wings/releases/download/v1.1.0/wings_linux_amd64 chmod u+x /usr/local/bin/wings ``` diff --git a/wings/1.0/upgrading.md b/wings/1.0/upgrading.md index bd57861c..1f201227 100644 --- a/wings/1.0/upgrading.md +++ b/wings/1.0/upgrading.md @@ -4,8 +4,13 @@ Upgrading Wings is a painless process and should take less than a minute to comp ## Download Updated Binary First, download the updated wings binary into `/usr/local/bin`. +::: warning +`Wings@1.1.0` requires `Panel@1.1.0` in order to run properly. It will not boot if your Panel is not +also up-to-date. +::: + ``` bash -curl -L -o /usr/local/bin/wings https://github.com/pterodactyl/wings/releases/download/v1.0.1/wings_linux_amd64 +curl -L -o /usr/local/bin/wings https://github.com/pterodactyl/wings/releases/download/v1.1.0/wings_linux_amd64 chmod u+x /usr/local/bin/wings ```