Un-hard-code SSH key name

.drone.yml

@@ -0,0 +1,14 @@
+---
+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: latest
+

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,7 +2,6 @@ import logging
 from logging.config import dictConfig as logging_dict_config
 
 import atexit
-import jinja2
 import os
 import hashlib
 import requests
@@ -27,11 +26,28 @@ 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(
+  
   BASE_URL=os.environ.get("BASE_URL", default="http://localhost:5000"),
   SECRET_KEY=os.environ.get("SECRET_KEY", default="dev"),
   HUB_MODE_ENABLED=os.environ.get("HUB_MODE_ENABLED", default="True").lower() in ['true', '1', 't', 'y', 'yes'],
@@ -72,9 +88,7 @@ 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=""),
-
-  THEME=os.environ.get("THEME", default="")
+  BTCPAY_URL=os.environ.get("BTCPAY_URL", default="https://btcpay.cyberia.club")
 )
 
 app.config['HUB_URL'] = os.environ.get("HUB_URL", default=app.config['BASE_URL'])
@@ -142,13 +156,10 @@ 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'] != "":
-  try:
-    app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
-    app.config['BTCPAY_ENABLED'] = True
-  except:
-    app.logger.warning("unable to create btcpay client. Capsul will work fine except cryptocurrency payments will not work. The error was: " + my_exec_info_message(sys.exc_info()))
+try:
+  app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
+except:
+  app.logger.warning("unable to create btcpay client. Capsul will work fine except cryptocurrency payments will not work. The error was: " + my_exec_info_message(sys.exc_info()))
 
 # only start the scheduler and attempt to migrate the database if we are running the app.
 # otherwise we are running a CLI command.
@@ -157,14 +168,6 @@ 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":
@@ -232,6 +235,7 @@ def override_url_for():
   return dict(url_for=url_for_with_cache_bust)
 
 
