Skip to content

Commit 5a730af

Browse files
mattmakaimattmakai
committed
updating servers section by splitting out the resources into different buckets
1 parent 78116a9 commit 5a730af

File tree

8 files changed

+193
-33
lines changed

8 files changed

+193
-33
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>2013-12-25T13:30:56Z</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-01-05T10:00:36Z</updated></feed>

‎index.html‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<li><a href="#caching">Caching</a></li>
6161
<li><a href="#web-analytics">Web Analytics</a></li>
6262
<li><a href="#monitoring">Monitoring</a></li>
63+
<li><a href="#source-control">Source Control</a></li>
6364
<li><a href="#no-sql-datastore">NoSQL Data Stores</a></li>
6465
<li><a href="#about-author">About</a></li>
6566
<li><a href="#change-log">Change Log</a></li>
@@ -156,6 +157,10 @@ <h2>Virtualized servers</h2>
156157
your needs for urgency of service ticket requests and the frequency you
157158
require for ongoing maintenance such as persistent storage backups.</p>
158159
</div>
160+
<div class="section" id="virtualized-servers-resources">
161+
<h2>Virtualized servers resources</h2>
162+
<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
163+
</div>
159164
<div class="section" id="infrastructure-as-a-service">
160165
<h2>Infrastructure-as-a-service</h2>
161166
<p>Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
@@ -182,6 +187,12 @@ <h2>Infrastructure-as-a-service</h2>
182187
one of many quirks you need to understand before committing to an
183188
IaaS platform.</p>
184189
</div>
190+
<div class="section" id="infrastructure-as-a-service-resources">
191+
<h2>Infrastructure-as-a-service Resources</h2>
192+
<p><a class="reference external" href="http://aws.amazon.com/python/">Amazon Web Services official documentation for Python</a></p>
193+
<p><a class="reference external" href="https://github.com/boto/boto">boto</a> is an amazing Python library for
194+
working with Amazon Web Services</p>
195+
</div>
185196
<div class="section" id="platform-as-a-service">
186197
<h2>Platform-as-a-service</h2>
187198
<p>A platform-as-a-service (PaaS) provides infrastructure and a software layer
@@ -202,14 +213,10 @@ <h2>Platform-as-a-service</h2>
202213
server sections because they are baked into PaaS offerings. PaaS offerings
203214
generally start at the WSGI server layer.</p>
204215
</div>
205-
<div class="section" id="server-resources">
206-
<h2>Server Resources</h2>
207-
<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>
216+
<div class="section" id="platform-as-a-service-resources">
217+
<h2>Platform-as-a-service resources</h2>
208218
<p><a class="reference external" href="http://rdegges.com/devops-django-part-4-choosing-heroku">Choosing Heroku</a>
209219
(Randall Degges)</p>
210-
<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
211-
<p><a class="reference external" href="https://github.com/boto/boto">boto</a> is an amazing Python library for
212-
working with Amazon Web Services</p>
213220
</div>
214221

215222
</section>
@@ -252,12 +259,13 @@ <h2>Red Hat and CentOS</h2>
252259
</div>
253260
<div class="section" id="operating-system-resources">
254261
<h2>Operating System Resources</h2>
255-
<p><a class="reference external" href="http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/">Securing an Ubuntu Server</a></p>
256-
<p><a class="reference external" href="http://joshrendek.com/2013/01/securing-ubuntu/">Securing Ubuntu</a></p>
262+
<p><a class="reference external" href="http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution">Choosing a Linux Distribution</a></p>
257263
<p><a class="reference external" href="http://plusbryan.com/my-first-5-minutes-on-a-server-or-essential-security-for-linux-servers">First 5 Minutes on a Server</a></p>
264+
<p><a class="reference external" href="http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/">Securing an Ubuntu Server</a>
265+
<a class="reference external" href="http://joshrendek.com/2013/01/securing-ubuntu/">Securing Ubuntu</a></p>
258266
<p><a class="reference external" href="http://spenserj.com/blog/2013/07/15/securing-a-linux-server/">Securing a Linux Server</a></p>
259267
<p><a class="reference external" href="https://github.com/marshyski/quick-secure">quick-secure scripts</a> for
260-
securing RedHat flavors of Linux on boot.</p>
268+
securing RedHat Linux distributions on boot.</p>
261269
</div>
262270

