adding new wsgi server resource

mattmakai · mattmakai · commit c401842a38c8 · 2014-06-01T08:51:52.000-04:00
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>2014-06-01T08:42:28Z</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>2014-06-01T08:51:45Z</updated></feed>
diff --git a/source/content/pages/03-deployment/0311-wsgi-servers.markdown b/source/content/pages/03-deployment/0311-wsgi-servers.markdown
@@ -156,6 +156,8 @@ The following are WSGI servers based on community recommendations.
 * [mod\_wsgi](https://code.google.com/p/modwsgi/) is an Apache module 
   implementing the WSGI specification.
 
+* [CherryPy](https://github.com/cherrypy/cherrypy) is a pure Python web 
+  server that also functions as a WSGI server.
 
 
 ## WSGI resources
@@ -191,6 +193,10 @@ The following are WSGI servers based on community recommendations.
   for their specific tested scenarios and not quickly extrapolated as general
   "this server is faster than this other server" results.
 
+* [How to Deploy Python WSGI Applications with CherryPy](https://www.digitalocean.com/community/articles/how-to-deploy-python-wsgi-applications-using-a-cherrypy-web-server-behind-nginx)
+  answers why CherryPy is a simple combination web and WSGI server along with 
+  how to use it.
+
 
 ## WSGI servers learning checklist
 <i class="fa fa-check-square-o"></i>
diff --git a/wsgi-servers.html b/wsgi-servers.html
@@ -173,6 +173,10 @@ <h2>WSGI servers</h2>
 <p><a href="https://code.google.com/p/modwsgi/">mod_wsgi</a> is an Apache module 
   implementing the WSGI specification.</p>
 </li>
+<li>
+<p><a href="https://github.com/cherrypy/cherrypy">CherryPy</a> is a pure Python web 
+  server that also functions as a WSGI server.</p>
+</li>
 </ul>
 <h2>WSGI resources</h2>
 <ul>
@@ -215,6 +219,11 @@ <h2>WSGI resources</h2>
   for their specific tested scenarios and not quickly extrapolated as general
   "this server is faster than this other server" results.</p>
 </li>
+<li>
+<p><a href="https://www.digitalocean.com/community/articles/how-to-deploy-python-wsgi-applications-using-a-cherrypy-web-server-behind-nginx">How to Deploy Python WSGI Applications with CherryPy</a>
+  answers why CherryPy is a simple combination web and WSGI server along with 
+  how to use it.</p>
+</li>
 </ul>
 <h2>WSGI servers learning checklist</h2>
 <p><i class="fa fa-check-square-o"></i>

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>2014-06-01T08:42:28Z</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>2014-06-01T08:51:45Z</updated></feed>`