Skip to content

Commit 7ec6e90

Browse files
mattmakaimattmakai
committed
adding diagram for paas versus servers
1 parent 28d4391 commit 7ec6e90

File tree

8 files changed

+84
-1
lines changed

8 files changed

+84
-1
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-04T16:43:19Z</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>2013-12-05T13:27:56Z</updated></feed>

‎img/servers-versus-paas.png‎

18.6 KB
Loading

‎index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ <h2>Platform-as-a-service</h2>
197197
<a class="reference external" href="https://openshift.redhat.com/community/get-started/python">OpenShift</a> are
198198
platform-as-services that support Python web applications. Each one requires
199199
varying tradeoffs to deploy to their respective platforms.</p>
200+
<img alt="Traditional LAMP server stack versus a Platform-as-a-Service stack" class="technical-diagram" src="../img/servers-versus-paas.png" />
200201
<p>If you go the PaaS route, you can skip over the operating system and web
201202
server sections because they are baked into PaaS offerings. PaaS offerings
202203
generally start at the WSGI server layer.</p>

‎pages/servers.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ <h2>Platform-as-a-service</h2>
142142
<a class="reference external" href="https://openshift.redhat.com/community/get-started/python">OpenShift</a> are
143143
platform-as-services that support Python web applications. Each one requires
144144
varying tradeoffs to deploy to their respective platforms.</p>
145+
<img alt="Traditional LAMP server stack versus a Platform-as-a-Service stack" class="technical-diagram" src="../img/servers-versus-paas.png" />
145146
<p>If you go the PaaS route, you can skip over the operating system and web
146147
server sections because they are baked into PaaS offerings. PaaS offerings
147148
generally start at the WSGI server layer.</p>

‎source/content/pages/servers.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ to conform applications to the PaaS architecture.
114114
platform-as-services that support Python web applications. Each one requires
115115
varying tradeoffs to deploy to their respective platforms.
116116

117+
118+
.. image:: ../img/servers-versus-paas.png
119+
:alt: Traditional LAMP server stack versus a Platform-as-a-Service stack
120+
:class: technical-diagram
121+
122+
117123
If you go the PaaS route, you can skip over the operating system and web
118124
server sections because they are baked into PaaS offerings. PaaS offerings
119125
generally start at the WSGI server layer.

‎source/mockups/servers-versus-paas.bmml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<mockup version="1.0" skin="wireframe" fontFace="Balsamiq Sans" measuredW="750" measuredH="440" mockupW="492" mockupH="374">
2+
<controls>
3+
<control controlID="1" controlTypeID="com.balsamiq.mockups::TextArea" x="498" y="147" w="200" h="228" measuredW="200" measuredH="140" zOrder="0" locked="false" isInGroup="-1">
4+
<controlProperties>
5+
<align>center</align>
6+
<backgroundAlpha>1</backgroundAlpha>
7+
<bold>true</bold>
8+
<color>15658734</color>
9+
<size>18</size>
10+
<text>%20%0A%20%0A%20%0APlatform-as-a-service%20%28PaaS%29</text>
11+
</controlProperties>
12+
</control>
13+
<control controlID="16" controlTypeID="com.balsamiq.mockups::TextArea" x="258" y="147" w="200" h="72" measuredW="200" measuredH="140" zOrder="1" locked="false" isInGroup="-1">
14+
<controlProperties>
15+
<align>center</align>
16+
<backgroundAlpha>1</backgroundAlpha>
17+
<bold>true</bold>
18+
<color>15658734</color>
19+
<size>18</size>
20+
<text>%20%0AWeb%20%26%20WSGI%20servers</text>
21+
</controlProperties>
22+
</control>
23+
<control controlID="19" controlTypeID="com.balsamiq.mockups::TextArea" x="258" y="226" w="200" h="72" measuredW="200" measuredH="140" zOrder="2" locked="false" isInGroup="-1">
24+
<controlProperties>
25+
<align>center</align>
26+
<backgroundAlpha>1</backgroundAlpha>
27+
<bold>true</bold>
28+
<color>14540253</color>
29+
<size>18</size>
30+
<text>%20%0AOperating%20system</text>
31+
</controlProperties>
32+
</control>
33+
<control controlID="20" controlTypeID="com.balsamiq.mockups::TextArea" x="258" y="303" w="200" h="72" measuredW="200" measuredH="140" zOrder="3" locked="false" isInGroup="-1">
34+
<controlProperties>
35+
<align>center</align>
36+
<backgroundAlpha>1</backgroundAlpha>
37+
<bold>true</bold>
38+
<color>10066329</color>
39+
<size>18</size>
40+
<text>%20%0AServer%20hardware</text>
41+
</controlProperties>
42+
</control>
43+
<control controlID="21" controlTypeID="com.balsamiq.mockups::TextArea" x="258" y="66" w="200" h="72" measuredW="200" measuredH="140" zOrder="4" locked="false" isInGroup="-1">
44+
<controlProperties>
45+
<align>center</align>
46+
<backgroundAlpha>1</backgroundAlpha>
47+
<bold>true</bold>
48+
<color>16777215</color>
49+
<size>18</size>
50+
<text>%20%0AWeb%20application</text>
51+
</controlProperties>
52+
</control>
53+
<control controlID="23" controlTypeID="com.balsamiq.mockups::TextArea" x="498" y="66" w="200" h="72" measuredW="200" measuredH="140" zOrder="5" locked="false" isInGroup="-1">
54+
<controlProperties>
55+
<align>center</align>
56+
<backgroundAlpha>1</backgroundAlpha>
57+
<bold>true</bold>
58+
<color>16777215</color>
59+
<size>18</size>
60+
<text>%20%0AWeb%20application</text>
61+
</controlProperties>
62+
</control>
63+
<control controlID="24" controlTypeID="com.balsamiq.mockups::VRule" x="473" y="66" w="-1" h="308" measuredW="10" measuredH="100" zOrder="6" locked="false" isInGroup="-1">
64+
<controlProperties>
65+
<stroke>dashed</stroke>
66+
</controlProperties>
67+
</control>
68+
<control controlID="25" controlTypeID="com.balsamiq.mockups::StickyNote" x="596" y="288" w="154" h="152" measuredW="109" measuredH="123" zOrder="7" locked="false" isInGroup="-1">
69+
<controlProperties>
70+
<size>16</size>
71+
<text>A%20PaaS%20usually%20provides%20these%20three%20layers%20of%20the%20stack%20with%20the%20web%20application%20sitting%20on%20top.</text>
72+
</controlProperties>
73+
</control>
74+
</controls>
75+
</mockup>

‎source/theme/static/img/servers-versus-paas.png‎

18.6 KB
Loading

‎theme/img/servers-versus-paas.png‎

18.6 KB
Loading

0 commit comments

Comments
 (0)