From 1ebea65289bef3c74b2d95b2e37fc4b5432fbef2 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 8 Jan 2020 23:14:43 +0100 Subject: [PATCH] Work on django-hosting product --- .../{cloud-backup => backup}/contents.lr | 8 +++- content/u/products/django-hosting/contents.lr | 31 +++++++------- .../products/django-hosting/djangohosting.svg | 40 +++++++++---------- models/product.ini | 4 +- 4 files changed, 44 insertions(+), 39 deletions(-) rename content/u/products/{cloud-backup => backup}/contents.lr (55%) diff --git a/content/u/products/cloud-backup/contents.lr b/content/u/products/backup/contents.lr similarity index 55% rename from content/u/products/cloud-backup/contents.lr rename to content/u/products/backup/contents.lr index 625fa82..4ee2f98 100644 --- a/content/u/products/cloud-backup/contents.lr +++ b/content/u/products/backup/contents.lr @@ -1,8 +1,12 @@ -_discoverable: no +_discoverable: yes --- _hidden: no --- -title: Cloud Backup +title: Backup --- subtitle: Your insurance in Switzerland --- + +Pricing: + +"VM" (IP?) diff --git a/content/u/products/django-hosting/contents.lr b/content/u/products/django-hosting/contents.lr index e6636ad..4e2d3e6 100644 --- a/content/u/products/django-hosting/contents.lr +++ b/content/u/products/django-hosting/contents.lr @@ -29,21 +29,8 @@ application with a good conscience and without emitting extra carbon. content1_text: ## Development flow -The below diagram gives an overview of a typical development flow with -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 - +The diagram gives an overview of a typical development flow with +our Django hosting. We strongly recommend to develop Django (like any other application) 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)). + +--- +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 * Setup fee is 35 CHF diff --git a/content/u/products/django-hosting/djangohosting.svg b/content/u/products/django-hosting/djangohosting.svg index b752bec..6aefbe0 100644 --- a/content/u/products/django-hosting/djangohosting.svg +++ b/content/u/products/django-hosting/djangohosting.svg @@ -36,14 +36,14 @@ editor - -Local editor + +Local editor git - -Local version control + +Local version control @@ -54,8 +54,8 @@ localweb - -Development webserver + +Development webserver @@ -66,9 +66,9 @@ repo - -Code repository -(f.i. git) + +Code repository +(f.i. git) @@ -79,15 +79,15 @@ prodvm - -Production Server -uwsgi,nginx,postgres + +Production Server +uwsgi,nginx,postgres backupvm - -Backup server + +Backup server @@ -106,8 +106,8 @@ stagingvm - -Staging Server + +Staging Server @@ -119,8 +119,8 @@ monitoring - -Monitoring server + +Monitoring server @@ -133,8 +133,8 @@ monitoringmonitor - -Monitoring server + +Monitoring server diff --git a/models/product.ini b/models/product.ini index 12211ce..24d5bec 100644 --- a/models/product.ini +++ b/models/product.ini @@ -51,7 +51,7 @@ type = markdown [fields.content1_text] label = Content1 Text -type = text +type = markdown [fields.content1_image] label = Content 1 Image @@ -59,7 +59,7 @@ type = url [fields.content2_text] label = Content 2 Text -type = text +type = markdown [fields.content2_image] label = Content 2 Image