Make the displayed SSH username configurable

This patch allows the SSH username displayed in templates to be
configured through the SSH_USERNAME environment variable.

.drone.yml

@@ -0,0 +1,13 @@
+---
+kind: pipeline
+name: publish docker image
+steps:
+  - name: build and publish
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: docker_reg_username_3wc
+      password:
+        from_secret: docker_reg_passwd_3wc
+      repo: 3wordchant/capsul-flask
+      tags: ${DRONE_COMMIT_BRANCH}

.gitignore

@@ -1,5 +1,6 @@
 notes.txt
 .env
+.env.bak
 .vscode
 
 *.pyc

Dockerfile

@@ -0,0 +1,48 @@
+FROM python:3.8-alpine as build
+
+RUN apk add --no-cache \
+    build-base \
+    gcc \
+    gettext \
+    git \
+    jpeg-dev \
+    libffi-dev \
+    libjpeg \
+    musl-dev \
+    postgresql-dev \
+    python3-dev \
+    zlib-dev
+
+RUN mkdir -p /app/{code,venv}
+WORKDIR /app/code
+COPY Pipfile Pipfile.lock /app/code/
+
+RUN python3 -m venv /app/venv
+RUN pip install pipenv setuptools
+ENV PATH="/app/venv/bin:$PATH" VIRTUAL_ENV="/app/venv"
+RUN pip install wheel cppy
+# Install dependencies into the virtual environment with Pipenv
+RUN pipenv install --deploy --verbose
+
+FROM python:3.8-alpine
+
+RUN apk add --no-cache \
+    cloud-utils \
+    libjpeg \
+    libpq \
+    libstdc++ \
+    libvirt-client \
+    openssh-client \
+    virt-install
+
+COPY . /app/code/
+WORKDIR /app/code
+
+COPY --from=build /app/venv /app/venv
+ENV PATH="/app/venv/bin:$PATH" VIRTUAL_ENV="/app/venv"
+
+CMD ["gunicorn", "--bind", "0.0.0.0:5000", "-k", "gevent", "--worker-connections", "1000", "app:app"]
+
+VOLUME /app/code
+
+EXPOSE 5000

capsulflask/__init__.py

@@ -2,6 +2,7 @@ import logging
 from logging.config import dictConfig as logging_dict_config
 
 import atexit
+import jinja2
 import os
 import hashlib
 import requests
@@ -26,8 +27,24 @@ class StdoutMockFlaskMail:
     def send(self, message: Message):
       current_app.logger.info(f"Email would have been sent if configured:\n\nto: {','.join(message.recipients)}\nsubject: {message.subject}\nbody:\n\n{message.body}\n\n")
 
+
 load_dotenv(find_dotenv())
 