263271
</section>
@@ -590,6 +598,30 @@ <h2>Open Source Projects</h2>
590598
<h2>Monitoring Resources</h2>
591599
<p><a class="reference external" href="http://www.paperplanes.de/2011/1/5/the_virtues_of_monitoring.html">The Virtues of Monitoring</a></p>
592600
<p><a class="reference external" href="http://blog.docker.io/2013/07/effortless-monitoring-with-collectd-graphite-and-docker/">Effortless Monitoring with collectd, Graphite, and Docker</a></p>
601+
</div>
602+
603+
</section>
604+
<section id="source-control" class="tech-section">
605+
<h1>Source Control</h1>
606+
<p>Source control systems (also known as version control systems) store code
607+
and other files, such as images, with a history of the changes made to
608+
those files.</p>
609+
<div class="section" id="source-control-systems">
610+
<h2>Source Control Systems</h2>
611+
<p><a class="reference external" href="http://git-scm.com/">Git</a> is a free and open source distributed version
612+
control system.</p>
613+
</div>
614+
<div class="section" id="source-control-third-party-services">
615+
<h2>Source Control Third Party Services</h2>
616+
<p><a class="reference external" href="https://github.com/">GitHub</a> is currently the most commonly used source
617+
control platform for using Git.</p>
618+
<p><a class="reference external" href="https://bitbucket.org/">BitBucket</a> provides free Git and Mercurial
619+
repositories for open projects and paid services for hosting private
620+
repositories.</p>
621+
</div>
622+
<div class="section" id="source-control-resources">
623+
<h2>Source Control Resources</h2>
624+
<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>
593625
</div>
594626

595627
</section>

‎pages/operating-system.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,13 @@ <h2>Red Hat and CentOS</h2>
8585
</div>
8686
<div class="section" id="operating-system-resources">
8787
<h2>Operating System Resources</h2>
88-
<p><a class="reference external" href="http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/">Securing an Ubuntu Server</a></p>
89-
<p><a class="reference external" href="http://joshrendek.com/2013/01/securing-ubuntu/">Securing Ubuntu</a></p>
88+
<p><a class="reference external" href="http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution">Choosing a Linux Distribution</a></p>
9089
<p><a class="reference external" href="http://plusbryan.com/my-first-5-minutes-on-a-server-or-essential-security-for-linux-servers">First 5 Minutes on a Server</a></p>
90+
<p><a class="reference external" href="http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/">Securing an Ubuntu Server</a>
91+
<a class="reference external" href="http://joshrendek.com/2013/01/securing-ubuntu/">Securing Ubuntu</a></p>
9192
<p><a class="reference external" href="http://spenserj.com/blog/2013/07/15/securing-a-linux-server/">Securing a Linux Server</a></p>
9293
<p><a class="reference external" href="https://github.com/marshyski/quick-secure">quick-secure scripts</a> for
93-
securing RedHat flavors of Linux on boot.</p>
94+
securing RedHat Linux distributions on boot.</p>
9495
</div>
9596

9697
<hr/>

