Skip to content

Commit df5fa02

Browse files
mattmakaimattmakai
committed
Updating content for introduction and servers.
1 parent 8ebab3e commit df5fa02

File tree

6 files changed

+48
-7
lines changed

6 files changed

+48
-7
lines changed

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?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>2012-12-25T11:12:38Z</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>2012-12-25T14:43:41Z</updated></feed>

‎index.html‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ <h1>Introduction</h1>
6161
more.</p>
6262
<p>So now what? Definitely read Kenneth Reitz's
6363
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>
64-
if you have not already. If you're not coming from a development background,
65-
I wrote a <a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a> blog post.</p>
64+
if you have not already. If you're not coming from a non-development
65+
background, I wrote a
66+
<a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a>
67+
blog post you may find useful.</p>
6668
<p>This guide has a different focus from the above resources. This site
6769
describes the myriad ways of setting up a Python <em>web application</em>
6870
stack from a &quot;bare metal&quot; server, virtual private server (VPS), Amazon Web
@@ -133,9 +135,19 @@ <h2>Virtualized servers</h2>
133135
</div>
134136
<div class="section" id="infrastructure-as-a-service">
135137
<h2>Infrastructure-as-a-service</h2>
138+
<p>Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
139+
because the resources are often presented in the same way. The
140+
difference between virtualized servers and IaaS is the granularity of the
141+
billing cycle. IaaS generally encourages a finer granularity based on minutes
142+
or hours of server usage instead of on monthly billing cycles.</p>
143+
<p>IaaS can be used in combination with virtualized servers to provide
144+
dynamic upscaling for heavy traffic. When traffic is low then virtualized
145+
servers can solely be used. This combination of resources reduces cost at
146+
the expense of greater complexity in the dynamically scaled infrastructure.</p>
136147
</div>
137148
<div class="section" id="platform-as-a-service">
138149
<h2>Platform-as-a-service</h2>
150+
<p>Platform-as-a-service (PaaS)</p>
139151
</div>
140152
<div class="section" id="server-monitoring">
141153
<h2>Server Monitoring</h2>
@@ -152,6 +164,7 @@ <h2>Server Monitoring</h2>
152164
</div>
153165
<div class="section" id="further-server-resources">
154166
<h2>Further Server Resources</h2>
167+
<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
155168
<p><a class="reference external" href="http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/">How to set up a safe and secure Web server</a> (Ars Technica)</p>
156169
<p><a class="reference external" href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a> (Patrick McKenzie)</p>
157170
</div>

‎pages/introduction.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ <h1>Introduction</h1>
5151
more.</p>
5252
<p>So now what? Definitely read Kenneth Reitz's
5353
<a class="reference external" href="http://docs.python-guide.org/en/latest/">The Hitchhiker’s Guide to Python</a>
54-
if you have not already. If you're not coming from a development background,
55-
I wrote a <a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a> blog post.</p>
54+
if you have not already. If you're not coming from a non-development
55+
background, I wrote a
56+
<a class="reference external" href="http://www.mattmakai.com/learning-python-for-non-developers.html">Learning Python</a>
57+
blog post you may find useful.</p>
5658
<p>This guide has a different focus from the above resources. This site
5759
describes the myriad ways of setting up a Python <em>web application</em>
5860
stack from a &quot;bare metal&quot; server, virtual private server (VPS), Amazon Web

‎pages/servers.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,19 @@ <h2>Virtualized servers</h2>
8888
</div>
8989
<div class="section" id="infrastructure-as-a-service">
9090
<h2>Infrastructure-as-a-service</h2>
91+
<p>Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
92+
because the resources are often presented in the same way. The
93+
difference between virtualized servers and IaaS is the granularity of the
94+
billing cycle. IaaS generally encourages a finer granularity based on minutes
95+
or hours of server usage instead of on monthly billing cycles.</p>
96+
<p>IaaS can be used in combination with virtualized servers to provide
97+
dynamic upscaling for heavy traffic. When traffic is low then virtualized
98+
servers can solely be used. This combination of resources reduces cost at
99+
the expense of greater complexity in the dynamically scaled infrastructure.</p>
91100
</div>
92101
<div class="section" id="platform-as-a-service">
93102
<h2>Platform-as-a-service</h2>
103+
<p>Platform-as-a-service (PaaS)</p>
94104
</div>
95105
<div class="section" id="server-monitoring">
96106
<h2>Server Monitoring</h2>
@@ -107,6 +117,7 @@ <h2>Server Monitoring</h2>
107117
</div>
108118
<div class="section" id="further-server-resources">
109119
<h2>Further Server Resources</h2>
120+
<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
110121
<p><a class="reference external" href="http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/">How to set up a safe and secure Web server</a> (Ars Technica)</p>
111122
<p><a class="reference external" href="http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/">Staging Servers, Source Control &amp; Deploy Workflows, And Other Stuff Nobody Teaches You</a> (Patrick McKenzie)</p>
112123
</div>

‎source/content/pages/introduction.rst‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ more.
1212

1313
So now what? Definitely read Kenneth Reitz's
1414
`The Hitchhiker’s Guide to Python <http://docs.python-guide.org/en/latest/>`_
15-
if you have not already. If you're not coming from a development background,
16-
I wrote a `Learning Python <http://www.mattmakai.com/learning-python-for-non-developers.html>`_ blog post.
15+
if you have not already. If you're not coming from a non-development
16+
background, I wrote a
17+
`Learning Python <http://www.mattmakai.com/learning-python-for-non-developers.html>`_
18+
blog post you may find useful.
1719

1820
This guide has a different focus from the above resources. This site
1921
describes the myriad ways of setting up a Python *web application*
@@ -40,3 +42,4 @@ my upcoming trip at
4042
If there are typos, inaccurate statements, or general areas for improvement
4143
that you see in this guide, please issue a
4244
`pull request on this website's Github repository <https://github.com/makaimc/fullstackpython.github.com/pull/new/gh-pages>`_. Thank you!
45+

‎source/content/pages/servers.rst‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,20 @@ require for ongoing maintenance such as persistent storage backups.
5656

5757
Infrastructure-as-a-service
5858
---------------------------
59+
Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
60+
because the resources are often presented in the same way. The
61+
difference between virtualized servers and IaaS is the granularity of the
62+
billing cycle. IaaS generally encourages a finer granularity based on minutes
63+
or hours of server usage instead of on monthly billing cycles.
5964

65+
IaaS can be used in combination with virtualized servers to provide
66+
dynamic upscaling for heavy traffic. When traffic is low then virtualized
67+
servers can solely be used. This combination of resources reduces cost at
68+
the expense of greater complexity in the dynamically scaled infrastructure.
6069

6170
Platform-as-a-service
6271
---------------------
72+
Platform-as-a-service (PaaS)
6373

6474

6575
Server Monitoring
@@ -76,6 +86,8 @@ section) but they are listed here:
7686

7787
Further Server Resources
7888
------------------------
89+
`Choosing a low cost VPS <http://blog.redfern.me/choosing-a-low-cost-vps/>`_
90+
7991
`How to set up a safe and secure Web server <http://arstechnica.com/gadgets/2012/11/how-to-set-up-a-safe-and-secure-web-server/>`_ (Ars Technica)
8092

8193
`Staging Servers, Source Control & Deploy Workflows, And Other Stuff Nobody Teaches You <http://www.kalzumeus.com/2010/12/12/staging-servers-source-control-deploy-workflows-and-other-stuff-nobody-teaches-you/>`_ (Patrick McKenzie)

0 commit comments

Comments
 (0)