Skip to content

Commit 8ebab3e

Browse files
mattmakaimattmakai
committed
Updating server section.
1 parent 27b0dc0 commit 8ebab3e

File tree

5 files changed

+67
-17
lines changed

5 files changed

+67
-17
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-24T19:14:04Z</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-25T11:12:38Z</updated></feed>

‎index.html‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</div>
4444
</div>
4545
<div class="row">
46-
<div class="span3" id="fsp-side-nav">
46+
<div class="span2" id="fsp-side-nav">
4747
<ul class="nav nav-list fsp-side-nav-ul affix">
4848
<li><a href="#introduction">Introduction</a></li>
4949
<li><a href="#servers">Servers</a></li>
@@ -52,7 +52,7 @@
5252
<li><a href="#wsgi-server">WSGI Server</a></li>
5353
</ul>
5454
</div>
55-
<div class="span9">
55+
<div class="span9 offset1">
5656
<section id="introduction" class="tech-section">
5757
<h1>Introduction</h1>
5858
<p>You're knee deep in learning the <a class="reference external" href="http://www.python.org/">Python</a>
@@ -100,9 +100,16 @@ <h1>Servers</h1>
100100
</ol>
101101
<div class="section" id="bare-metal">
102102
<h2>Bare metal</h2>
103-
<p>The most control and also the highest maintenance. Buy actual hardware
104-
from a vendor either pre-built or as a collection of components that
105-
you assemble yourself.</p>
103+
<p>The term <em>bare metal</em> refers to purchasing the actual hardware and hooking
104+
it up to the Internet either through a business-class internet service
105+
provider (ISP) or
106+
<a class="reference external" href="http://webdesign.about.com/od/colocation/a/what_colocation.htm">co-locating the server</a> with other servers.</p>
107+
<p>The bare metal option offers the most control over the server configuration,
108+
usually has the highest performance for the price, but also is the most
109+
expensive upfront option and the highest ongoing maintenance. With bare
110+
metal servers the ongoing operating cost is the electricity the server(s)
111+
use as well as handling repairs when server components malfunction.</p>
112+
<p>Buy actual hardware from a vendor either pre-built or as a collection of components that you assemble yourself.</p>
106113
</div>
107114
<div class="section" id="virtualized-servers">
108115
<h2>Virtualized servers</h2>
@@ -120,7 +127,15 @@ <h2>Virtualized servers</h2>
120127
overhead in the virtualization process. In addition, physical constraints
121128
such as heavy I/O operations by a single virtualized instance on persistent
122129
storage can cause performance bottlenecks for other virtualized instances on
123-
the shared server.</p>
130+
the shared server. Choosing virtualized server hosting should be based on
131+
your needs for urgency of service ticket requests and the frequency you
132+
require for ongoing maintenance such as persistent storage backups.</p>
133+
</div>
134+
<div class="section" id="infrastructure-as-a-service">
135+
<h2>Infrastructure-as-a-service</h2>
136+
</div>
137+
<div class="section" id="platform-as-a-service">
138+
<h2>Platform-as-a-service</h2>
124139
</div>
125140
<div class="section" id="server-monitoring">
126141
<h2>Server Monitoring</h2>

‎pages/servers.html‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,16 @@ <h1>Servers</h1>
5555
</ol>
5656
<div class="section" id="bare-metal">
5757
<h2>Bare metal</h2>
58-
<p>The most control and also the highest maintenance. Buy actual hardware
59-
from a vendor either pre-built or as a collection of components that
60-
you assemble yourself.</p>
58+
<p>The term <em>bare metal</em> refers to purchasing the actual hardware and hooking
59+
it up to the Internet either through a business-class internet service
60+
provider (ISP) or
61+
<a class="reference external" href="http://webdesign.about.com/od/colocation/a/what_colocation.htm">co-locating the server</a> with other servers.</p>
62+
<p>The bare metal option offers the most control over the server configuration,
63+
usually has the highest performance for the price, but also is the most
64+
expensive upfront option and the highest ongoing maintenance. With bare
65+
metal servers the ongoing operating cost is the electricity the server(s)
66+
use as well as handling repairs when server components malfunction.</p>
67+
<p>Buy actual hardware from a vendor either pre-built or as a collection of components that you assemble yourself.</p>
6168
</div>
6269
<div class="section" id="virtualized-servers">
6370
<h2>Virtualized servers</h2>
@@ -75,7 +82,15 @@ <h2>Virtualized servers</h2>
7582
overhead in the virtualization process. In addition, physical constraints
7683
such as heavy I/O operations by a single virtualized instance on persistent
7784
storage can cause performance bottlenecks for other virtualized instances on
78-
the shared server.</p>
85+
the shared server. Choosing virtualized server hosting should be based on
86+
your needs for urgency of service ticket requests and the frequency you
87+
require for ongoing maintenance such as persistent storage backups.</p>
88+
</div>
89+
<div class="section" id="infrastructure-as-a-service">
90+
<h2>Infrastructure-as-a-service</h2>
91+
</div>
92+
<div class="section" id="platform-as-a-service">
93+
<h2>Platform-as-a-service</h2>
7994
</div>
8095
<div class="section" id="server-monitoring">
8196
<h2>Server Monitoring</h2>

‎source/content/pages/servers.rst‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,18 @@ web application:
1818

1919
Bare metal
2020
----------
21-
The most control and also the highest maintenance. Buy actual hardware
22-
from a vendor either pre-built or as a collection of components that
23-
you assemble yourself.
21+
The term *bare metal* refers to purchasing the actual hardware and hooking
22+
it up to the Internet either through a business-class internet service
23+
provider (ISP) or
24+
`co-locating the server <http://webdesign.about.com/od/colocation/a/what_colocation.htm>`_ with other servers.
25+
26+
The bare metal option offers the most control over the server configuration,
27+
usually has the highest performance for the price, but also is the most
28+
expensive upfront option and the highest ongoing maintenance. With bare
29+
metal servers the ongoing operating cost is the electricity the server(s)
30+
use as well as handling repairs when server components malfunction.
31+
32+
Buy actual hardware from a vendor either pre-built or as a collection of components that you assemble yourself.
2433

2534

2635
Virtualized servers
@@ -40,7 +49,18 @@ The primary disadvantage of virtualized servers is that there is resource
4049
overhead in the virtualization process. In addition, physical constraints
4150
such as heavy I/O operations by a single virtualized instance on persistent
4251
storage can cause performance bottlenecks for other virtualized instances on
43-
the shared server.
52+
the shared server. Choosing virtualized server hosting should be based on
53+
your needs for urgency of service ticket requests and the frequency you
54+
require for ongoing maintenance such as persistent storage backups.
55+
56+
57+
Infrastructure-as-a-service
58+
---------------------------
59+
60+
61+
Platform-as-a-service
62+
---------------------
63+
4464

4565
Server Monitoring
4666
-----------------

‎source/theme/templates/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
{% block content %}
66
<div class="row">
7-
<div class="span3" id="fsp-side-nav">
7+
<div class="span2" id="fsp-side-nav">
88
<ul class="nav nav-list fsp-side-nav-ul affix">
99
{% for page in pages|sort(attribute='sort-order') %}
1010
<li><a href="#{{ page.slug }}">{{ page.title }}</a></li>
1111
{% endfor %}
1212
</ul>
1313
</div>
14-
<div class="span9">
14+
<div class="span9 offset1">
1515
{% for page in pages|sort(attribute='sort-order') %}
1616
<section id="{{ page.slug }}" class="tech-section">
1717
<h1>{{ page.title }}</h1>

0 commit comments

Comments
 (0)