‎pages/servers.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ <h2>Virtualized servers</h2>
101101
your needs for urgency of service ticket requests and the frequency you
102102
require for ongoing maintenance such as persistent storage backups.</p>
103103
</div>
104+
<div class="section" id="virtualized-servers-resources">
105+
<h2>Virtualized servers resources</h2>
106+
<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
107+
</div>
104108
<div class="section" id="infrastructure-as-a-service">
105109
<h2>Infrastructure-as-a-service</h2>
106110
<p>Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
@@ -127,6 +131,12 @@ <h2>Infrastructure-as-a-service</h2>
127131
one of many quirks you need to understand before committing to an
128132
IaaS platform.</p>
129133
</div>
134+
<div class="section" id="infrastructure-as-a-service-resources">
135+
<h2>Infrastructure-as-a-service Resources</h2>
136+
<p><a class="reference external" href="http://aws.amazon.com/python/">Amazon Web Services official documentation for Python</a></p>
137+
<p><a class="reference external" href="https://github.com/boto/boto">boto</a> is an amazing Python library for
138+
working with Amazon Web Services</p>
139+
</div>
130140
<div class="section" id="platform-as-a-service">
131141
<h2>Platform-as-a-service</h2>
132142
<p>A platform-as-a-service (PaaS) provides infrastructure and a software layer
@@ -147,14 +157,10 @@ <h2>Platform-as-a-service</h2>
147157
server sections because they are baked into PaaS offerings. PaaS offerings
148158
generally start at the WSGI server layer.</p>
149159
</div>
150-
<div class="section" id="server-resources">
151-
<h2>Server Resources</h2>
152-
<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>
160+
<div class="section" id="platform-as-a-service-resources">
161+
<h2>Platform-as-a-service resources</h2>
153162
<p><a class="reference external" href="http://rdegges.com/devops-django-part-4-choosing-heroku">Choosing Heroku</a>
154163
(Randall Degges)</p>
155-
<p><a class="reference external" href="http://blog.redfern.me/choosing-a-low-cost-vps/">Choosing a low cost VPS</a></p>
156-
<p><a class="reference external" href="https://github.com/boto/boto">boto</a> is an amazing Python library for
157-
working with Amazon Web Services</p>
158164
</div>
159165

160166
<hr/>

‎pages/source-control.html‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<!doctype html>
2+
<!--[if lt IE 7]> <html class="no-js ie6 oldie" lang="en"> <![endif]-->
3+
<!--[if IE 7]> <html class="no-js ie7 oldie" lang="en"> <![endif]-->
4+
<!--[if IE 8]> <html class="no-js ie8 oldie" lang="en"> <![endif]-->
5+
<!--[if gt IE 8]><!-->
6+
<html class="no-js" lang="en"> <!--<![endif]-->
7+
8+
<head>
9+
<meta charset="utf-8">
10+
<meta name="language" content="English" />
11+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
12+
13+
<title>Full Stack Python</title>
14+
<meta name="description" content="Full stack Python shows how an entire Python web application is built, from the server to the front end JavaScript.">
15+
<meta name="author" content="Matt Makai">
16+
<meta name="viewport" content="width=device-width,initial-scale=1">
17+
<link rel="stylesheet" href="/css/c.css" />
18+
<link rel="stylesheet" href="/css/bootstrap-responsive.min.css" />
19+
<script src="/js/modernizr-2.0.6.min.js"></script>
20+
<script type="text/javascript">
21+
22+
var _gaq = _gaq || [];
23+
_gaq.push(['_setAccount', 'UA-19910497-7']);
24+
_gaq.push(['_trackPageview']);
25+
26+
(function() {
27+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
28+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
29+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
30+
})();
31+
32+
</script>
33+
</head>
34+
35+
<body>
36+
<a href="https://github.com/makaimc/fullstackpython.github.com" class="github">
37+
<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
38+
</a>
39+
<div class="container">
40+
<div class="row">
41+
<div class="span12">
42+
<div class="logo-header-section">
43+
<a href="/"><img src="../img/full-stack-python-logo-bw.png" height="42" width="42" class="logo-image" /></a>
44+
<span class="logo-title"><a href="/">Full Stack Python</a></span>
45+
</div>
46+
</div>
47+
</div>
48+
<h1>Source Control</h1>
49+
50+
51+
<p>Source control systems (also known as version control systems) store code
52+
and other files, such as images, with a history of the changes made to
53+
those files.</p>
54+
<div class="section" id="source-control-systems">
55+
<h2>Source Control Systems</h2>
56+
<p><a class="reference external" href="http://git-scm.com/">Git</a> is a free and open source distributed version
57+
control system.</p>
58+
</div>
59+
<div class="section" id="source-control-third-party-services">
60+
<h2>Source Control Third Party Services</h2>
61+
<p><a class="reference external" href="https://github.com/">GitHub</a> is currently the most commonly used source
62+
control platform for using Git.</p>
63+
<p><a class="reference external" href="https://bitbucket.org/">BitBucket</a> provides free Git and Mercurial
64+
repositories for open projects and paid services for hosting private
65+
repositories.</p>
66+
</div>
67+
<div class="section" id="source-control-resources">
68+
<h2>Source Control Resources</h2>
69+
<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>
70+
</div>
71+
72+
<hr/>
73+
<div class="footer pull-right">
74+
<a href="http://www.mattmakai.com/" class="underline">Matt Makai</a> 2013
75+
</div>
76+
</div>
77+
78+
<script src="http://code.jquery.com/jquery-latest.js"></script>
79+
<script src="/js/bootstrap.min.js"></script>
80+
</body>
81+
</html>