+
 def url_for_with_cache_bust(endpoint, **values):
   """
   Add a query parameter based on the hash of the file, this acts as a cache bust
@@ -256,3 +260,7 @@ def url_for_with_cache_bust(endpoint, **values):
       values['q'] = current_app.config['STATIC_FILE_HASH_CACHE'][filename]
 
   return url_for(endpoint, **values)
+
+
+
+  

capsulflask/console.py

@@ -423,7 +423,6 @@ def account_balance():
     has_vms=len(vms_billed)>0, 
     vms_billed=vms_billed,
     warning_text=warning_text,
-    btcpay_enabled=current_app.config["BTCPAY_ENABLED"],
     payments=list(map(
       lambda x: dict(
         dollars=x["dollars"], 

capsulflask/hub_api.py

@@ -178,4 +178,4 @@ def on_create_claimed(payload, host_id):
     network_name=payload['network_name'],
     public_ipv4=payload['public_ipv4'],
     ssh_authorized_keys=list(map(lambda x: x["name"], payload['ssh_authorized_keys'])),
-  )
+  )

capsulflask/hub_model.py

@@ -214,12 +214,13 @@ class CapsulFlaskHub(VirtualizationInterface):
       except:
         # no need to do anything here since if it cant be parsed then generic_operation will handle it.
         pass
+
+    if error_message != "":
+      raise ValueError(f"create capsul operation {operation_id} on {assigned_hosts} failed with {error_message}")
       
     if number_of_assigned != 1:
       assigned_hosts_string = ", ".join(assigned_hosts)
       raise ValueError(f"expected create capsul operation {operation_id} to be assigned to one host, it was assigned to {number_of_assigned} ({assigned_hosts_string})")
-    if error_message != "":
-      raise ValueError(f"create capsul operation {operation_id} on {assigned_hosts_string} failed with {error_message}")
       
 
   def destroy(self, email: str, id: str):

capsulflask/landing.py

@@ -12,11 +12,9 @@ def index():
 
 @bp.route("/pricing")
 def pricing():
-  vm_sizes = get_model().vm_sizes_dict()
   operating_systems = get_model().operating_systems_dict()
   return render_template(
     "pricing.html", 
-    vm_sizes=vm_sizes,
     operating_systems=operating_systems
   )
 

capsulflask/payment.py

@@ -48,10 +48,6 @@ def validate_dollars():
 def btcpay_payment():
   errors = list()
 
-  if not current_app.config['BTCPAY_ENABLED']:
-    flash("BTCPay is not enabled on this server")
-    return redirect(url_for("console.account_balance"))
-
   if request.method == "POST":
     result = validate_dollars()
     errors = result[0]
@@ -293,4 +289,4 @@ def success():
 #   except stripe.error.SignatureVerificationError:
 #     print("/payment/stripe/webhook returned 400: invalid signature")
 #     abort(400, "invalid signature")
-      
+      

capsulflask/shell_scripts/capacity-avaliable.sh

@@ -3,7 +3,7 @@
 # check available RAM and IPv4s
 
 ram_bytes_to_allocate="$1"
-ram_bytes_available=$(grep -E "^(size|memory_available_bytes)" /proc/spl/kstat/zfs/arcstats | awk '{sum+=$3} END {printf "%.0f", sum}')
+ram_bytes_available="$(($(grep Available /proc/meminfo | grep -o '[0-9]*') * 1024))"
 ram_bytes_remainder="$((ram_bytes_available - ram_bytes_to_allocate))"
 
 if echo "$ram_bytes_to_allocate" | grep -vqE "^[0-9]+$"; then
@@ -11,8 +11,8 @@ if echo "$ram_bytes_to_allocate" | grep -vqE "^[0-9]+$"; then
   exit 1
 fi
 
-# 20GB
-if [ "$ram_bytes_remainder" -le $((20 * 1024 * 1024 * 1024)) ]; then
+# 0.25GB
+if [ "$ram_bytes_remainder" -le $((1 * 1024 * 1024 * 1024 / 4)) ]; then
   echo "VM is requesting more RAM than $(hostname -f) has available."
   echo "Bytes requested: $ram_bytes_to_allocate"
   echo "Bytes available: $ram_bytes_available"

capsulflask/shell_scripts/create.sh

@@ -6,6 +6,7 @@
 
 vmname="$1"
 template_file="/tank/img/$2"
+qemu_tank_dir="/tank"
 vcpus="$3"
 memory="$4"
 pubkeys="$5"
@@ -50,40 +51,40 @@ if echo "$public_ipv4" | grep -vqE "^[0-9.]+$"; then
   exit 1
 fi
 
-disk="/tank/vm/$vmname.qcow2"
-cdrom="/tank/vm/$vmname.iso"
-xml="/tank/vm/$vmname.xml"
+disk="$vmname.qcow2"
+cdrom="$vmname.iso"
+xml="$vmname.xml"
 
 if [ -f /tank/vm/$vmname.qcow2 ]; then
     echo "Randomly generated name matched an existing VM! Odds are like one in a billion. Buy a lotto ticket."
     exit 1
 fi
 
-cp "$template_file" "$disk"
+cp "$template_file" "/tank/vm/$disk"
 cp /tank/config/cyberia-cloudinit.yml /tmp/cloudinit.yml
 echo "$pubkeys" | while IFS= read -r line; do
   echo "      - $line" >> /tmp/cloudinit.yml
 done
 
-cloud-localds "$cdrom" /tmp/cloudinit.yml
+cloud-localds "/tank/vm/$cdrom" /tmp/cloudinit.yml
 
-qemu-img resize "$disk" "$root_volume_size"
+qemu-img resize "/tank/vm/$disk" "$root_volume_size"
 virt-install \
     --memory "$memory" \
     --vcpus "$vcpus" \
     --name "$vmname" \
-    --disk "$disk",bus=virtio \
-    --disk "$cdrom",device=cdrom \
+    --disk "$qemu_tank_dir/vm/$disk",bus=virtio \
+    --disk "$qemu_tank_dir/vm/$cdrom",device=cdrom \
     --os-type Linux \
     --os-variant generic \
     --virt-type kvm \
     --graphics vnc,listen=127.0.0.1 \
-    --network network=$network_name,filterref=clean-traffic,model=virtio \
+    --network network=$network_name,model=virtio \
     --import \
-    --print-xml > "$xml"
+    --print-xml > "/tank/vm/$xml"
 
-chmod 0600 "$xml" "$disk" "$cdrom"
-virsh define "$xml"
+chmod 0600 "/tank/vm/$xml" "/tank/vm/$disk" "/tank/vm/$cdrom"
+virsh define "/tank/vm/$xml"
 virsh start "$vmname"
 
 echo "success"

capsulflask/static/style.css

@@ -241,6 +241,7 @@ thead {
   background: #bdc7b812;
 }
 td, th {
+
   padding: 0.1em 1em;
 }
 table.small td, table.small th {
@@ -377,4 +378,4 @@ footer {
   border: 1px solid rgba(255, 223, 155, 0.8);
   box-sizing: border-box;
   position: relative;
-}
+}

capsulflask/static/style.yolocolo.css

@@ -1,35 +0,0 @@
-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/account-balance.html

@@ -46,9 +46,7 @@
             <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 %}
     
           <li>Cash: email <a href="mailto:treasurer@cyberia.club">treasurer@cyberia.club</a></li>
         </ul>

capsulflask/templates/faq.html

@@ -23,7 +23,6 @@
      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>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?

capsulflask/templates/pricing.html

@@ -6,37 +6,21 @@
   <div class="row third-margin">
     <h1>CAPSUL TYPES & PRICING</h1>
   </div>
-  <div class="row half-margin">
-    <table>
-      <thead>
-        <tr>
-          <th>type</th>
-          <th>monthly*</th>
-          <th>cpus</th>
-          <th>mem</th>
-          <th>ssd</th>
-          <th>net</th>
-        </tr>
-      </thead>
-      <tbody>
-      {% for vm_size_key, vm_size in vm_sizes.items() %}
-        <tr>
-          <td>{{ vm_size_key }}</td>
-          <td>${{ vm_size['dollars_per_month'] }}</td>
-          <td>{{ vm_size['vcpus'] }}</td>
-          <td>{{ vm_size['memory_mb'] }}</td>
-          <td>25G</td>
-          <td>{{ vm_size['bandwidth_gb_per_month'] }}</td>
-        </tr>
-      {% endfor %}
-      </tbody>
-    </table>
-  </div>
   <div class="row half-margin">
     <pre>
+    type     monthly*  cpus  mem     ssd   net*
+    -----    -------   ----  ---     ---   ---
+    f1-xs    $5.00     1     512M    25G   .5TB
+    f1-s     $7.50     1     1024M   25G   1TB
+    f1-m     $12.50    1     2048M   25G   2TB
+    f1-l     $20.00    2     3072M   25G   3TB
+    f1-x     $27.50    3     4096M   25G   4TB
+    f1-xx    $50.00    4     8192M   25G   5TB
+
     * net is calculated as a per-month average
     * vms are billed for a minimum of 24 hours upon creation
     * all VMs come standard with one public IPv4 address
+  
     
     SUPPORTED OPERATING SYSTEMS:
 

capsulflask/theme/yolocolo/account-balance.html

@@ -1,94 +0,0 @@
-{% 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

@@ -1,60 +0,0 @@
-<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

@@ -1,68 +0,0 @@
-{% 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

@@ -1,46 +0,0 @@
-{% 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

@@ -1,28 +0,0 @@
-{% 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

@@ -1,23 +0,0 @@
-{% 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

@@ -1,21 +0,0 @@
-{% 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,38 @@
+---
+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"]
+    devices:
+      - "/dev/kvm:/dev/kvm"
+  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: