fnux/ungleich-staticcms
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Work on django-hosting product

Browse source
This commit is contained in:
Nico Schottelius 2020-01-08 23:14:43 +01:00
parent a2ae28d24e
commit 1ebea65289
4 changed files with 44 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
content/u/products/cloud-backup/contents.lr → content/u/products/backup/contents.lr
View file

@ -1,8 +1,12 @@
_discoverable: no _discoverable: yes
--- ---
_hidden: no _hidden: no
--- ---
title: Cloud Backup title: Backup
--- ---
subtitle: Your insurance in Switzerland subtitle: Your insurance in Switzerland
--- ---
Pricing:
"VM" (IP?)

31
content/u/products/django-hosting/contents.lr
View file

@ -29,21 +29,8 @@ application with a good conscience and without emitting extra carbon.
content1_text: content1_text:
## Development flow ## Development flow
The below diagram gives an overview of a typical development flow with The diagram gives an overview of a typical development flow with
our Django hosting: our Django hosting.
---
content1_image: djangohosting.svg
---
description2:
## How it works
## Components
Our Django hosting consists of 1-2 virtual machines and an optional
backup. Our customers often start with a development system
We strongly recommend to develop Django (like any other application) We strongly recommend to develop Django (like any other application)
with a version control system, even if you are just a single with a version control system, even if you are just a single
@ -52,6 +39,20 @@ repository](https://code.ungleich.ch) for free
(you only need to [register an account](https://account.ungleich.ch)). (you only need to [register an account](https://account.ungleich.ch)).
---
content1_image: djangohosting.svg
---
description2:
## Components
Depending on your stage of development, a Django hosting may contain
1 virtual machine (production), 2 virtual machines (staging +
production) and optionally a backup.
## Pricing ## Pricing
* Setup fee is 35 CHF * Setup fee is 35 CHF

40
content/u/products/django-hosting/djangohosting.svg
View file

@ -36,14 +36,14 @@
<!-- editor --> <!-- editor -->
<g id="node1" class="node"> <g id="node1" class="node">
<title>editor</title> <title>editor</title>
<polygon fill="none" stroke="black" points="247.5,-419 146.5,-419 146.5,-383 247.5,-383 247.5,-419"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="247.5,-419 146.5,-419 146.5,-383 247.5,-383 247.5,-419"/>
<text text-anchor="middle" x="197" y="-397.3" font-family="Times,serif" font-size="14.00">Local editor</text> <text text-anchor="middle" x="197" y="-397.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Local editor</text>
</g> </g>
<!-- git --> <!-- git -->
<g id="node2" class="node"> <g id="node2" class="node">
<title>git</title> <title>git</title>
<polygon fill="none" stroke="black" points="182,-325 16,-325 16,-289 182,-289 182,-325"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="182,-325 16,-325 16,-289 182,-289 182,-325"/>
<text text-anchor="middle" x="99" y="-303.3" font-family="Times,serif" font-size="14.00">Local version control</text> <text text-anchor="middle" x="99" y="-303.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Local version control</text>
</g> </g>
<!-- editor&#45;&gt;git --> <!-- editor&#45;&gt;git -->
<g id="edge1" class="edge"> <g id="edge1" class="edge">
@ -54,8 +54,8 @@
<!-- localweb --> <!-- localweb -->
<g id="node3" class="node"> <g id="node3" class="node">
<title>localweb</title> <title>localweb</title>
<polygon fill="none" stroke="black" points="391.5,-325 200.5,-325 200.5,-289 391.5,-289 391.5,-325"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="391.5,-325 200.5,-325 200.5,-289 391.5,-289 391.5,-325"/>
<text text-anchor="middle" x="296" y="-303.3" font-family="Times,serif" font-size="14.00">Development webserver</text> <text text-anchor="middle" x="296" y="-303.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Development webserver</text>
</g> </g>
<!-- editor&#45;&gt;localweb --> <!-- editor&#45;&gt;localweb -->
<g id="edge3" class="edge"> <g id="edge3" class="edge">
@ -66,9 +66,9 @@
<!-- repo --> <!-- repo -->
<g id="node5" class="node"> <g id="node5" class="node">
<title>repo</title> <title>repo</title>
<polygon fill="none" stroke="black" points="256.5,-186 125.5,-186 125.5,-148 256.5,-148 256.5,-186"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="256.5,-186 125.5,-186 125.5,-148 256.5,-148 256.5,-186"/>
<text text-anchor="middle" x="191" y="-170.8" font-family="Times,serif" font-size="14.00">Code repository</text> <text text-anchor="middle" x="191" y="-170.8" font-family="Times,serif" font-size="14.00" fill="#ffffff">Code repository</text>
<text text-anchor="middle" x="191" y="-155.8" font-family="Times,serif" font-size="14.00">(f.i. git)</text> <text text-anchor="middle" x="191" y="-155.8" font-family="Times,serif" font-size="14.00" fill="#ffffff">(f.i. git)</text>
</g> </g>
<!-- git&#45;&gt;repo --> <!-- git&#45;&gt;repo -->
<g id="edge2" class="edge"> <g id="edge2" class="edge">
@ -79,15 +79,15 @@
<!-- prodvm --> <!-- prodvm -->
<g id="node4" class="node"> <g id="node4" class="node">
<title>prodvm</title> <title>prodvm</title>
<polygon fill="none" stroke="black" points="398,-62 228,-62 228,-24 398,-24 398,-62"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="398,-62 228,-62 228,-24 398,-24 398,-62"/>
<text text-anchor="middle" x="313" y="-46.8" font-family="Times,serif" font-size="14.00">Production Server</text> <text text-anchor="middle" x="313" y="-46.8" font-family="Times,serif" font-size="14.00" fill="#ffffff">Production Server</text>
<text text-anchor="middle" x="313" y="-31.8" font-family="Times,serif" font-size="14.00">uwsgi,nginx,postgres</text> <text text-anchor="middle" x="313" y="-31.8" font-family="Times,serif" font-size="14.00" fill="#ffffff">uwsgi,nginx,postgres</text>
</g> </g>
<!-- backupvm --> <!-- backupvm -->
<g id="node8" class="node"> <g id="node8" class="node">
<title>backupvm</title> <title>backupvm</title>
<polygon fill="none" stroke="black" points="699.5,-325 580.5,-325 580.5,-289 699.5,-289 699.5,-325"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="699.5,-325 580.5,-325 580.5,-289 699.5,-289 699.5,-325"/>
<text text-anchor="middle" x="640" y="-303.3" font-family="Times,serif" font-size="14.00">Backup server</text> <text text-anchor="middle" x="640" y="-303.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Backup server</text>
</g> </g>
<!-- prodvm&#45;&gt;backupvm --> <!-- prodvm&#45;&gt;backupvm -->
<g id="edge6" class="edge"> <g id="edge6" class="edge">
@ -106,8 +106,8 @@
<!-- stagingvm --> <!-- stagingvm -->
<g id="node7" class="node"> <g id="node7" class="node">
<title>stagingvm</title> <title>stagingvm</title>
<polygon fill="none" stroke="black" points="600.5,-61 475.5,-61 475.5,-25 600.5,-25 600.5,-61"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="600.5,-61 475.5,-61 475.5,-25 600.5,-25 600.5,-61"/>
<text text-anchor="middle" x="538" y="-39.3" font-family="Times,serif" font-size="14.00">Staging Server</text> <text text-anchor="middle" x="538" y="-39.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Staging Server</text>
</g> </g>
<!-- repo&#45;&gt;stagingvm --> <!-- repo&#45;&gt;stagingvm -->
<g id="edge5" class="edge"> <g id="edge5" class="edge">
@ -119,8 +119,8 @@
<!-- monitoring --> <!-- monitoring -->
<g id="node6" class="node"> <g id="node6" class="node">
<title>monitoring</title> <title>monitoring</title>
<polygon fill="none" stroke="black" points="436,-185 290,-185 290,-149 436,-149 436,-185"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="436,-185 290,-185 290,-149 436,-149 436,-185"/>
<text text-anchor="middle" x="363" y="-163.3" font-family="Times,serif" font-size="14.00">Monitoring server</text> <text text-anchor="middle" x="363" y="-163.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Monitoring server</text>
</g> </g>
<!-- monitoring&#45;&gt;prodvm --> <!-- monitoring&#45;&gt;prodvm -->
<g id="edge7" class="edge"> <g id="edge7" class="edge">
@ -133,8 +133,8 @@
<!-- monitoringmonitor --> <!-- monitoringmonitor -->
<g id="node9" class="node"> <g id="node9" class="node">
<title>monitoringmonitor</title> <title>monitoringmonitor</title>
<polygon fill="none" stroke="black" points="562,-325 416,-325 416,-289 562,-289 562,-325"/> <polygon fill="#40a9e3" stroke="#40a9e3" points="562,-325 416,-325 416,-289 562,-289 562,-325"/>
<text text-anchor="middle" x="489" y="-303.3" font-family="Times,serif" font-size="14.00">Monitoring server</text> <text text-anchor="middle" x="489" y="-303.3" font-family="Times,serif" font-size="14.00" fill="#ffffff">Monitoring server</text>
</g> </g>
<!-- monitoringmonitor&#45;&gt;monitoring --> <!-- monitoringmonitor&#45;&gt;monitoring -->
<g id="edge8" class="edge"> <g id="edge8" class="edge">

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

4
models/product.ini
View file

@ -51,7 +51,7 @@ type = markdown
[fields.content1_text] [fields.content1_text]
label = Content1 Text label = Content1 Text
type = text type = markdown
[fields.content1_image] [fields.content1_image]
label = Content 1 Image label = Content 1 Image
@ -59,7 +59,7 @@ type = url
[fields.content2_text] [fields.content2_text]
label = Content 2 Text label = Content 2 Text
type = text type = markdown
[fields.content2_image] [fields.content2_image]
label = Content 2 Image label = Content 2 Image