Skip to content

Commit f38fc43

Browse files
committed
moving some links from OS to security. adding links
1 parent e93b14f commit f38fc43

File tree

5 files changed

+26
-21
lines changed

5 files changed

+26
-21
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>2014-03-23T13:41:33Z</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-03-23T18:45:18Z</updated></feed>

operating-systems.html

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -142,23 +142,16 @@ <h3>Red Hat and CentOS</h3>
142142
<h2>Operating System Resources</h2>
143143
<ul>
144144
<li>
145-
<p><a href="http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution">Choosing a Linux Distribution</a></p>
146-
</li>
147-
<li>
148-
<p><a 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>
145+
<p><a href="http://www.linux.org/threads/selecting-a-linux-distribution.4087/">What is a Linux distribution and how do I choose the right one?</a></p>
149146
</li>
150147
<li>
151-
<p><a href="http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/">Securing an Ubuntu Server</a></p>
148+
<p>Lifehacker's <a href="http://lifehacker.com/5889950/how-to-find-the-perfect-linux-distribution-for-you">guide to choosing a Linux distro</a>.</p>
152149
</li>
153150
<li>
154-
<p><a href="http://joshrendek.com/2013/01/securing-ubuntu/">Securing Ubuntu</a></p>
155-
</li>
156-
<li>
157-
<p><a href="http://spenserj.com/blog/2013/07/15/securing-a-linux-server/">Securing a Linux Server</a></p>
151+
<p><a href="http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution">Choosing a Linux Distribution</a></p>
158152
</li>
159153
<li>
160-
<p><a href="https://github.com/marshyski/quick-secure">quick NIX secure script</a> for
161-
securing Linux distributions.</p>
154+
<p><a 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>
162155
</li>
163156
</ul>
164157
<br/>

source/content/pages/03-operating-systems/0301-operating-systems.markdown

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,11 @@ provides a command-line interface for interacting with the RPM system.
8383

8484

8585
## Operating System Resources
86-
* [Choosing a Linux Distribution](http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution)
87-
88-
* [First 5 Minutes on a Server](http://plusbryan.com/my-first-5-minutes-on-a-server-or-essential-security-for-linux-servers)
86+
* [What is a Linux distribution and how do I choose the right one?](http://www.linux.org/threads/selecting-a-linux-distribution.4087/)
8987

90-
* [Securing an Ubuntu Server](http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/)
88+
* Lifehacker's [guide to choosing a Linux distro](http://lifehacker.com/5889950/how-to-find-the-perfect-linux-distribution-for-you).
9189

92-
* [Securing Ubuntu](http://joshrendek.com/2013/01/securing-ubuntu/)
93-
94-
* [Securing a Linux Server](http://spenserj.com/blog/2013/07/15/securing-a-linux-server/)
90+
* [Choosing a Linux Distribution](http://www.rackspace.com/knowledge_center/article/choosing-a-linux-distribution)
9591

96-
* [quick NIX secure script](https://github.com/marshyski/quick-secure) for
97-
securing Linux distributions.
92+
* [First 5 Minutes on a Server](http://plusbryan.com/my-first-5-minutes-on-a-server-or-essential-security-for-linux-servers)
9893

source/content/pages/18-web-security/1801-web-security.markdown

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ request forgery and usage of public-private keypairs.
1212

1313

1414
## Security Resources
15+
* [Securing an Ubuntu Server](http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/)
16+
17+
* [Securing Ubuntu](http://joshrendek.com/2013/01/securing-ubuntu/)
18+
19+
* [quick NIX secure script](https://github.com/marshyski/quick-secure) for
20+
securing Linux distributions.
21+
1522
* [Security Tips from Apache](http://httpd.apache.org/docs/current/misc/security_tips.html)
1623

1724
* [When and How to Deploy HTTPS](http://erik.io/blog/2013/06/08/a-basic-guide-to-when-and-how-to-deploy-https/)

web-application-security.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,16 @@ <h1>Web Application Security</h1>
8181
<h2>Security Resources</h2>
8282
<ul>
8383
<li>
84+
<p><a href="http://www.andrewault.net/2010/05/17/securing-an-ubuntu-server/">Securing an Ubuntu Server</a></p>
85+
</li>
86+
<li>
87+
<p><a href="http://joshrendek.com/2013/01/securing-ubuntu/">Securing Ubuntu</a></p>
88+
</li>
89+
<li>
90+
<p><a href="https://github.com/marshyski/quick-secure">quick NIX secure script</a> for
91+
securing Linux distributions.</p>
92+
</li>
93+
<li>
8494
<p><a href="http://httpd.apache.org/docs/current/misc/security_tips.html">Security Tips from Apache</a></p>
8595
</li>
8696
<li>

0 commit comments

Comments
 (0)