+for var_name in [
+  "SPOKE_HOST_TOKEN", "HUB_TOKEN", "STRIPE_SECRET_KEY",
+  "BTCPAY_PRIVATE_KEY", "MAIL_PASSWORD"
+]:
+  var = os.environ.get(f"{var_name}_FILE")
+  if not var:
+    continue
+
+  if not os.path.isfile(var):
+    continue
+
+  with open(var) as secret_file:
+    os.environ[var_name] = secret_file.read().rstrip('\n')
+  del os.environ[f"{var_name}_FILE"]
+
 app = Flask(__name__)
 
 app.config.from_mapping(
@@ -41,6 +58,7 @@ app.config.from_mapping(
   LOG_LEVEL=os.environ.get("LOG_LEVEL", default="INFO"),
   SPOKE_HOST_ID=os.environ.get("SPOKE_HOST_ID", default="baikal"),
   SPOKE_HOST_TOKEN=os.environ.get("SPOKE_HOST_TOKEN", default="changeme"),
+  SSH_USERNAME=os.environ.get("SSH_USERNAME", default="cyberian"),
   HUB_TOKEN=os.environ.get("HUB_TOKEN", default="changeme"),
 
   # https://www.postgresql.org/docs/9.1/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS
@@ -71,7 +89,9 @@ app.config.from_mapping(
   #STRIPE_WEBHOOK_SECRET=os.environ.get("STRIPE_WEBHOOK_SECRET", default="")
 
   BTCPAY_PRIVATE_KEY=os.environ.get("BTCPAY_PRIVATE_KEY", default="").replace("\\n", "\n"),
-  BTCPAY_URL=os.environ.get("BTCPAY_URL", default="")
+  BTCPAY_URL=os.environ.get("BTCPAY_URL", default=""),
+
+  THEME=os.environ.get("THEME", default="")
 )
 
 app.config['HUB_URL'] = os.environ.get("HUB_URL", default=app.config['BASE_URL'])
@@ -140,7 +160,7 @@ else:
 app.config['HTTP_CLIENT'] = MyHTTPClient(timeout_seconds=int(app.config['INTERNAL_HTTP_TIMEOUT_SECONDS']))
 
 app.config['BTCPAY_ENABLED'] = False
-if app.config['BTCPAY_URL'] is not "":
+if app.config['BTCPAY_URL'] != "":
   try:
     app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
     app.config['BTCPAY_ENABLED'] = True
@@ -154,6 +174,14 @@ is_running_server = ('flask run' in command_line) or ('gunicorn' in command_line
 
 app.logger.info(f"is_running_server: {is_running_server}")
 
+if app.config['THEME'] != "":
+  my_loader = jinja2.ChoiceLoader([
+    jinja2.FileSystemLoader(
+      [os.path.join('capsulflask', 'theme', app.config['THEME']),
+       'capsulflask/templates']),
+  ])
+  app.jinja_loader = my_loader
+
 if app.config['HUB_MODE_ENABLED']:
 
   if app.config['HUB_MODEL'] == "capsul-flask":

capsulflask/console.py

@@ -108,6 +108,8 @@ def detail(id):
   if vm is None:
     return abort(404, f"{id} doesn't exist.")
 
+  vm['ssh_username'] = current_app.config['SSH_USERNAME']
+
   if vm['deleted']:
     return render_template("capsul-detail.html", vm=vm, delete=True, deleted=True)
 
@@ -199,6 +201,14 @@ def create():
   capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
   errors = list()
 
+  affordable_vm_sizes = dict()
+  for key, vm_size in vm_sizes.items():
+    # if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month, 
+    # then they have to delete the vm and re-create it, they will not be able to, they will have to pay again.
+    # so for UX it makes a lot of sense to give a small margin of 25 cents for usability sake
+    if vm_size["dollars_per_month"] <= account_balance+0.25:
+      affordable_vm_sizes[key] = vm_size
+
   if request.method == "POST":
     if "csrf-token" not in request.form or request.form['csrf-token'] != session['csrf-token']:
       return abort(418, f"u want tea")
@@ -209,6 +219,8 @@ def create():
       errors.append("Size is required")
     elif size not in vm_sizes:
       errors.append(f"Invalid size {size}")
+    elif size not in affordable_vm_sizes:
+      errors.append(f"Your account must have enough credit to run an {size} for 1 month before you will be allowed to create it")
 
     if not os:
       errors.append("OS is required")
@@ -260,13 +272,6 @@ def create():
       
       return redirect(f"{url_for('console.index')}?created={id}")
   
-  affordable_vm_sizes = dict()
-  for key, vm_size in vm_sizes.items():
-    # if a user deposits $7.50 and then creates an f1-s vm which costs 7.50 a month, 
-    # then they have to delete the vm and re-create it, they will not be able to, they will have to pay again.
-    # so for UX it makes a lot of sense to give a small margin of 25 cents for usability sake
-    if vm_size["dollars_per_month"] <= account_balance+0.25:
-      affordable_vm_sizes[key] = vm_size
 
   for error in errors:
     flash(error)

capsulflask/hub_model.py

@@ -17,6 +17,10 @@ from capsulflask.http_client import HTTPResult
 from capsulflask.shared import VirtualizationInterface, VirtualMachine, OnlineHost, validate_capsul_id, my_exec_info_message
 
 class MockHub(VirtualizationInterface):
+  def __init__(self):
+    self.default_network = "public1"
+    self.default_ipv4 = "1.1.1.1"
+
   def capacity_avaliable(self, additional_ram_bytes):
     return True
 
@@ -29,9 +33,9 @@ class MockHub(VirtualizationInterface):
         {"key_type":"RSA", "content":"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCvotgzgEP65JUQ8S8OoNKy1uEEPEAcFetSp7QpONe6hj4wPgyFNgVtdoWdNcU19dX3hpdse0G8OlaMUTnNVuRlbIZXuifXQ2jTtCFUA2mmJ5bF+XjGm3TXKMNGh9PN+wEPUeWd14vZL+QPUMev5LmA8cawPiU5+vVMLid93HRBj118aCJFQxLgrdP48VPfKHFRfCR6TIjg1ii3dH4acdJAvlmJ3GFB6ICT42EmBqskz2MPe0rIFxH8YohCBbAbrbWYcptHt4e48h4UdpZdYOhEdv89GrT8BF2C5cbQ5i9qVpI57bXKrj8hPZU5of48UHLSpXG8mbH0YDiOQOfKX/Mt", "sha256":"ghee6KzRnBJhND2kEUZSaouk7CD6o6z2aAc8GPkV+GQ"},
         {"key_type":"ECDSA", "content":"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLLgOoATz9R4aS2kk7vWoxX+lshK63t9+5BIHdzZeFE1o+shlcf0Wji8cN/L1+m3bi0uSETZDOAWMP3rHLJj9Hk=", "sha256":"aCYG1aD8cv/TjzJL0bi9jdabMGksdkfa7R8dCGm1yYs"}
       ]""")
-      return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4="1.1.1.1", ssh_host_keys=ssh_host_keys)
+      return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4=self.default_ipv4, ssh_host_keys=ssh_host_keys)
 
-    return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4="1.1.1.1")
+    return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4=self.default_ipv4)
 
   def list_ids(self) -> list:
     return get_model().all_non_deleted_vm_ids()
@@ -40,6 +44,16 @@ class MockHub(VirtualizationInterface):
     validate_capsul_id(id)
     current_app.logger.info(f"mock create: {id} for {email}")
     sleep(1)
+    get_model().create_vm(
+      email=email, 
+      id=id, 
+      size=size, 
+      os=os,
+      host=current_app.config["SPOKE_HOST_ID"],
+      network_name=self.default_network,
+      public_ipv4=self.default_ipv4,
+      ssh_authorized_keys=list(map(lambda x: x["name"], ssh_authorized_keys)),
+    )
 
   def destroy(self, email: str, id: str):
     current_app.logger.info(f"mock destroy: {id} for {email}")
@@ -49,7 +63,6 @@ class MockHub(VirtualizationInterface):
 
 
 class CapsulFlaskHub(VirtualizationInterface):
-
   def synchronous_operation(self, hosts: List[OnlineHost], email: str, payload: str) -> List[HTTPResult]:
     return self.generic_operation(hosts, email, payload, True)[1]
   
@@ -262,4 +275,3 @@ class CapsulFlaskHub(VirtualizationInterface):
 
     if not result_status == "success":
       raise ValueError(f"""failed to {command} vm "{id}" on host "{host.id}" for {email}: {result_json_string}""")
-

capsulflask/landing.py

@@ -22,7 +22,7 @@ def pricing():
 
 @bp.route("/faq")
 def faq():
-  return render_template("faq.html")
+  return render_template("faq.html", ssh_username=current_app.config['SSH_USERNAME'])
 
 @bp.route("/about-ssh")
 def about_ssh():

capsulflask/shell_scripts/get.sh

@@ -30,6 +30,6 @@ if virsh domuuid "$vmname" | grep -vqE '^[\t\s\n]*$'; then
 fi
 
 # this gets the ipv4
-ipv4="$(virsh domifaddr "$vmname" | awk '/vnet/ {print $4}' | cut -d'/' -f1)"
+ipv4="$(virsh domifaddr "$vmname" | awk '/ipv4/ {print $4}' | cut -d'/' -f1)"
 
 echo "$exists $state $ipv4"

capsulflask/static/style.yolocolo.css

@@ -0,0 +1,35 @@
+html {
+  color: #241e1e !important;
+  background-color: #bdc7b8 !important;
+}
+
+a {
+  color:#00517a !important;
+  text-shadow: 1px 1px 0px #eee !important;
+}
+
+a:hover, a:active, a:visited {
+  color: #323417 !important;
+} 
+
+.nav-links  a {
+  text-shadow: 2px 2px 0px #eee !important;
+}
+
+h1, h2, h3, h4, h5 {
+	text-shadow: 2px 2px 0px #eee;
+}
+
+main {
+  border: 1px dashed #241e1e !important;
+}
+
+
+input, select, textarea {
+  color: #241e1e !important;
+}
+
+th {
+  border-right: 1px solid #eee !important;
+  text-align: left !important;
+}

capsulflask/templates/capsul-detail.html

@@ -97,7 +97,7 @@
       </div>
       <div class="row justify-start">
         <label class="align" for="ssh_username">SSH Username</label>
-        <span id="ssh_username">cyberian</span>
+        <span id="ssh_username">{{ vm['ssh_username'] }}</span>
       </div>
       <div class="row justify-start">
         <label class="align" for="ssh_authorized_keys">SSH Authorized Keys</label>

capsulflask/templates/faq.html

@@ -21,13 +21,13 @@
    </li>
    <li>
      How do I log in?
-     <p>ssh to the ip provided to you using the cyberian user.</p>
-     <pre class='code'>$ ssh cyberian@1.2.3.4</pre>
+     <p>ssh to the ip provided to you using the "{{ ssh_username }}" user.</p>
+     <pre class='code'>$ ssh {{ ssh_username }}@1.2.3.4</pre>
      <p>For more information, see <a href="/about-ssh">Understanding the Secure Shell Protocol (SSH)</a>.</p>
    </li>
    <li>
      How do I change to the root user?
-     <p>The cyberian user has passwordless sudo access by default. This should work:</p>
+     <p>The "{{ ssh_username }}" user has passwordless sudo access by default. This should work:</p>
      <pre class='code'>
 # Linux
 $ sudo su -

capsulflask/theme/yolocolo/account-balance.html

@@ -0,0 +1,94 @@
+{% extends 'base.html' %}
+
+{% block title %}Account Balance{% endblock %}
+
+{% block content %}
+<div class="row third-margin">
+  <h1>Account Balance: ${{ account_balance }}</h1>
+</div>
+<div class="half-margin">
+ 
+  {% if has_vms and has_payments and warning_text != "" %}
+  <div class="row">
+    <pre class="wrap">{{ warning_text }}</pre>
+  </div>
+  {% endif %}
+  <div class="row">
+    {% if has_payments %}
+    <div>
+      <div class="row third-margin">
+        <h1>Payments</h1>
+      </div>
+    
+      <table>
+        <thead>
+          <tr>
+            <th>amount</th>
+            <th>date</th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for payment in payments %}
+            <tr>
+              <td class="{{ payment['class_name'] }}">${{ payment["dollars"] }}</td>
+              <td class="{{ payment['class_name'] }}">{{ payment["created"] }}</td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+    {% endif %}
+    <ul>
+      <li>
+        <h1>PAYMENT OPTIONS</h1>
+        <ul>
+          <li>
+            <a href="/payment/stripe">Add funds with Credit/Debit (stripe)</a>
+            <ul><li>notice: stripe will load nonfree javascript </li></ul>
+          </li>
+          {% if btcpay_enabled %}
+          <li><a href="/payment/btcpay">Add funds with Bitcoin/Litecoin/Monero (btcpay)</a></li>
+          {% endif %}
+        </ul>
+      </li>
+    </ul>
+
+  </div>
+
+
+  {% if has_vms %}
+  <div class="row third-margin">
+    <h1>Capsuls Billed</h1>
+  </div>
+  <div class="row">
+    <table class="small">
+      <thead>
+        <tr>
+          <th>id</th>
+          <th>created</th>
+          <th>deleted</th>
+          <th>$/month</th>
+          <th>months</th>
+          <th>$ billed</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for vm in vms_billed %}
+          <tr>
+            <td>{{ vm["id"] }}</td>
+            <td>{{ vm["created"] }}</td>
+            <td>{{ vm["deleted"] }}</td>
+            <td>${{ vm["dollars_per_month"] }}</td>
+            <td>{{ vm["months"] }}</td>
+            <td>${{ vm["dollars"] }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  
+  {% endif %}
+</div>
+{% endblock %}
+
+{% block pagesource %}/templates/create-capsul.html{% endblock %}

capsulflask/theme/yolocolo/base.html

@@ -0,0 +1,60 @@
+<html lang="en">
+<head>
+  <!-- Namecoin Address: N2aVL6pHtBp7EtNGb3jpsL2L2NyjBNbiB1 -->
+  <link href="{{ url_for('static', filename='favicon.yolocolo.ico') }}" rel="icon">
+  <title>{% block title %}{% endblock %}{% if self.title() %} - {% endif %}Capsul</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <meta name="Description" content="Cyberia Capsul">
+  {% block head %}{% endblock %}
+  <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
+  <link rel="stylesheet" href="{{ url_for('static', filename='style.yolocolo.css') }}">
+</head>
+<body>
+<nav>
+  <div class="row justify-space-between half-margin">
+    <div>
+      🦉 <a href="/"><b>YOLOCOLO</b></a>
+    </div>
+    <div>
+      &nbsp;
+      {% if session["account"] %} 
+        { {{ session["account"] }} <a href="{{ url_for('auth.logout') }}">Log Out</a> } 
+      {% else %} 
+        <a href="{{ url_for('auth.login') }}">Login</a>
+      {% endif %}
+    </div>
+  </div>
+  <div class="row justify-center half-margin wrap nav-links">
+    <a href="/pricing">Pricing</a>
+    <a href="/faq">FAQ</a>
+
+    {% if session["account"] %} 
+      <a href="/console">Capsuls</a>
+      <a href="/console/ssh">SSH Public Keys</a>
+      <a href="/console/account-balance">Account Balance</a>
+    {% endif %}
+
+    <a href="/support">Support</a>
+  </div>
+</nav>
+{% for message in get_flashed_messages() %}
+  <div class="flash">{{ message }}</div>
+{% endfor %}
+{% block custom_flash %}{% endblock %}
+<main>
+  {% block content %}{% endblock %}
+</main>
+{% block subcontent %}{% endblock %}
+<footer>
+  This server runs <a
+    href="https://giit.cyberia.club/~forest/capsul-flask">capsul-flask</a> by
+  Cyberia Computer Club, available under the <a
+    href="https://creativecommons.org/licenses/by-sa/4.0/">Attribution-ShareAlike
+    4.0 International</a> licence.<br/><br/>
+  <a href="https://git.autonomic.zone/3wordchant/capsul-flask/src/branch/yolocolo/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
+</footer>
+</body>
+</html>
+
+

capsulflask/theme/yolocolo/capsuls.html

@@ -0,0 +1,68 @@
+{% extends 'base.html' %}
+
+{% block title %}Capsuls{% endblock %}
+
+{% block custom_flash %}
+{% if created  %} 
+  <div class="flash green">{{ created }} successfully created!</div>
+{% endif %}
+{% endblock %}
+
+{% block content %}
+<div class="row third-margin">
+  <h1>Capsuls</h1>
+</div>
+<div class="third-margin">
+  {% if has_vms %} 
+  <div class="row third-margin justify-end">
+    <a href="/console/create">Create Capsul</a>
+  </div>
+  <div class="row">
+    <table>
+      <thead>
+        <tr>
+          <th class="heart-icon">❦</th>
+          <th>id</th>
+          <th>size</th>
+          <th>cpu</th>
+          <th>mem</th>
+          <th>ipv4</th>
+          <th>os</th>
+          <th>created</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for vm in vms %}
+          <tr>
+            {% if vm['state'] == 'starting' or vm['state'] == 'stopping'  %}
+              <td class="capsul-status waiting-pulse">•</td>
+            {% elif vm['state'] == 'crashed' or vm['state'] == 'blocked' or vm['state'] == 'stopped'  %}
+              <td class="capsul-status red">•</td>
+            {% elif vm['state'] == 'unknown' %}
+              <td class="capsul-status-questionmark">?</td>
+            {% else  %}
+              <td class="capsul-status green">•</td>
+            {% endif  %}
+            
+            <td><a class="no-shadow" href="/console/{{ vm['id'] }}">{{ vm["id"] }}</a></td>
+            <td>{{ vm["size"] }}</td>
+            <td class="metrics"><img src="/metrics/cpu/{{ vm['id'] }}/5m/s"/></td>
+            <td class="metrics"><img src="/metrics/memory/{{ vm['id'] }}/5m/s"/></td>
+            <td class="{{ vm['ipv4_status'] }}">{{ vm["ipv4"] }}</td>
+            <td>{{ vm["os"] }}</td>
+            <td>{{ vm["created"] }}</td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </div>
+  
+  {% else %} 
+  <div class="row">
+    <p>You don't have any Capsuls running. <a href="/console/create">Create one</a> today!</p>
+  </div>
+  {% endif %}
+</div>
+{% endblock %}
+
+{% block pagesource %}/templates/capsuls.html{% endblock %}

capsulflask/theme/yolocolo/faq.html

@@ -0,0 +1,46 @@
+{% extends 'base.html' %}
+
+{% block title %}FAQ{% endblock %}
+
+{% block content %}
+  <div class="row full-margin"><h1>Frequently Asked Questions</h1></div>
+{% endblock %}
+
+{% block subcontent %}
+<p>
+ <ul>
+   <li>
+     What is this?
+     <p>
+      This is a <strong>technical demo</strong> of <a
+       href="https://giit.cyberia.club/~forest/capsul-flask">Capsul</a>, for the
+      as-yet-untitled <a href="https://coops.tech">Cotech</a> server hosting
+      initiative, which you can <a
+      href="https://community.coops.tech/t/call-for-input-v2-co-op-vps-survey/2802/9">read
+     about on the Cotech forum</a>.
+     </p>
+   </li>
+   <li>
+     What do you mean, "technical demo"?
+     <p>No backups</p>
+     <p>No service level agreement</p>
+     <p>"Best effort" support</p>
+   </li>
+   <li>
+     Where can I get this, but, more reliable?
+     <p>Cyberia, the authors of this platform, run the canonical instance, <a
+      href="https://capsul.org">Capsul.org</a>, on hardware they own. Please
+     send them your money! (cash, crypto, or card accepted).</p>
+   </li>
+   <li>
+     How do I use this system?
+     <p>Please see <a href="https://capsul.org/faq">the official Capsul FAQ
+       page</a>.</p>
+   </li>
+ </ul>
+</p>
+
+{% endblock %}
+
+{% block pagesource %}/templates/faq.html{% endblock %}
+

capsulflask/theme/yolocolo/index.html

@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+
+{% block content %}
+  <h1>
+  <pre>
+             _                 _
+ _   _  ___ | | ___   ___ ___ | | ___
+| | | |/ _ \| |/ _ \ / __/ _ \| |/ _ \
+| |_| | (_) | | (_) | (_| (_) | | (_) |
+ \__, |\___/|_|\___/ \___\___/|_|\___/
+ |___/
+
+  </pre>
+  <span>Co-operative hosting using <a href="https://cyberia.club">Cyberia</a>'s Capsul</span>
+{% endblock %}
+
+{% block subcontent %}
+<p>
+ <ul>
+   <li>Sign up for an account!</li>
+   <li>Add some funds!</li>
+   <li>Create a VPS!</li>
+   <li>Give your feedback!</li>
+ </ul>           
+</p>
+{% endblock %}
+
+{% block pagesource %}/templates/index.html{% endblock %}

capsulflask/theme/yolocolo/pricing.html

@@ -0,0 +1,23 @@
+{% extends 'base.html' %}
+
+{% block title %}Pricing{% endblock %}
+
+{% block content %}
+  <div class="row third-margin">
+    <h1>CAPSUL TYPES & PRICING</h1>
+  </div>
+  <div class="row half-margin">
+    <p>
+      Rates for this service aren't set yet. You can see Cyberia's Capsul pricing
+      on <a href="https://capsul.org/pricing">their website</a>.
+    </p>
+  </div>
+  <div>
+    <pre>
+      SUPPORTED OPERATING SYSTEMS:
+
+      {% for os_id, os in operating_systems.items() %}   - {{ os.description }} 
+      {% endfor %}
+    </pre>
+  </div>
+{% endblock %}

capsulflask/theme/yolocolo/support.html

@@ -0,0 +1,21 @@
+{% extends 'base.html' %}
+
+{% block title %}Support{% endblock %}
+
+{% block content %}
+  <div class="row half-margin">
+    <h1>SUPPORT</h1>
+  </div>
+  <div class="row half-margin">
+    <a href="mailto:yolocolo@doesthisthing.work?subject=Please%20help!">yolocolo@doesthisthing.work</a> 
+  </div>
+{% endblock %}
+
+{% block subcontent %}
+<p>
+  You can also find us on Matrix: <a
+    href="https://matrix.to/#/#untitled-hosting.public:autonomic.zone">#untitled-hosting.public:autonomic.zone</a>.
+</p>
+{% endblock %}
+
+{% block pagesource %}/templates/support.html{% endblock %}

docker-compose.yml

@@ -0,0 +1,36 @@
+---
+version: "3.8"
+
+services:
+  app:
+    image: 3wordchant/capsul-flask:latest
+    build: .
+    volumes:
+      - "./:/app/code"
+      - "../tank:/tank"
+      # - "/var/run/libvirt/libvirt-sock:/var/run/libvirt/libvirt-sock"
+    depends_on:
+      - db
+    ports:
+      - "5000:5000"
+    environment:
+      - "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
+      - SPOKE_MODEL=shell-scripts
+        #- FLASK_DEBUG=1
+      - BASE_URL=http://localhost:5000
+      - ADMIN_PANEL_ALLOW_EMAIL_ADDRESSES=3wc.capsul@doesthisthing.work
+      - VIRSH_DEFAULT_CONNECT_URI=qemu:///system
+    # The image uses gunicorn by default, let's override it with Flask's
+    # built-in development server
+    command: ["flask", "run", "-h", "0.0.0.0", "-p", "5000"]
+  db:
+    image: "postgres:9.6.5-alpine"
+    volumes:
+      - "postgres:/var/lib/postgresql/data"
+    environment:
+      POSTGRES_USER: capsul
+      POSTGRES_PASSWORD: capsul
+      POSTGRES_DB: capsul
+
+volumes:
+  postgres: