Browse Source

Fixes #272: Added a step to copy the gunicorn config

Jeremy Stretch 9 years ago
parent
commit
b60f964835
1 changed files with 14 additions and 16 deletions
  1. 14 16
      docs/installation/upgrading.md

+ 14 - 16
docs/installation/upgrading.md

@@ -4,42 +4,40 @@ As with the initial installation, you can upgrade NetBox by either downloading t
 
 
 ## Option A: Download a Release
 ## Option A: Download a Release
 
 
-Download the [latest stable release](https://github.com/digitalocean/netbox/releases) from GitHub as a tarball or ZIP archive. Extract it to your desired path. In this example, we'll use `/opt/netbox`.  For this guide we are using 1.0.4 as the old version and 1.0.7 as the new version.
+Download the [latest stable release](https://github.com/digitalocean/netbox/releases) from GitHub as a tarball or ZIP archive. Extract it to your desired path. In this example, we'll use `/opt/netbox`.
+
+Download and extract the latest version:
 
 
-Download & extract latest version:
 ```
 ```
 # wget https://github.com/digitalocean/netbox/archive/vX.Y.Z.tar.gz
 # wget https://github.com/digitalocean/netbox/archive/vX.Y.Z.tar.gz
 # tar -xzf vX.Y.Z.tar.gz -C /opt
 # tar -xzf vX.Y.Z.tar.gz -C /opt
 # cd /opt/
 # cd /opt/
-# ln -sf netbox-1.0.7/ netbox
+# ln -sf netbox-X.Y.Z/ netbox
 ```
 ```
 
 
 Copy the 'configuration.py' you created when first installing to the new version:
 Copy the 'configuration.py' you created when first installing to the new version:
+
 ```
 ```
-# cp /opt/netbox-1.0.4/configuration.py /opt/netbox/configuration.py
+# cp /opt/netbox-X.Y.Z/configuration.py /opt/netbox/configuration.py
 ```
 ```
 
 
-## Option B: Clone the Git Repository (latest master release)
-
-For this guide, we'll use `/opt/netbox`.
+If you followed the original installation guide to set up gunicorn, be sure to copy its configuration as well:
 
 
-Check that your git branch is up to date & is set to master:
 ```
 ```
-# cd /opt/netbox
-# git status
+# cp /opt/netbox-X.Y.Z/gunicorn_config.py /opt/netbox/gunicorn_config.py
 ```
 ```
 
 
-If not on branch master, set it and verify status:
+## Option B: Clone the Git Repository (latest master release)
+
+This guide assumes that NetBox is installed at `/opt/netbox`. Pull down the most recent iteration of the master branch:
+
 ```
 ```
+# cd /opt/netbox
 # git checkout master
 # git checkout master
+# git pull origin master
 # git status
 # git status
 ```
 ```
 
 
-Pull down the set branch from git status above:
-```
-# git pull
-```
-
 # Run the Upgrade Script
 # Run the Upgrade Script
 
 
 Once the new code is in place, run the upgrade script (which may need to be run as root depending on how your environment is configured).
 Once the new code is in place, run the upgrade script (which may need to be run as root depending on how your environment is configured).