adding initial apache page

mattmakai · mattmakai · commit 554e757c1d83 · 2016-03-11T17:38:46.000-08:00
diff --git a/all.html b/all.html
@@ -7948,9 +7948,6 @@ <h2>Why is the Apache HTTP Server important?</h2>
 <h3>Apache HTTP Server resources</h3>
 <ul>
 <li>
-<p><a href="http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid">Apache and mod_wsgi on Ubuntu 10.04</a></p>
-</li>
-<li>
 <p>The 
   <a href="http://httpd.apache.org/docs/current/">official project documentation page</a>
   contains a section with How-Tos and Tutorials to handle authentication,
@@ -7960,6 +7957,14 @@ <h3>Apache HTTP Server resources</h3>
 <p><a href="http://www.apachetutor.org/admin/reverseproxies">Reverse proxies</a> shows
   how to set up Apache as a reverse proxy using <code>mod_proxy</code>.</p>
 </li>
+<li>
+<p><a href="http://thecodeship.com/deployment/deploy-django-apache-virtualenv-and-mod_wsgi/">Deploy Django on Apache with Virtualenv and mod_wsgi</a>
+  provides instructions for what packages to install to get Apache up
+  and running with mod_wsgi on Ubuntu.</p>
+</li>
+<li>
+<p><a href="http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid">Apache and mod_wsgi on Ubuntu 10.04</a></p>
+</li>
 </ul>
           <h1>Testing</h1>
 <p>Testing determines whether software runs correctly based on specific inputs 
diff --git a/apache-http-server.html b/apache-http-server.html
@@ -49,9 +49,6 @@ <h2>Why is the Apache HTTP Server important?</h2>
 <h3>Apache HTTP Server resources</h3>
 <ul>
 <li>
-<p><a href="http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid">Apache and mod_wsgi on Ubuntu 10.04</a></p>
-</li>
-<li>
 <p>The 
   <a href="http://httpd.apache.org/docs/current/">official project documentation page</a>
   contains a section with How-Tos and Tutorials to handle authentication,
@@ -61,6 +58,14 @@ <h3>Apache HTTP Server resources</h3>
 <p><a href="http://www.apachetutor.org/admin/reverseproxies">Reverse proxies</a> shows
   how to set up Apache as a reverse proxy using <code>mod_proxy</code>.</p>
 </li>
+<li>
+<p><a href="http://thecodeship.com/deployment/deploy-django-apache-virtualenv-and-mod_wsgi/">Deploy Django on Apache with Virtualenv and mod_wsgi</a>
+  provides instructions for what packages to install to get Apache up
+  and running with mod_wsgi on Ubuntu.</p>
+</li>
+<li>
+<p><a href="http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid">Apache and mod_wsgi on Ubuntu 10.04</a></p>
+</li>
 </ul>
 <h3>Continue learning about web servers or move to a new topic?</h3>
 <div class="row">
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2016-03-10T18:20:37Z</updated></feed>
+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2016-03-11T17:38:13Z</updated></feed>
diff --git a/source/content/pages/07-web-app-deployment/22-apache-http-server.markdown b/source/content/pages/07-web-app-deployment/22-apache-http-server.markdown
@@ -29,8 +29,6 @@ development attention.
 
 
 ### Apache HTTP Server resources
-* [Apache and mod\_wsgi on Ubuntu 10.04](http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid)
-
 * The 
   [official project documentation page](http://httpd.apache.org/docs/current/)
   contains a section with How-Tos and Tutorials to handle authentication,
@@ -39,4 +37,9 @@ development attention.
 * [Reverse proxies](http://www.apachetutor.org/admin/reverseproxies) shows
   how to set up Apache as a reverse proxy using `mod_proxy`.
 
+* [Deploy Django on Apache with Virtualenv and mod\_wsgi](http://thecodeship.com/deployment/deploy-django-apache-virtualenv-and-mod_wsgi/)
+  provides instructions for what packages to install to get Apache up
+  and running with mod\_wsgi on Ubuntu.
+
+* [Apache and mod\_wsgi on Ubuntu 10.04](http://library.linode.com/web-servers/apache/mod-wsgi/ubuntu-10.04-lucid)
 
diff --git a/source/theme/templates/table-of-contents.html b/source/theme/templates/table-of-contents.html
@@ -228,10 +228,13 @@ <h3>8. <a href="/deployment.html">Web App Deployment</a></h3>
                         <a href="/web-servers.html">Web servers</a>
                     </div>
                     <div class="toc-indent">
-                        <a href="/wsgi-servers.html">WSGI servers</a>
+                        <a href="/nginx.html">Nginx</a>
                     </div>
                     <div class="toc-indent">
-                        <a href="/nginx.html">Nginx</a>
+                        <a href="/apache-http-server.html">Apache HTTP Server</a>
+                    </div>
+                    <div class="toc-indent">
+                        <a href="/wsgi-servers.html">WSGI servers</a>
                     </div>
                     <div class="toc-indent">
                         <a href="/source-control.html">Source control</a>
diff --git a/table-of-contents.html b/table-of-contents.html
@@ -246,10 +246,13 @@ <h3>8. <a href="/deployment.html">Web App Deployment</a></h3>
                         <a href="/web-servers.html">Web servers</a>
                     </div>
                     <div class="toc-indent">
-                        <a href="/wsgi-servers.html">WSGI servers</a>
+                        <a href="/nginx.html">Nginx</a>
                     </div>
                     <div class="toc-indent">
-                        <a href="/nginx.html">Nginx</a>
+                        <a href="/apache-http-server.html">Apache HTTP Server</a>
+                    </div>
+                    <div class="toc-indent">
+                        <a href="/wsgi-servers.html">WSGI servers</a>
                     </div>
                     <div class="toc-indent">
                         <a href="/source-control.html">Source control</a>

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8"?>`
`2`		`-<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2016-03-10T18:20:37Z</updated></feed>`
	`2`	`+<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2016-03-11T17:38:13Z</updated></feed>`