From 967feb6931418aa42ea4b56862cf541a75202291 Mon Sep 17 00:00:00 2001 From: Craig <99729+craig@users.noreply.github.com> Date: Tue, 21 Aug 2018 00:41:29 +0200 Subject: [PATCH 1/6] Add missing library WSGIPassAuthorization fails if libapache2-mod-wsgi-py3 is missing --- docs/installation/3-http-daemon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/3-http-daemon.md b/docs/installation/3-http-daemon.md index 9ed8fdd74..6ca38783e 100644 --- a/docs/installation/3-http-daemon.md +++ b/docs/installation/3-http-daemon.md @@ -56,7 +56,7 @@ To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https: ## Option B: Apache ```no-highlight -# apt-get install -y apache2 +# apt-get install -y apache2 libapache2-mod-wsgi-py3 ``` Once Apache is installed, proceed with the following configuration (Be sure to modify the `ServerName` appropriately): From 1b2d3bf08b411a054a46186de01f2dc445510b88 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 22 Aug 2018 11:44:07 -0400 Subject: [PATCH 2/6] Revert "Add missing library" --- docs/installation/3-http-daemon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/3-http-daemon.md b/docs/installation/3-http-daemon.md index 6ca38783e..9ed8fdd74 100644 --- a/docs/installation/3-http-daemon.md +++ b/docs/installation/3-http-daemon.md @@ -56,7 +56,7 @@ To enable SSL, consider this guide on [securing nginx with Let's Encrypt](https: ## Option B: Apache ```no-highlight -# apt-get install -y apache2 libapache2-mod-wsgi-py3 +# apt-get install -y apache2 ``` Once Apache is installed, proceed with the following configuration (Be sure to modify the `ServerName` appropriately): From 06aa979e9f9dd23442efbaa635a35461c3f7b6bd Mon Sep 17 00:00:00 2001 From: Tharesh <99tharesh@gmail.com> Date: Sun, 7 Oct 2018 20:07:38 +0530 Subject: [PATCH 3/6] New commit messages --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 5b090048d..2d0e241ae 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,6 @@ and run `upgrade.sh`. * [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle)) * [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae)) -# Related projects - ## Supported SDK - [pynetbox](https://github.com/digitalocean/pynetbox) Python API client library for Netbox. @@ -55,5 +53,4 @@ and run `upgrade.sh`. ## Ansible Inventory -- [netbox-as-ansible-inventory](https://github.com/AAbouZaid/netbox-as-ansible-inventory) Ansible dynamic inventory script for Netbox. - +- [netbox-as-ansible-inventory](https://github.com/AAbouZaid/netbox-as-ansible-inventory) Ansible dynamic inventory script for Netbox. \ No newline at end of file From 633dad25a78e73ab3af17ba9bc7007a169a5f44f Mon Sep 17 00:00:00 2001 From: Tharesh <99tharesh@gmail.com> Date: Sun, 7 Oct 2018 21:56:28 +0530 Subject: [PATCH 4/6] Fixed readme --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d0e241ae..dfbb744f6 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ NetBox is built against both Python 2.7 and 3.5. Python 3.5 or higher is strongl # Installation -Please see [the documentation](http://netbox.readthedocs.io/en/stable/) for +Please see the [documentation](http://netbox.readthedocs.io/en/stable/) for instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/digitalocean/netbox/releases) and run `upgrade.sh`. @@ -43,6 +43,8 @@ and run `upgrade.sh`. * [Vagrant deployment](https://github.com/ryanmerolle/netbox-vagrant) (via [@ryanmerolle](https://github.com/ryanmerolle)) * [Ansible deployment](https://github.com/lae/ansible-role-netbox) (via [@lae](https://github.com/lae)) +# Related projects + ## Supported SDK - [pynetbox](https://github.com/digitalocean/pynetbox) Python API client library for Netbox. From c02a916252daa60ba082c9192aa79002f56dfc52 Mon Sep 17 00:00:00 2001 From: Tharesh <99tharesh@gmail.com> Date: Sun, 7 Oct 2018 22:01:04 +0530 Subject: [PATCH 5/6] fixed bracket --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfbb744f6..943ba5897 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ NetBox is built against both Python 2.7 and 3.5. Python 3.5 or higher is strongl # Installation -Please see the [documentation](http://netbox.readthedocs.io/en/stable/) for +Please see the [the documentation](http://netbox.readthedocs.io/en/stable/) for instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/digitalocean/netbox/releases) and run `upgrade.sh`. From 41705d4a097c44f0890c4ef79a558a31b524addd Mon Sep 17 00:00:00 2001 From: Tharesh <99tharesh@gmail.com> Date: Sun, 7 Oct 2018 22:06:37 +0530 Subject: [PATCH 6/6] Fixed read me documentation --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 943ba5897..dfbb744f6 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ NetBox is built against both Python 2.7 and 3.5. Python 3.5 or higher is strongl # Installation -Please see the [the documentation](http://netbox.readthedocs.io/en/stable/) for +Please see the [documentation](http://netbox.readthedocs.io/en/stable/) for instructions on installing NetBox. To upgrade NetBox, please download the [latest release](https://github.com/digitalocean/netbox/releases) and run `upgrade.sh`.