‎source/content/pages/operating-system.rst‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,17 @@ to handle the packaging and installation of libraries and applications. YUM
4646
provides a command-line interface for interacting with the RPM system.
4747

4848

49-
5049
Operating System Resources
5150
--------------------------
52-
`Securing an Ubuntu Server <http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/>`_
53-
54-
`Securing Ubuntu <http://joshrendek.com/2013/01/securing-ubuntu/>`_
51+
`Choosing a Linux Distribution <http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution>`_
5552

5653
`First 5 Minutes on a Server <http://plusbryan.com/my-first-5-minutes-on-a-server-or-essential-security-for-linux-servers>`_
5754

55+
`Securing an Ubuntu Server <http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/>`_
56+
`Securing Ubuntu <http://joshrendek.com/2013/01/securing-ubuntu/>`_
57+
5858
`Securing a Linux Server <http://spenserj.com/blog/2013/07/15/securing-a-linux-server/>`_
5959

60-
`quick-secure scripts <https://github.com/marshyski/quick-secure>`_ for
61-
securing RedHat flavors of Linux on boot.
60+
`quick-secure scripts <https://github.com/marshyski/quick-secure>`_ for
61+
securing RedHat Linux distributions on boot.
62+

‎source/content/pages/servers.rst‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ your needs for urgency of service ticket requests and the frequency you
6666
require for ongoing maintenance such as persistent storage backups.
6767

6868

69+
Virtualized servers resources
70+
-----------------------------
71+
`Choosing a low cost VPS <http://blog.redfern.me/choosing-a-low-cost-vps/>`_
72+
73+
74+
6975
Infrastructure-as-a-service
7076
---------------------------
7177
Infrastructure-as-a-service (IaaS) overlaps with virtualized servers
@@ -95,6 +101,14 @@ but you will pay correspondingly more for them. EBS throughput is just
95101
one of many quirks you need to understand before committing to an
96102
IaaS platform.
97103

104+
Infrastructure-as-a-service Resources
105+
-------------------------------------
106+
`Amazon Web Services official documentation for Python <http://aws.amazon.com/python/>`_
107+
108+
`boto <https://github.com/boto/boto>`_ is an amazing Python library for
109+
working with Amazon Web Services
110+
111+
98112

99113
Platform-as-a-service
100114
---------------------
@@ -124,15 +138,9 @@ If you go the PaaS route, you can skip over the operating system and web
124138
server sections because they are baked into PaaS offerings. PaaS offerings
125139
generally start at the WSGI server layer.
126140

127-
128-
Server Resources
129-
----------------
130-
`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)
131-
141+
Platform-as-a-service resources
142+
-------------------------------
132143
`Choosing Heroku <http://rdegges.com/devops-django-part-4-choosing-heroku>`_
133144
(Randall Degges)
134145

135-
`Choosing a low cost VPS <http://blog.redfern.me/choosing-a-low-cost-vps/>`_
136146

137-
`boto <https://github.com/boto/boto>`_ is an amazing Python library for
138-
working with Amazon Web Services

‎source/content/pages/source-control.rst‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Source Control
2+
==============
3+
4+
:category: future-page
5+
:slug: source-control
6+
:sort-order: 11
7+
8+
Source control systems (also known as version control systems) store code
9+
and other files, such as images, with a history of the changes made to
10+
those files.
11+
12+
13+
Source Control Systems
14+
----------------------
15+
`Git <http://git-scm.com/>`_ is a free and open source distributed version
16+
control system.
17+
18+
19+
Source Control Third Party Services
20+
-----------------------------------
21+
`GitHub <https://github.com/>`_ is currently the most commonly used source
22+
control platform for using Git.
23+
24+
`BitBucket <https://bitbucket.org/>`_ provides free Git and Mercurial
25+
repositories for open projects and paid services for hosting private
26+
repositories.
27+
28+
29+
Source Control Resources
30+
------------------------
31+
`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)