fix last couple of images on docs

Smol docs tweaks
add Configuration-type-stuff that lives in the database
2021-07-21 16:41:44 -05:00 · 2021-07-21 21:05:23 +02:00 · 2021-07-21 21:05:23 +02:00 · 2021-07-21 21:05:23 +02:00 · 2021-07-21 21:05:23 +02:00 · 2021-07-21 20:20:40 +02:00
49 changed files with 926 additions and 634 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,14 +0,0 @@
 ---
 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
--- a/32
+++ b/32
@ -1,32 +0,0 @@
 FROM python:3.8-alpine as build
 RUN apk add gettext git gcc python3-dev musl-dev \
    libffi-dev zlib-dev jpeg-dev libjpeg postgresql-dev build-base \
    --virtual .build-dependencies
 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 libpq libstdc++ libjpeg
 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
--- a/README.md
+++ b/README.md
@ -1,227 +1,51 @@
-# capsulflask
+# capsul-flask
-Python Flask web application for capsul.org
+![screenshot of capsul.org home page](./docs/capsul.webp)
 Python Flask web application implementing user accounts, payment, and virtual machine management for a smol "virtual machine (vm) as a service" aka "cloud compute" provider.  Originally developed by [Cyberia Computer Club](https://cyberia.club) for https://capsul.org
-## how to run locally
+`capsul-flask` integrates with [Stripe](https://stripe.com/) as a credit card processor, and [BTCPay Server](https://github.com/btcpayserver/btcpayserver-docker) as a cryptocurrency payment processor.
-Ensure you have the pre-requisites for the psycopg2 Postgres database adapter package
+`capsul-flask` invokes [shell-scripts](./capsulflask/shell_scripts/) to create/manage [libvirt/qemu](https://www.libvirt.org/manpages/virsh.html) vms, and it depends on `dnsmasq` to act as the DHCP server for the vms.
 `capsul-flask` has a ["hub and spoke" architecture](./architecture.md). The "Hub" runs the web application and talks to the Postrges database, while the "Spoke"(s) are responsible for creating/managing virtual machines. In this way, capsul can be scaled to span more than one machine. One instance of the capsul-flask application can run in both hub mode and spoke mode at the same time, however there must only be one instance of the app running in "Hub" mode at any given time.
 ## Quickstart (run capsul-flask on your computer in development mode)
 ```
-sudo apt install python3-dev libpq-dev
+# get an instance of postgres running locally on port 5432
-pg_config --version
+# (you don't have to use docker, but we thought this might be the easiest for a how-to example)
-```
+docker run --rm -it -e POSTGRES_PASSWORD=dev -p 5432:5432 postgres &
-Ensure you have the wonderful `pipenv` python package management and virtual environment cli
+# install dependencies 
 sudo apt install pipenv python3-dev libpq-dev
-```
+# download and run
-sudo apt install pipenv
+git clone https://giit.cyberia.club/~forest/capsul-flask
-```
+cd capsul-flask
 Create python virtual environment and install packages
 ```
 # install deps
 pipenv install
 ```
 Run an instance of Postgres (I used docker for this, you can use whatever you want, point is its listening on localhost:5432)
 ```
 docker run --rm -it -e POSTGRES_PASSWORD=dev -p 5432:5432 postgres
 ```
 Run the app 
 ```
 pipenv run flask run
 ```
-Run the app in gunicorn:
+Interested in learning more? How about a trip to the the `docs/` folder:
-
+
-```
+- [**Setting up capsul-flask locally**](./docs/local-set-up.md)
-pipenv run gunicorn --bind 127.0.0.1:5000 -k gevent --worker-connections 1000 app:app
+  - [Manually](./docs/local-set-up.md#manually)
-```
+  - [With docker-compose](./docs/local-set-up.md#docker_compose)
-
+- [**Configuring `capsul-flask`**](./docs/configuration.md)
-Once you log in for the first time, you will want to give yourself some free capsulbux so you can create fake capsuls for testing. 
+  - [Example configuration from capsul.org (production)](./docs/configuration.md#example)
-
+  - [Configuration-type-stuff that lives in the database ](./docs/configuration.md#config_that_lives_in_db)
-Note that by default when running locally, the `SPOKE_MODEL` is set to `mock`, meaning that it won't actually try to spawn vms.
+  - [Loading variables from files (docker secrets)](./docs/configuration.md#docker_secrets)
-
+- [**`capsul-flask`'s relationship to its Database Server**](./docs/database.md)
-```
+  - [Database schema management (schema versions)](./docs/database.md#schema_management)
-pipenv run flask cli sql -c "INSERT INTO payments (email, dollars) VALUES ('<your email address here>', 20.00)"
+  - [Running manual database queries](./docs/database.md#manual_queries)
-```
+- [**`capsul-flask`'s hub-and-spoke architecture**](./docs/architecture.md)
-
+- [**Deploying capsul-flask on a server**](./docs/deployment.md)
-## configuration:
+  - [Installing prerequisites for Spoke Mode](./docs/deployment.md#spoke_mode_prerequisites)
-
+  - [Deploying capsul-flask manually](./docs/deployment.md#deploy_manually)
-Create a `.env` file to set up the application configuration:
+  - [Deploying capsul-flask with coop-cloud's docker-swarm configuration](./docs/deployment.md#coop_cloud_docker)
-
+  - [Deploying capsul-flask with coop-cloud's `abra` deployment tool](./docs/deployment.md#coop_cloud_abra)
-```
+- [**Accepting cryptocurrency payments with BTCPay Server**](./docs/btcpay.md)
-nano .env
+  - [Setting up the BTCPAY_PRIVATE_KEY](./docs/btcpay.md#BTCPAY_PRIVATE_KEY)
-```
+  - [Testing cryptocurrency payments](./docs/btcpay.md#testing)
-
+  - [Sequence diagram explaining how BTC payment process works (how we accept 0-confirmation transactions 😀)](./docs/btcpay.md#0_conf_diagram)
 You can enter any environment variables referenced in `__init__.py` to this file.
 For example you may enter your SMTP credentials like this:
 ```
 MAIL_USERNAME=forest@nullhex.com
 MAIL_DEFAULT_SENDER=forest@nullhex.com
 MAIL_PASSWORD=**************
 ```
 ## how to view the logs on the database server (legion.cyberia.club)
 `sudo -u postgres pg_dump capsul-flask | gzip -9 > capsul-backup-2021-02-15.gz`
 -----
 ## cli 
 You can manually mess around with the database like this:
 ```
 pipenv run flask cli sql -f test.sql
 ```
 ```
 pipenv run flask cli sql -c 'SELECT * FROM vms'
 ```
 This one selects the vms table with the column name header:
 ```
 pipenv run flask cli sql -c "SELECT string_agg(column_name::text, ', ') from information_schema.columns WHERE table_name='vms'; SELECT * from vms"
 ```
 How to modify a payment manually, like if you get a chargeback or to fix customer payment issues:
 ```
 $ pipenv run flask cli sql -c "SELECT id, created, email, dollars, invalidated from payments"
 1, 2020-05-05T00:00:00, forest.n.johnson@gmail.com, 20.00, FALSE
 $ pipenv run flask cli sql -c "UPDATE payments SET invalidated = True WHERE id = 1"
 1 rows affected.
 $ pipenv run flask cli sql -c "SELECT id, created, email, dollars, invalidated from payments"
 1, 2020-05-05T00:00:00, forest.n.johnson@gmail.com, 20.00, TRUE
 ```
 How you would kick off the scheduled task:
 ```
 pipenv run flask cli cron-task
 ```
 -----
 ## postgres database schema management
 capsulflask has a concept of a schema version. When the application starts, it will query the database for a table named
 `schemaversion` that has one row and one column (`version`). If the `version` it finds is not equal to the `desiredSchemaVersion` variable set in `db.py`, it will run  migration scripts from the `schema_migrations` folder one by one until the `schemaversion` table shows the correct version.
 For example, the script named `02_up_xyz.sql` should contain code that migrates the database from schema version 1 to schema version 2. Likewise, the script `02_down_xyz.sql` should contain code that migrates from schema version 2 back to schema version 1.
 **IMPORTANT: if you need to make changes to the schema, make a NEW schema version. DO NOT EDIT the existing schema versions.**
 In general, for safety, schema version upgrades should not delete data. Schema version downgrades will simply throw an error and exit for now. 
 -----
 ## hub-and-spoke architecture
 ![](readme/hub-and-spoke1.png)
 This diagram was created with https://app.diagrams.net/.
 To edit it, download the <a download href="readme/hub-and-spoke.xml">diagram file</a> and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
 right now I have 2 types of operations, immediate mode and async.
 both types of operations do assignment synchronously. so if the system cant assign the operation to one or more hosts (spokes),
 or whatever the operation requires, then it will fail. 
 some operations tolerate partial failures, like, `capacity_avaliable` will succeed if at least one spoke succeeds.
 for immediate mode requests (like `list`, `capacity_avaliable`, `destroy`), assignment and completion of the operation are the same thing.
 for async ones, they can be assigned without knowing whether or not they succeeded (`create`).
 ![](readme/hub-and-spoke2.png)
 This diagram was created with https://app.diagrams.net/.
 To edit it, download the <a download href="readme/hub-and-spoke.xml">diagram file</a> and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
 if you issue a create, and it technically could go to any number of hosts, but only one host responds, it will succeed 
 but if you issue a create and somehow 2 hosts both think they own that task, it will fail and throw a big error. cuz it expects exactly 1 to own the create task
 currently its not set up to do any polling.  its not really like a queue at all. It's all immediate for the most part 
 -----
 ## how to setup btcpay server
 Generate a private key and the accompanying bitpay SIN for the btcpay API client. 
  I used this code as an example: https://github.com/bitpay/bitpay-python/blob/master/bitpay/key_utils.py#L6
 ```
 $ pipenv run python ./readme/generate_btcpay_keys.py
 ```
 It should output something looking like this:
 ```
 -----BEGIN EC PRIVATE KEY-----
 EXAMPLEIArx/EXAMPLEKH23EXAMPLEsYXEXAMPLE5qdEXAMPLEcFHoAcEXAMPLEK
 oUQDQgAEnWs47PT8+ihhzyvXX6/yYMAWWODluRTR2Ix6ZY7Z+MV7v0W1maJzqeqq
 NQ+cpBvPDbyrDk9+Uf/sEaRCma094g==
 -----END EC PRIVATE KEY-----
 EXAMPLEwzAEXAMPLEEXAMPLEURD7EXAMPLE
 ```
 In order to register the key with the btcpay server, you have to first generate a pairing token using the btcpay server interface.
 This requires your btcpay server account to have access to the capsul store. Ask Cass about this.
 Navigate to `Manage store: Access Tokens` at: `https://btcpay.cyberia.club/stores/<store-id>/Tokens`
 ![](readme/btcpay_sin_pairing.jpg)
 Finally, send an http request to the btcpay server to complete the pairing:
 ```
 curl -H "Content-Type: application/json" https://btcpay.cyberia.club/tokens -d "{'id': 'EXAMPLEwzAEXAMPLEEXAMPLEURD7EXAMPLE', 'pairingCode': 'XXXXXXX'}"
 ```
 It should respond with a token: 
 ```
 {"data":[{"policies":[],"pairingCode":"XXXXXXX","pairingExpiration":1589473817597,"dateCreated":1589472917597,"facade":"merchant","token":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx","label":"capsulflask"}]}
 ```
 And you should see the token in the btcpay server UI:
 ![](readme/paired.jpg)
 Now simply set your `BTCPAY_PRIVATE_KEY` variable in `.env`
 NOTE: make sure to use single quotes and replace the new lines with \n.
 ```
 BTCPAY_PRIVATE_KEY='-----BEGIN EC PRIVATE KEY-----\nEXAMPLEIArx/EXAMPLEKH23EXAMPLEsYXEXAMPLE5qdEXAMPLEcFHoAcEXAMPLEK\noUQDQgAEnWs47PT8+ihhzyvXX6/yYMAWWODluRTR2Ix6ZY7Z+MV7v0W1maJzqeqq\nNQ+cpBvPDbyrDk9+Uf/sEaRCma094g==\n-----END EC PRIVATE KEY-----'
 ```
 -----
 ## testing cryptocurrency payments
 I used litecoin to test cryptocurrency payments, because its the simplest & lowest fee cryptocurrency that BTCPay server supports. You can download the easy-to-use litecoin SPV wallet `electrum-ltc` from [github.com/pooler/electrum-ltc](https://github.com/pooler/electrum-ltc) or [electrum-ltc.org](https://electrum-ltc.org/), set up a wallet, and then either purchase some litecoin from an exchange, or ask Forest for some litecoin to use for testing.
 ## sequence diagram explaining how BTC payment process works
 ![btcpayment_process](readme/btcpayment_process.png)
 This diagram was created with https://app.diagrams.net/.
 To edit it, download the <a download href="readme/btcpayment_process.drawio">diagram file</a> and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
--- a/capsulflask/init.py
+++ b/capsulflask/init.py
@ -31,7 +31,6 @@ load_dotenv(find_dotenv())
 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'],
@ -56,7 +55,7 @@ app.config.from_mapping(
  MAIL_SERVER=os.environ.get("MAIL_SERVER", default=""),
  MAIL_PORT=os.environ.get("MAIL_PORT", default="465"),
-  MAIL_USE_TLS=os.environ.get("MAIL_USE_TLS", default="True").lower() in ['true', '1', 't', 'y', 'yes'],
+  MAIL_USE_TLS=os.environ.get("MAIL_USE_TLS", default="False").lower() in ['true', '1', 't', 'y', 'yes'],
  MAIL_USE_SSL=os.environ.get("MAIL_USE_SSL", default="True").lower() in ['true', '1', 't', 'y', 'yes'],
  MAIL_USERNAME=os.environ.get("MAIL_USERNAME", default=""),
  MAIL_PASSWORD=os.environ.get("MAIL_PASSWORD", default=""),
@ -72,7 +71,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="https://btcpay.cyberia.club")
+  BTCPAY_URL=os.environ.get("BTCPAY_URL", default="")
 )
 app.config['HUB_URL'] = os.environ.get("HUB_URL", default=app.config['BASE_URL'])
@ -140,10 +139,13 @@ else:
 app.config['HTTP_CLIENT'] = MyHTTPClient(timeout_seconds=int(app.config['INTERNAL_HTTP_TIMEOUT_SECONDS']))
-try:
+app.config['BTCPAY_ENABLED'] = False
-  app.config['BTCPAY_CLIENT'] = btcpay.Client(api_uri=app.config['BTCPAY_URL'], pem=app.config['BTCPAY_PRIVATE_KEY'])
+if app.config['BTCPAY_URL'] is not "":
-except:
+  try:
-  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()))
+    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()))
 # only start the scheduler and attempt to migrate the database if we are running the app.
 # otherwise we are running a CLI command.
@ -153,6 +155,7 @@ 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['HUB_MODE_ENABLED']:
  if app.config['HUB_MODEL'] == "capsul-flask":
    app.config['HUB_MODEL'] = hub_model.CapsulFlaskHub()
@ -174,9 +177,7 @@ if app.config['HUB_MODE_ENABLED']:
  from capsulflask import db
  db.init_app(app, is_running_server)
-  from capsulflask import (
+  from capsulflask import auth, landing, console, payment, metrics, cli, hub_api, admin
    auth, landing, console, payment, metrics, cli, hub_api, publicapi, admin
  )
  app.register_blueprint(landing.bp)
  app.register_blueprint(auth.bp)
@ -186,13 +187,13 @@ if app.config['HUB_MODE_ENABLED']:
  app.register_blueprint(cli.bp)
  app.register_blueprint(hub_api.bp)
  app.register_blueprint(admin.bp)
  app.register_blueprint(publicapi.bp)
  app.add_url_rule("/", endpoint="index")
 if app.config['SPOKE_MODE_ENABLED']:
  if app.config['SPOKE_MODEL'] == "shell-scripts":
    app.config['SPOKE_MODEL'] = spoke_model.ShellScriptSpoke()
  else:
--- a/capsulflask/admin.py
+++ b/capsulflask/admin.py
@ -17,9 +17,9 @@ bp = Blueprint("admin", __name__, url_prefix="/admin")
@bp.route("/")
@admin_account_required
 def index():
-  hosts = get_model().list_hosts_with_networks()
+  hosts = get_model().list_hosts_with_networks(None)
-  vms_by_host_and_network = get_model().all_non_deleted_vms_by_host_and_network()
+  vms_by_host_and_network = get_model().non_deleted_vms_by_host_and_network(None)
-  network_display_width_px = float(500);
+  network_display_width_px = float(270)
  #operations = get_model().list_all_operations()
  display_hosts = []
@ -35,26 +35,18 @@ def index():
    display_host = dict(name=host_id, networks=value['networks'])
    for network in display_host['networks']:
      ipv4_network = ipaddress.ip_network(network["public_ipv4_cidr_block"], False)
      network_start_int = -1
      network_end_int = -1
      i = 0
      for ipv4_address in ipv4_network: 
        i += 1
        if i > 2:
          if network_start_int == -1:
            network_start_int = int(ipv4_address)
-          network_end_int = int(ipv4_address)
+      network_start_int = int(ipaddress.ip_address(network["public_ipv4_first_usable_ip"]))
      network_end_int = int(ipaddress.ip_address(network["public_ipv4_last_usable_ip"]))
      network['allocations'] = []
-      network_addresses_width = float((network_end_int-network_start_int))
+      network_addresses_width = float((network_end_int-network_start_int)+1)
      if host_id in vms_by_host_and_network:
        if network['network_name'] in vms_by_host_and_network[host_id]:
          for vm in vms_by_host_and_network[host_id][network['network_name']]:
            ip_address_int = int(ipaddress.ip_address(vm['public_ipv4']))
-            if network_start_int < ip_address_int and ip_address_int < network_end_int:
+            if network_start_int <= ip_address_int and ip_address_int <= network_end_int:
              allocation = f"{host_id}_{network['network_name']}_{len(network['allocations'])}"
              inline_styles.append(
                f"""
--- a/capsulflask/auth.py
+++ b/capsulflask/auth.py
@ -1,4 +1,3 @@
 from base64 import b64decode
 import functools
 import re
@ -25,15 +24,6 @@ def account_required(view):
    @functools.wraps(view)
    def wrapped_view(**kwargs):
        api_token = request.headers.get('authorization', None)
        if api_token is not None:
            email = get_model().authenticate_token(b64decode(api_token).decode('utf-8'))
            if email is not None:
                session.clear()
                session["account"] = email
                session["csrf-token"] = generate()
        if session.get("account") is None or session.get("csrf-token") is None :
            return redirect(url_for("auth.login"))
@ -66,7 +56,7 @@ def login():
        if not email:
            errors.append("email is required")
        elif len(email.strip()) < 6 or email.count('@') != 1 or email.count('.') == 0: 
-            errors.append("enter a valid email address")
+	        errors.append("enter a valid email address")
        if len(errors) == 0:
            result = get_model().login(email)
--- a/capsulflask/console.py
+++ b/capsulflask/console.py
@ -1,9 +1,7 @@
 from base64 import b64encode
 from datetime import datetime, timedelta
 import json
 import re
 import sys
-
+import json
 from datetime import datetime, timedelta
 from flask import Blueprint
 from flask import flash
 from flask import current_app
@ -100,6 +98,7 @@ def index():
@bp.route("/<string:id>", methods=("GET", "POST"))
@account_required
 def detail(id):
  duration=request.args.get('duration')
  if not duration:
    duration = "5m"
@ -189,72 +188,6 @@ def detail(id):
      duration=duration
    )
 def _create(vm_sizes, operating_systems, public_keys_for_account, server_data):
  errors = list()
  size = server_data.get("size")
  os = server_data.get("os")
  posted_keys_count = int(server_data.get("ssh_authorized_key_count"))
  if not size:
    errors.append("Size is required")
  elif size not in vm_sizes:
    errors.append(f"Invalid size {size}")
  if not os:
    errors.append("OS is required")
  elif os not in operating_systems:
    errors.append(f"Invalid os {os}")
  posted_keys = list()
  if posted_keys_count > 1000:
    errors.append("something went wrong with ssh keys")
  else:
    for i in range(0, posted_keys_count):
      if f"ssh_key_{i}" in server_data:
        posted_name = server_data.get(f"ssh_key_{i}")
        key = None
        for x in public_keys_for_account:
          if x['name'] == posted_name:
            key = x
        if key:
          posted_keys.append(key)
        else:
          errors.append(f"SSH Key \"{posted_name}\" doesn't exist")
  if len(posted_keys) == 0:
    errors.append("At least one SSH Public Key is required")
  capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(
    vm_sizes[size]['memory_mb']*1024*1024
  )
  if not capacity_avaliable:
    errors.append("""
      host(s) at capacity. no capsuls can be created at this time. sorry. 
    """)
  if len(errors) == 0:
    id = make_capsul_id()
    get_model().create_vm(
      email=session["account"], 
      id=id, 
      size=size, 
      os=os,
      ssh_authorized_keys=list(map(lambda x: x["name"], posted_keys))
    )
    current_app.config["HUB_MODEL"].create(
      email = session["account"],
      id=id,
      template_image_file_name=operating_systems[os]['template_image_file_name'],
      vcpus=vm_sizes[size]['vcpus'],
      memory_mb=vm_sizes[size]['memory_mb'],
      ssh_authorized_keys=list(map(lambda x: x["content"], posted_keys))
    )
    return id, errors
  return None, errors
@bp.route("/create", methods=("GET", "POST"))
@account_required
@ -264,16 +197,67 @@ def create():
  public_keys_for_account = get_model().list_ssh_public_keys_for_account(session["account"])
  account_balance = get_account_balance(get_vms(), get_payments(), datetime.utcnow())
  capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
  errors = list()
  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")
-    id, errors = _create(
+
-      vm_sizes, 
+    size = request.form["size"]
-      operating_systems,
+    os = request.form["os"]
-      public_keys_for_account,
+    if not size:
-      request.form)
+      errors.append("Size is required")
    elif size not in vm_sizes:
      errors.append(f"Invalid size {size}")
    if not os:
      errors.append("OS is required")
    elif os not in operating_systems:
      errors.append(f"Invalid os {os}")
    posted_keys_count = int(request.form["ssh_authorized_key_count"])
    posted_keys = list()
    if posted_keys_count > 1000:
      errors.append("something went wrong with ssh keys")
    else:
      for i in range(0, posted_keys_count):
        if f"ssh_key_{i}" in request.form:
          posted_name = request.form[f"ssh_key_{i}"]
          key = None
          for x in public_keys_for_account:
            if x['name'] == posted_name:
              key = x
          if key:
            posted_keys.append(key)
          else:
            errors.append(f"SSH Key \"{posted_name}\" doesn't exist")
    if len(posted_keys) == 0:
      errors.append("At least one SSH Public Key is required")
    capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(vm_sizes[size]['memory_mb']*1024*1024)
    if not capacity_avaliable:
      errors.append("""
        host(s) at capacity. no capsuls can be created at this time. sorry. 
      """)
    if len(errors) == 0:
      id = make_capsul_id()
      # we can't create the vm record in the DB yet because its IP address needs to be allocated first.
      # so it will be created when the allocation happens inside the hub_api.
      current_app.config["HUB_MODEL"].create(
        email = session["account"],
        id=id,
        os=os,
        size=size,
        template_image_file_name=operating_systems[os]['template_image_file_name'],
        vcpus=vm_sizes[size]['vcpus'],
        memory_mb=vm_sizes[size]['memory_mb'],
        ssh_authorized_keys=list(map(lambda x: dict(name=x['name'], content=x['content']), posted_keys)) 
      )
      return redirect(f"{url_for('console.index')}?created={id}")
  affordable_vm_sizes = dict()
@ -303,25 +287,23 @@ def create():
    vm_sizes=affordable_vm_sizes
  )
-@bp.route("/keys", methods=("GET", "POST"))
+@bp.route("/ssh", methods=("GET", "POST"))
@account_required
-def ssh_api_keys():
+def ssh_public_keys():
  errors = list()
  token = None
  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")
-    action = request.form["action"]
+    method = request.form["method"]
-
+    content = None
-    if action == 'upload_ssh_key':
+    if method == "POST":
      content = None
      content = request.form["content"].replace("\r", " ").replace("\n", " ").strip()
-      name = request.form["name"]
+    name = request.form["name"]
-      if not name or len(name.strip()) < 1:
+    if not name or len(name.strip()) < 1:
      if method == "POST":
        parts = re.split(" +", content)
        if len(parts) > 2 and len(parts[2].strip()) > 0:
          name = parts[2].strip()
@ -329,9 +311,10 @@ def ssh_api_keys():
          name = parts[0].strip()
      else:
        errors.append("Name is required")
-      if not re.match(r"^[0-9A-Za-z_@:. -]+$", name):
+    if not re.match(r"^[0-9A-Za-z_@:. -]+$", name):
-        errors.append(f"Key name '{name}' must match \"^[0-9A-Za-z_@:. -]+$\"")
+      errors.append(f"Key name '{name}' must match \"^[0-9A-Za-z_@:. -]+$\"")
    if method == "POST":
      if not content or len(content.strip()) < 1:
        errors.append("Content is required")
      else:
@ -344,36 +327,24 @@ def ssh_api_keys():
      if len(errors) == 0:
        get_model().create_ssh_public_key(session["account"], name, content)
-    elif action == "delete_ssh_key":
+    elif method == "DELETE":
      get_model().delete_ssh_public_key(session["account"], name)
-    elif action == "generate_api_token":
+      if len(errors) == 0:
-      name = request.form["name"]
+        get_model().delete_ssh_public_key(session["account"], name)
      if name == '':
          name = datetime.utcnow().strftime('%y-%m-%d %H:%M:%S')
      token = b64encode(
        get_model().generate_api_token(session["account"], name).encode('utf-8')
      ).decode('utf-8')
    elif action == "delete_api_token":
      get_model().delete_api_token(session["account"], request.form["id"])
  for error in errors:
    flash(error)
-  ssh_keys_list=list(map(
+  keys_list=list(map(
    lambda x: dict(name=x['name'], content=f"{x['content'][:20]}...{x['content'][len(x['content'])-20:]}"), 
    get_model().list_ssh_public_keys_for_account(session["account"])
  ))
  api_tokens_list = get_model().list_api_tokens(session["account"])
  return render_template(
-    "keys.html", 
+    "ssh-public-keys.html", 
    csrf_token = session["csrf-token"],
-    api_tokens=api_tokens_list, 
+    ssh_public_keys=keys_list, 
-    ssh_public_keys=ssh_keys_list,
+    has_ssh_public_keys=len(keys_list) > 0
    generated_api_token=token,
  )
 def get_vms():
@ -397,6 +368,7 @@ def get_vm_months_float(vm, as_of):
  return days / average_number_of_days_in_a_month
 def get_account_balance(vms, payments, as_of):
  vm_cost_dollars = 0.0
  for vm in vms:
    vm_months = get_vm_months_float(vm, as_of)
@ -409,6 +381,7 @@ def get_account_balance(vms, payments, as_of):
@bp.route("/account-balance")
@account_required
 def account_balance():
  payment_sessions = get_model().list_payment_sessions_for_account(session['account'])
  for payment_session in payment_sessions:
    if payment_session['type'] == 'btcpay':
@ -450,6 +423,7 @@ 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"], 
--- a/capsulflask/db.py
+++ b/capsulflask/db.py
@ -33,7 +33,7 @@ def init_app(app, is_running_server):
    result = re.search(r"^\d+_(up|down)", filename)
    if not result:
      app.logger.error(f"schemaVersion {filename} must match ^\\d+_(up|down). exiting.")
-      continue
+      exit(1)
    key = result.group()
    with open(join(schemaMigrationsPath, filename), 'rb') as file:
      schemaMigrations[key] = file.read().decode("utf8")
@ -43,7 +43,7 @@ def init_app(app, is_running_server):
  hasSchemaVersionTable = False
  actionWasTaken = False
  schemaVersion = 0
-  desiredSchemaVersion = 17
+  desiredSchemaVersion = 18
  cursor = connection.cursor()
@ -128,3 +128,4 @@ def close_db(e=None):
  if db_model is not None:
    db_model.cursor.close()
    current_app.config['PSYCOPG2_CONNECTION_POOL'].putconn(db_model.connection)
--- a/capsulflask/db_model.py
+++ b/capsulflask/db_model.py
@ -1,6 +1,8 @@
 import re
 # I was never able to get this type hinting to work correctly 
 # from psycopg2.extensions import connection as Psycopg2Connection, cursor as Psycopg2Cursor
 import hashlib
 from nanoid import generate
 from flask import current_app
 from typing import List
@ -15,6 +17,7 @@ class DBModel:
    self.cursor = cursor
  #     ------    LOGIN     ---------     
@ -41,16 +44,6 @@ class DBModel:
    return (token, ignoreCaseMatches)
  def authenticate_token(self, token):
    m = hashlib.md5()
    m.update(token.encode('utf-8'))
    hash_token = m.hexdigest()
    self.cursor.execute("SELECT email FROM api_tokens WHERE token = %s", (hash_token, ))
    result = self.cursor.fetchall()
    if len(result) == 1:
      return result[0]
    return None
  def consume_token(self, token):
    self.cursor.execute("SELECT email FROM login_tokens WHERE token = %s and created > (NOW() - INTERVAL '20 min')", (token, ))
    row = self.cursor.fetchone()
@ -65,8 +58,18 @@ class DBModel:
  #     ------    VM & ACCOUNT MANAGEMENT     ---------  
-  def all_non_deleted_vms_by_host_and_network(self):
+  def non_deleted_vms_by_host_and_network(self, host_id):
-    self.cursor.execute("SELECT id, host, network_name, public_ipv4, public_ipv6 FROM vms WHERE deleted IS NULL")
+    query = "SELECT id, host, network_name, public_ipv4, public_ipv6 FROM vms WHERE deleted IS NULL"
    if host_id is None: 
      self.cursor.execute(query)
    else:
      if not re.match(r"^[a-zA-Z0-9_-]+$", host_id):
        raise ValueError(f"host_id \"{host_id}\" must match \"^[a-zA-Z0-9_-]+\"")
      # I kept getting "TypeError: not all arguments converted during string formatting"
      # when I was trying to mix python string templating with psycopg2 safe parameter passing. 
      # so i just did all of it in python and check the user-provided data for safety myself (no sql injection).
      self.cursor.execute(f"{query} AND host = '{host_id}'")
    hosts = dict()
    for row in self.cursor.fetchall():
@ -129,32 +132,6 @@ class DBModel:
    self.cursor.execute( "DELETE FROM ssh_public_keys where email = %s AND name = %s", (email, name) )
    self.connection.commit()
  def list_api_tokens(self, email):
    self.cursor.execute(
      "SELECT id, token, name, created FROM api_tokens WHERE email = %s", 
      (email, )
    )
    return list(map(
      lambda x: dict(id=x[0], token=x[1], name=x[2], created=x[3]), 
      self.cursor.fetchall()
    ))
  def generate_api_token(self, email, name):
    token = generate()
    m = hashlib.md5()
    m.update(token.encode('utf-8'))
    hash_token = m.hexdigest()
    self.cursor.execute(
      "INSERT INTO api_tokens (email, name, token) VALUES (%s, %s, %s)", 
      (email, name, hash_token)
    )
    self.connection.commit()
    return token
  def delete_api_token(self, email, id_):
    self.cursor.execute( "DELETE FROM api_tokens where email = %s AND id = %s", (email, id_))
    self.connection.commit()
  def list_vms_for_account(self, email):
    self.cursor.execute(""" 
      SELECT vms.id, vms.public_ipv4, vms.public_ipv6, vms.size, vms.os, vms.created, vms.deleted, vm_sizes.dollars_per_month
@ -181,12 +158,12 @@ class DBModel:
      )
    self.connection.commit()
-  def create_vm(self, email, id, size, os, ssh_authorized_keys):
+  def create_vm(self, email, id, size, os, host, network_name, public_ipv4, ssh_authorized_keys):
    self.cursor.execute(""" 
-      INSERT INTO vms (email, id, size, os, network_name, host)
+      INSERT INTO vms (email, id, size, os, host, network_name, public_ipv4)
-      VALUES  (%s, %s, %s, %s, 'virbr1', 'baikal')
+      VALUES  (%s, %s, %s, %s, %s, %s, %s)
      """, 
-      (email, id, size, os)
+      (email, id, size, os, host, network_name, public_ipv4)
    )
    for ssh_authorized_key in ssh_authorized_keys:
@ -353,18 +330,35 @@ class DBModel:
  #     ------    HOSTS     ---------  
-  def list_hosts_with_networks(self):
+  def list_hosts_with_networks(self, host_id: str):
-    self.cursor.execute("""
+    query = """
-    SELECT hosts.id, hosts.last_health_check, host_network.network_name, host_network.public_ipv4_cidr_block FROM hosts
+    SELECT hosts.id, hosts.last_health_check, host_network.network_name, 
    host_network.public_ipv4_cidr_block, host_network.public_ipv4_first_usable_ip, host_network.public_ipv4_last_usable_ip
    FROM hosts
    JOIN host_network ON host_network.host = hosts.id
-    """)
+    """
    if host_id is None: 
      self.cursor.execute(query)
    else:
      if not re.match(r"^[a-zA-Z0-9_-]+$", host_id):
        raise ValueError(f"host_id \"{host_id}\" must match \"^[a-zA-Z0-9_-]+\"")
      # I kept getting "TypeError: not all arguments converted during string formatting"
      # when I was trying to mix python query string templating with psycopg2 safe parameter passing. 
      # so i just did all of it in python and check the user-provided data for safety myself (no sql injection).
      self.cursor.execute(f"{query} WHERE hosts.id = '{host_id}'")
    hosts = dict()
    for row in self.cursor.fetchall():
      if row[0] not in hosts:
        hosts[row[0]] = dict(last_health_check=row[1], networks=[])
-      hosts[row[0]]["networks"].append(dict(network_name=row[2], public_ipv4_cidr_block=row[3]))
+      hosts[row[0]]["networks"].append(dict(
        network_name=row[2], 
        public_ipv4_cidr_block=row[3], 
        public_ipv4_first_usable_ip=row[4], 
        public_ipv4_last_usable_ip=row[5]
      ))
    return hosts
@ -414,6 +408,13 @@ class DBModel:
    self.connection.commit()
    return operation_id
  def update_operation(self, operation_id: int, payload: str):
    self.cursor.execute(
      "UPDATE operations SET payload = %s WHERE id = %s", 
      (payload, operation_id)
    )
    self.connection.commit()
  def update_host_operation(self, host_id: str, operation_id: int, assignment_status: str, result: str):
    if assignment_status and not result:
      self.cursor.execute(
@ -440,9 +441,20 @@ class DBModel:
    else:
      return None
-  def host_operation_exists(self, operation_id: int, host_id: str) -> bool:
+  def get_payload_json_from_host_operation(self, operation_id: int, host_id: str) -> str:
-    self.cursor.execute("SELECT operation FROM host_operation WHERE host = %s AND operation = %s",(host_id, operation_id))
+    self.cursor.execute(
-    return len(self.cursor.fetchall()) != 0
+      """
        SELECT operations.payload FROM operations 
          JOIN host_operation ON host_operation.operation = operations.id
          WHERE host_operation.host = %s AND host_operation.operation = %s
      """,
      (host_id, operation_id)
    )
    row = self.cursor.fetchone()
    if row:
      return row[0]
    else:
      return None
  def claim_operation(self, operation_id: int, host_id: str) -> bool:
    # have to make a new cursor to set isolation level
@ -467,3 +479,8 @@ class DBModel:
    #cursor.close()
    return to_return
--- a/capsulflask/hub_api.py
+++ b/capsulflask/hub_api.py
@ -1,7 +1,9 @@
 import json
 import ipaddress
 from flask import Blueprint
 from flask import current_app
-from flask import request
+from flask import request, make_response
 from werkzeug.exceptions import abort
 from capsulflask.db import get_model
@ -46,15 +48,134 @@ def heartbeat(host_id):
@bp.route("/claim-operation/<int:operation_id>/<string:host_id>", methods=("POST",))
 def claim_operation(operation_id: int, host_id: str):
  if authorized_for_host(host_id):
-    exists = get_model().host_operation_exists(operation_id, host_id)
+    payload_json = get_model().get_payload_json_from_host_operation(operation_id, host_id)
-    if not exists:
+    if payload_json is None:
-      return abort(404, "host operation not found")
+      error_message = f"{host_id} can't claim operation {operation_id} because host_operation row not found"
      current_app.logger.error(error_message)
      return abort(404, error_message)
    # right now if there is a can_claim_handler there needs to be a corresponding on_claimed_handler.
    # this is sole-ly due to laziness in error handling.
    can_claim_handlers = {
      "create": can_claim_create,
    }
    on_claimed_handlers = {
      "create": on_create_claimed,
    }
    error_message = ""
    payload = None
    payload_is_dict = False
    payload_has_type = False
    payload_has_valid_type = False
    try:
      payload = json.loads(payload_json)
      payload_is_dict = isinstance(payload, dict)
      payload_has_type = payload_is_dict and 'type' in payload
      payload_has_valid_type = payload_has_type and payload['type'] in can_claim_handlers
      if not payload_is_dict:
        error_message = "invalid json: expected an object"
      elif not payload_has_type:
        error_message = "invalid json: 'type' field is required"
      elif not payload_has_valid_type:
        error_message = f"invalid json: expected type \"{payload['type']}\" to be one of [{', '.join(can_claim_handlers.keys())}]"
    except:
      error_message = "could not parse payload as json"
    if error_message != "":
      error_message = f"{host_id} can't claim operation {operation_id} because {error_message}"
      current_app.logger.error(error_message)
      return abort(400, error_message)
    # we will only return this payload as json if claiming succeeds, so might as well do this now...
    payload['assignment_status'] = 'assigned'
    # invoke the appropriate can_claim_handler for this operation type
    result_tuple = can_claim_handlers[payload['type']](payload, host_id)
    modified_payload = result_tuple[0]
    error_message = result_tuple[1]
    if error_message != "":
      error_message = f"{host_id} can't claim operation {operation_id} because {error_message}"
      current_app.logger.error(error_message)
      return abort(400, error_message)
    claimed = get_model().claim_operation(operation_id, host_id)
    if claimed:
-      return "ok"
+      modified_payload_json = json.dumps(modified_payload)
      get_model().update_operation(operation_id, modified_payload_json)
      on_claimed_handlers[payload['type']](modified_payload, host_id)
      response = make_response(modified_payload_json)
      response.headers.set("Content-Type", "application/json")
      return response
    else:
-      return abort(409, "operation was already assigned to another host")
+      return abort(409, f"operation was already assigned to another host")
  else:
    current_app.logger.warning(f"/hub/claim-operation/{operation_id}/{host_id} returned 401: invalid token")
    return abort(401, "invalid host id or token")
 def can_claim_create(payload, host_id) -> (str, str):
  hosts = get_model().list_hosts_with_networks(host_id)
  if host_id not in hosts:
    return "", f"the host \"{host_id}\" does not appear to have any networks."
  networks = hosts[host_id]['networks']
  vms_by_host_and_network = get_model().non_deleted_vms_by_host_and_network(host_id)
  vms_by_network = dict()
  if host_id in vms_by_host_and_network:
    vms_by_network = vms_by_host_and_network[host_id]
  allocated_ipv4_address = None
  allocated_network_name = None
  for network in networks:
    vms = []
    if network["network_name"] in vms_by_network:
      vms = vms_by_network[network["network_name"]]
    claimed_ipv4s = dict()
    for vm in vms:
      claimed_ipv4s[vm['public_ipv4']] = True
    ipv4_network = ipaddress.ip_network(network["public_ipv4_cidr_block"], False)
    ipv4_first_usable_ip = network["public_ipv4_first_usable_ip"]
    ipv4_last_usable_ip = network["public_ipv4_last_usable_ip"]
    for ipv4_address in ipv4_network: 
      within_usable_range = ipv4_first_usable_ip <= str(ipv4_address) and str(ipv4_address) <= ipv4_last_usable_ip
      if within_usable_range and str(ipv4_address) not in claimed_ipv4s:
        allocated_ipv4_address = str(ipv4_address)
        break 
    if allocated_ipv4_address is not None:
      allocated_network_name = network["network_name"]
      break
  if allocated_network_name is None or allocated_ipv4_address is None:
    return "", f"host \"{host_id}\" does not have any avaliable IP addresses on any of its networks."
  # payload["network_name"] = allocated_network_name
  # hard-code the network name for now until we can fix the phantom dhcp lease issues.
  payload["network_name"] = 'public3'
  payload["public_ipv4"] = allocated_ipv4_address
  return payload, ""
 def on_create_claimed(payload, host_id):
  get_model().create_vm(
    email=payload['email'], 
    id=payload['id'], 
    size=payload['size'], 
    os=payload['os'],
    host=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'])),
  )
--- a/capsulflask/hub_model.py
+++ b/capsulflask/hub_model.py
@ -36,7 +36,7 @@ class MockHub(VirtualizationInterface):
  def list_ids(self) -> list:
    return get_model().all_non_deleted_vm_ids()
-  def create(self, email: str, id: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list):
+  def create(self, email: str, id: str, os: str, size: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list):
    validate_capsul_id(id)
    current_app.logger.info(f"mock create: {id} for {email}")
    sleep(1)
@ -180,7 +180,7 @@ class CapsulFlaskHub(VirtualizationInterface):
    return to_return
-  def create(self, email: str, id: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list):
+  def create(self, email: str, id: str, os: str, size: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list):
    validate_capsul_id(id)
    online_hosts = get_model().get_online_hosts()
    #current_app.logger.debug(f"hub_model.create(): ${len(online_hosts)} hosts")
@ -188,6 +188,8 @@ class CapsulFlaskHub(VirtualizationInterface):
      type="create", 
      email=email, 
      id=id, 
      os=os,
      size=size,
      template_image_file_name=template_image_file_name, 
      vcpus=vcpus,
      memory_mb=memory_mb,
--- a/capsulflask/landing.py
+++ b/capsulflask/landing.py
@ -12,9 +12,11 @@ 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
  )
--- a/capsulflask/payment.py
+++ b/capsulflask/payment.py
@ -48,6 +48,10 @@ 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]
--- a/capsulflask/publicapi.py
+++ b/capsulflask/publicapi.py
@ -1,40 +0,0 @@
 import datetime
 from flask import Blueprint
 from flask import current_app
 from flask import jsonify
 from flask import request
 from flask import session
 from nanoid import generate
 from capsulflask.auth import account_required
 from capsulflask.db import get_model
 bp = Blueprint("publicapi", __name__, url_prefix="/api")
@bp.route("/capsul/create", methods=["POST"])
@account_required
 def capsul_create():
    email = session["account"]
    from .console import _create,get_account_balance, get_payments, get_vms
    vm_sizes = get_model().vm_sizes_dict()
    operating_systems = get_model().operating_systems_dict()
    public_keys_for_account = get_model().list_ssh_public_keys_for_account(session["account"])
    account_balance = get_account_balance(get_vms(), get_payments(), datetime.datetime.utcnow())
    capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
    request.json['ssh_authorized_key_count'] = 1
    id, errors = _create(
      vm_sizes, 
      operating_systems,
      public_keys_for_account,
      request.json)
    if id is not None:
        return jsonify(
            id=id,
        )
    return jsonify(errors=errors)
--- a/capsulflask/schema_migrations/16_up_managed_ips.sql
+++ b/capsulflask/schema_migrations/16_up_managed_ips.sql
@ -3,12 +3,12 @@ CREATE TABLE host_network (
  public_ipv4_cidr_block  TEXT NOT NULL,
  network_name       TEXT NOT NULL,
  host               TEXT NOT NULL REFERENCES hosts(id) ON DELETE RESTRICT,
-  PRIMARY KEY (host, network_name)
+  CONSTRAINT host_network_pkey PRIMARY KEY (host, network_name)
 );
 INSERT INTO host_network (host, network_name, public_ipv4_cidr_block) VALUES ('baikal', 'virbr1', '69.61.2.162/27'),
-                                                                             ('baikal', 'virbr2', '69.61.2.194/26');
+                                                                             ('baikal', 'virbr2', '69.61.2.194/26'),
                                                                             ('baikal', 'virbr3', '69.61.38.193/26');
 ALTER TABLE vms RENAME COLUMN last_seen_ipv4 TO public_ipv4;
 ALTER TABLE vms RENAME COLUMN last_seen_ipv6 TO public_ipv6;
 ALTER TABLE vms ADD COLUMN network_name TEXT;
@ -18,7 +18,8 @@ UPDATE vms SET network_name = 'virbr2' WHERE public_ipv4 >= '69.61.2.192';
 ALTER TABLE vms ALTER COLUMN network_name SET NOT NULL;
-ALTER TABLE vms ADD FOREIGN KEY (host, network_name) REFERENCES host_network(host, network_name) ON DELETE RESTRICT;
+ALTER TABLE vms ADD CONSTRAINT vms_host_network_name_fkey FOREIGN KEY (host, network_name) 
                                               REFERENCES host_network(host, network_name) ON DELETE RESTRICT;
 UPDATE schemaversion SET version = 16;
--- a/capsulflask/schema_migrations/17_down_api_tokens.py
+++ b/capsulflask/schema_migrations/17_down_api_tokens.py
@ -1,2 +0,0 @@
 DROP TABLE api_keys;
 UPDATE schemaversion SET version = 16;
--- a/capsulflask/schema_migrations/17_down_bridge_and_network_name.sql
+++ b/capsulflask/schema_migrations/17_down_bridge_and_network_name.sql
@ -0,0 +1,18 @@
 ALTER TABLE vms DROP CONSTRAINT vms_host_network_name_fkey;
 UPDATE host_network SET network_name = 'virbr1' WHERE virtual_bridge_name = "virbr1";
 UPDATE host_network SET network_name = 'virbr2' WHERE virtual_bridge_name = "virbr1";
 UPDATE host_network SET network_name = 'virbr3' WHERE virtual_bridge_name = "virbr2";
 UPDATE vms SET network_name = 'virbr1' WHERE network_name = "public1";
 UPDATE vms SET network_name = 'virbr2' WHERE network_name = "public2";
 UPDATE vms SET network_name = 'virbr3' WHERE network_name = "public3";
 ALTER TABLE host_network DROP COLUMN virtual_bridge_name;
 ALTER TABLE vms ADD CONSTRAINT vms_host_network_name_fkey FOREIGN KEY (host, network_name) 
                                               REFERENCES host_network(host, network_name) ON DELETE RESTRICT;
 UPDATE schemaversion SET version = 16;
--- a/capsulflask/schema_migrations/17_up_api_tokens.py
+++ b/capsulflask/schema_migrations/17_up_api_tokens.py
@ -1,9 +0,0 @@
 CREATE TABLE api_tokens (
  id                 SERIAL PRIMARY KEY,
  email              TEXT REFERENCES accounts(email) ON DELETE RESTRICT,
  name               TEXT NOT NULL,
  created            TIMESTAMP NOT NULL DEFAULT NOW(),
  token              TEXT NOT NULL
 );
 UPDATE schemaversion SET version = 17;
--- a/capsulflask/schema_migrations/17_up_bridge_and_network_name.sql
+++ b/capsulflask/schema_migrations/17_up_bridge_and_network_name.sql
@ -0,0 +1,26 @@
 ALTER TABLE vms DROP CONSTRAINT vms_host_network_name_fkey;
 ALTER TABLE host_network RENAME COLUMN network_name TO virtual_bridge_name;
 ALTER TABLE host_network ADD COLUMN network_name TEXT;
 UPDATE host_network SET network_name = 'public1' WHERE virtual_bridge_name = 'virbr1';
 UPDATE host_network SET network_name = 'public2' WHERE virtual_bridge_name = 'virbr2';
 UPDATE host_network SET network_name = 'public3' WHERE virtual_bridge_name = 'virbr3';
 UPDATE vms SET network_name = 'public1' WHERE network_name = 'virbr1';
 UPDATE vms SET network_name = 'public2' WHERE network_name = 'virbr2';
 UPDATE vms SET network_name = 'public3' WHERE network_name = 'virbr3';
 ALTER TABLE host_network ALTER COLUMN network_name SET NOT NULL;
 ALTER TABLE host_network DROP CONSTRAINT host_network_pkey;
 ALTER TABLE host_network ADD CONSTRAINT host_network_pkey PRIMARY KEY (host, network_name);
 ALTER TABLE vms ADD CONSTRAINT vms_host_network_name_fkey FOREIGN KEY (host, network_name) 
                                               REFERENCES host_network(host, network_name) ON DELETE RESTRICT;
 UPDATE schemaversion SET version = 17;
--- a/capsulflask/schema_migrations/18_down_start_ip_end_ip.sql
+++ b/capsulflask/schema_migrations/18_down_start_ip_end_ip.sql
@ -0,0 +1,6 @@
 ALTER TABLE host_network DROP COLUMN public_ipv4_first_usable_ip;
 ALTER TABLE host_network DROP COLUMN public_ipv4_last_usable_ip;
 UPDATE schemaversion SET version = 17;
--- a/capsulflask/schema_migrations/18_up_start_ip_end_ip.sql
+++ b/capsulflask/schema_migrations/18_up_start_ip_end_ip.sql
@ -0,0 +1,25 @@
 ALTER TABLE host_network ADD COLUMN public_ipv4_first_usable_ip TEXT;
 ALTER TABLE host_network ADD COLUMN public_ipv4_last_usable_ip TEXT;
 -- public1, 69.61.2.162/27
 UPDATE host_network 
 SET public_ipv4_first_usable_ip = '69.61.2.163', public_ipv4_last_usable_ip = '69.61.2.190' 
 WHERE network_name = 'public1';
 -- public2, 69.61.2.194/26
 UPDATE host_network 
 SET public_ipv4_first_usable_ip = '69.61.2.195', public_ipv4_last_usable_ip = '69.61.2.254' 
 WHERE network_name = 'public2';
 -- public3, 69.61.38.193/26
 UPDATE host_network 
 SET public_ipv4_first_usable_ip = '69.61.38.194', public_ipv4_last_usable_ip = '69.61.38.254' 
 WHERE network_name = 'public3';
 ALTER TABLE host_network ALTER COLUMN public_ipv4_first_usable_ip SET NOT NULL;
 ALTER TABLE host_network ALTER COLUMN public_ipv4_last_usable_ip SET NOT NULL;
 UPDATE schemaversion SET version = 18;
--- a/capsulflask/shell_scripts/capacity-avaliable.sh
+++ b/capsulflask/shell_scripts/capacity-avaliable.sh
@ -19,9 +19,9 @@ if [ "$ram_bytes_remainder" -le $((20 * 1024 * 1024 * 1024)) ]; then
  exit 1
 fi
-ipv4_limit=28
+ipv4_limit=61
-used_ips=$(grep ip-add "/var/lib/libvirt/dnsmasq/virbr1.status" | cut -d '"' -f 4)
+used_ips=$(grep ip-add "/var/lib/libvirt/dnsmasq/virbr3.status" | cut -d '"' -f 4)
-reserved_ips=$(cat "/var/lib/libvirt/dnsmasq/public1.hostsfile" | cut -d ',' -f 2)
+reserved_ips=$(cat "/var/lib/libvirt/dnsmasq/public3.hostsfile" | cut -d ',' -f 2)
 total_addresses_used=$(printf "$used_ips\n$reserved_ips" | sort | uniq | wc -l)
 ipv4_count=$(printf "$total_addresses_used")
--- a/capsulflask/shell_scripts/create.sh
+++ b/capsulflask/shell_scripts/create.sh
@ -9,6 +9,8 @@ template_file="/tank/img/$2"
 vcpus="$3"
 memory="$4"
 pubkeys="$5"
 network_name="$6"
 public_ipv4="$7"
 root_volume_size="25G"
 if echo "$vmname" | grep -vqE '^capsul-[a-z0-9]{10}$'; then
@ -38,6 +40,16 @@ echo "$pubkeys" | while IFS= read -r line; do
  fi
 done
 if echo "$network_name" | grep -vqE "^[a-zA-Z0-9_-]+"; then
  echo "network_name \"$network_name\" must match ^[a-zA-Z0-9_-]+"
  exit 1
 fi
 if echo "$public_ipv4" | grep -vqE "^[0-9.]+$"; then
  echo "public_ipv4 \"$public_ipv4\" must match ^[0-9.]+$"
  exit 1
 fi
 disk="/tank/vm/$vmname.qcow2"
 cdrom="/tank/vm/$vmname.iso"
 xml="/tank/vm/$vmname.xml"
@ -66,7 +78,7 @@ virt-install \
    --os-variant generic \
    --virt-type kvm \
    --graphics vnc,listen=127.0.0.1 \
-    --network network=public1,filterref=clean-traffic,model=virtio \
+    --network network=$network_name,filterref=clean-traffic,model=virtio \
    --import \
    --print-xml > "$xml"
--- a/capsulflask/spoke_api.py
+++ b/capsulflask/spoke_api.py
@ -104,7 +104,7 @@ def handle_create(operation_id, request_body):
    current_app.logger.error(f"/hosts/operation returned 400: operation_id is required for create ")
    return abort(400, f"bad request; operation_id is required. try POST /spoke/operation/<id>")
-  parameters = ["email", "id", "template_image_file_name", "vcpus", "memory_mb", "ssh_authorized_keys"]
+  parameters = ["email", "id", "os", "size", "template_image_file_name", "vcpus", "memory_mb", "ssh_authorized_keys"]
  error_message = ""
  for parameter in parameters:
    if parameter not in request_body:
@ -115,14 +115,28 @@ def handle_create(operation_id, request_body):
    return abort(400, f"bad request; {error_message}")
  # only one host should create the vm, so we first race to assign this create operation to ourselves.
-  # only one host will win this race
+  # only one host will win this race.
  authorization_header = f"Bearer {current_app.config['SPOKE_HOST_TOKEN']}"
  url = f"{current_app.config['HUB_URL']}/hub/claim-operation/{operation_id}/{current_app.config['SPOKE_HOST_ID']}"
  result = current_app.config['HTTP_CLIENT'].do_http_sync(url, body=None, authorization_header=authorization_header)
  assignment_status = ""
  if result.status_code == 200:
-    assignment_status = "assigned"
+    try:
      assignment_info = json.loads(result.body)
      if not isinstance(assignment_info, dict):
        return abort(503, f"hub at '{url}' returned 200, but did not return assignment_info json object")
      if 'network_name' not in assignment_info:
        return abort(503, f"hub at '{url}' returned 200, but the returned assignment_info object did not include network_name")
      if 'public_ipv4' not in assignment_info:
        return abort(503, f"hub at '{url}' returned 200, but the returned assignment_info object did not include public_ipv4")
      assignment_status = "assigned"
      request_body['network_name'] = assignment_info['network_name']
      request_body['public_ipv4'] = assignment_info['public_ipv4']
    except:
      return abort(503, f"hub at '{url}' returned 200, but did not return valid json")
  elif result.status_code == 409:
    assignment_status = "assigned_to_other_host"
  else:
@ -137,7 +151,9 @@ def handle_create(operation_id, request_body):
        template_image_file_name=request_body['template_image_file_name'],
        vcpus=request_body['vcpus'],
        memory_mb=request_body['memory_mb'],
-        ssh_authorized_keys=request_body['ssh_authorized_keys'],
+        ssh_authorized_keys=list(map(lambda x: x['content'], request_body['ssh_authorized_keys'])),
        network_name=request_body['network_name'],
        public_ipv4=request_body['public_ipv4'],
      )
    except:
      error_message = my_exec_info_message(sys.exc_info())
@ -147,7 +163,11 @@ def handle_create(operation_id, request_body):
      params=  f"{params} vcpus='{request_body['vcpus'] if 'vcpus' in request_body else 'KeyError'}', "
      params=  f"{params} memory_mb='{request_body['memory_mb'] if 'memory_mb' in request_body else 'KeyError'}', "
      params=  f"{params} ssh_authorized_keys='{request_body['ssh_authorized_keys'] if 'ssh_authorized_keys' in request_body else 'KeyError'}', "
      params=  f"{params} network_name='{request_body['network_name'] if 'network_name' in request_body else 'KeyError'}', "
      params=  f"{params} public_ipv4='{request_body['public_ipv4'] if 'public_ipv4' in request_body else 'KeyError'}', "
      current_app.logger.error(f"spoke_model.create({params}) failed: {error_message}")
      return jsonify(dict(assignment_status=assignment_status, error_message=error_message))
  return jsonify(dict(assignment_status=assignment_status))
--- a/capsulflask/spoke_model.py
+++ b/capsulflask/spoke_model.py
@ -14,28 +14,37 @@ from capsulflask.shared import VirtualizationInterface, VirtualMachine, validate
 class MockSpoke(VirtualizationInterface):
  def __init__(self):
    self.capsuls = dict()
  def capacity_avaliable(self, additional_ram_bytes):
    return True
  def get(self, id, get_ssh_host_keys):
    validate_capsul_id(id)
    ipv4 = "1.1.1.1"
    if id in self.capsuls:
      ipv4 = self.capsuls[id]['public_ipv4']
    if get_ssh_host_keys:
      ssh_host_keys = json.loads("""[
        {"key_type":"ED25519", "content":"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN8cna0zeKSKl/r8whdn/KmDWhdzuWRVV0GaKIM+eshh", "sha256":"V4X2apAF6btGAfS45gmpldknoDX0ipJ5c6DLfZR2ttQ"},
        {"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", state="running", ssh_host_keys=ssh_host_keys)
+      return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4=ipv4, state="running", ssh_host_keys=ssh_host_keys)
-    return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4="1.1.1.1", state="running")
+    return VirtualMachine(id, current_app.config["SPOKE_HOST_ID"], ipv4=ipv4, state="running")
  def list_ids(self) -> list:
    return get_model().all_non_deleted_vm_ids()
-  def create(self, email: str, id: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list):
+  def create(self, email: str, id: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list, network_name: str, public_ipv4: str):
    validate_capsul_id(id)
    current_app.logger.info(f"mock create: {id} for {email}")
    self.capsuls[id] = dict(email=email, id=id, network_name=network_name, public_ipv4=public_ipv4)
    sleep(1)
  def destroy(self, email: str, id: str):
@ -129,7 +138,7 @@ class ShellScriptSpoke(VirtualizationInterface):
    self.validate_completed_process(completedProcess)
    return list(map(lambda x: x.decode("utf-8"), completedProcess.stdout.splitlines() ))
-  def create(self, email: str, id: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list):
+  def create(self, email: str, id: str, template_image_file_name: str, vcpus: int, memory_mb: int, ssh_authorized_keys: list, network_name: str, public_ipv4: str):
    validate_capsul_id(id)
    if not re.match(r"^[a-zA-Z0-9/_.-]+$", template_image_file_name):
@ -139,12 +148,18 @@ class ShellScriptSpoke(VirtualizationInterface):
      if not re.match(r"^(ssh|ecdsa)-[0-9A-Za-z+/_=@:. -]+$", ssh_authorized_key):
        raise ValueError(f"ssh_authorized_key \"{ssh_authorized_key}\" must match \"^(ssh|ecdsa)-[0-9A-Za-z+/_=@:. -]+$\"")
-    if vcpus < 1 or vcpus > 8:
+    if isinstance(vcpus, int) and (vcpus < 1 or vcpus > 8):
      raise ValueError(f"vcpus \"{vcpus}\" must match 1 <= vcpus <= 8")
-    if memory_mb < 512 or memory_mb > 16384:
+    if isinstance(memory_mb, int) and (memory_mb < 512 or memory_mb > 16384):
      raise ValueError(f"memory_mb \"{memory_mb}\" must match 512 <= memory_mb <= 16384")
    if not re.match(r"^[a-zA-Z0-9_-]+$", network_name):
      raise ValueError(f"network_name \"{network_name}\" must match \"^[a-zA-Z0-9_-]+\"")
    if not re.match(r"^[0-9.]+$", public_ipv4):
      raise ValueError(f"public_ipv4 \"{public_ipv4}\" must match \"^[0-9.]+$\"")
    ssh_keys_string = "\n".join(ssh_authorized_keys)
    completedProcess = run([
@ -153,7 +168,9 @@ class ShellScriptSpoke(VirtualizationInterface):
      template_image_file_name,
      str(vcpus),
      str(memory_mb),
-      ssh_keys_string
+      ssh_keys_string,
      network_name,
      public_ipv4
    ], capture_output=True)
    self.validate_completed_process(completedProcess, email)
@ -166,6 +183,8 @@ class ShellScriptSpoke(VirtualizationInterface):
      vcpus={str(vcpus)}
      memory={str(memory_mb)}
      ssh_authorized_keys={ssh_keys_string}
      network_name={network_name}
      public_ipv4={public_ipv4}
    """
    if not status == "success":
--- a/capsulflask/static/style.css
+++ b/capsulflask/static/style.css
@ -241,7 +241,6 @@ thead {
  background: #bdc7b812;
 }
 td, th {
  padding: 0.1em 1em;
 }
 table.small td, table.small th {
--- a/capsulflask/templates/account-balance.html
+++ b/capsulflask/templates/account-balance.html
@ -46,7 +46,9 @@
            <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>
--- a/capsulflask/templates/base.html
+++ b/capsulflask/templates/base.html
@ -31,7 +31,7 @@
    {% if session["account"] %} 
      <a href="/console">Capsuls</a>
-      <a href="/console/keys">SSH &amp; API Keys</a>
+      <a href="/console/ssh">SSH Public Keys</a>
      <a href="/console/account-balance">Account Balance</a>
    {% endif %}
--- a/capsulflask/templates/capsul-detail.html
+++ b/capsulflask/templates/capsul-detail.html
@ -101,7 +101,7 @@
      </div>
      <div class="row justify-start">
        <label class="align" for="ssh_authorized_keys">SSH Authorized Keys</label>
-        <a id="ssh_authorized_keys" href="/console/keys">{{ vm['ssh_authorized_keys'] }}</a>
+        <a id="ssh_authorized_keys" href="/console/ssh">{{ vm['ssh_authorized_keys'] }}</a>
      </div>
    </div>
--- a/capsulflask/templates/create-capsul.html
+++ b/capsulflask/templates/create-capsul.html
@ -31,7 +31,7 @@
    <p>(At least one month of funding is required)</p>
  {% elif no_ssh_public_keys %}
    <p>You don't have any ssh public keys yet.</p> 
-    <p>You must <a href="/console/keys">upload one</a> before you can create a Capsul.</p>
+    <p>You must <a href="/console/ssh">upload one</a> before you can create a Capsul.</p>
  {% elif not capacity_avaliable %}
    <p>Host(s) at capacity. No capsuls can be created at this time. sorry. </p> 
  {% else %}
--- a/capsulflask/templates/faq.html
+++ b/capsulflask/templates/faq.html
@ -23,6 +23,7 @@
     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?
--- a/capsulflask/templates/pricing.html
+++ b/capsulflask/templates/pricing.html
@ -6,22 +6,38 @@
  <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:
--- a/capsulflask/templates/ssh-public-keys.html
+++ b/capsulflask/templates/ssh-public-keys.html
@ -1,18 +1,17 @@
 {% extends 'base.html' %}
-{% block title %}SSH &amp; API Keys{% endblock %}
+{% block title %}SSH Public Keys{% endblock %}
 {% block content %}
 <div class="row third-margin">
  <h1>SSH PUBLIC KEYS</h1>
 </div>
 <div class="row third-margin"><div>
-    {% if ssh_public_keys|length > 0 %} <hr/> {% endif %}
+  {% if has_ssh_public_keys %} <hr/> {% endif %}
  {% for ssh_public_key in ssh_public_keys %}
    <form method="post">
      <input type="hidden" name="method" value="DELETE"></input> 
      <input type="hidden" name="action" value="delete_ssh_key"></input>
      <input type="hidden" name="name" value="{{ ssh_public_key['name'] }}"></input> 
      <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
      <div class="row">
@ -23,14 +22,13 @@
    </form>
  {% endfor %}
-  {% if ssh_public_keys|length > 0 %} <hr/> {% endif %}
+  {% if has_ssh_public_keys %} <hr/> {% endif %}
  <div class="third-margin">
    <h1>UPLOAD A NEW SSH PUBLIC KEY</h1>
  </div>
  <form method="post">
    <input type="hidden" name="method" value="POST"></input>
    <input type="hidden" name="action" value="upload_ssh_key"></input>
    <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
    <div class="row justify-start">
      <label class="align" for="content">File Contents</label>
@ -56,51 +54,6 @@
    </div>
  </form>
 </div></div>
 <hr/>
 <div class="row third-margin">
  <h1>API KEYS</h1>
 </div>
 <div class="row third-margin"><div>
  {% if generated_api_token %}
    <hr/>
    Generated key:
    <span class="code">{{ generated_api_token }}</span>
  {% endif %}
  {% if api_tokens|length >0 %} <hr/>{% endif %}
  {% for api_token in api_tokens %}
    <form method="post">
      <input type="hidden" name="method" value="DELETE"></input> 
      <input type="hidden" name="action" value="delete_api_token"></input>
      <input type="hidden" name="id" value="{{ api_token['id'] }}"></input> 
      <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
      <div class="row">
        <span class="code">{{ api_token['name'] }}</span>
        created {{ api_token['created'].strftime("%b %d %Y") }}
        <input type="submit" value="Delete">
      </div>
    </form>
  {% endfor %}
  {% if api_tokens|length >0 %} <hr/>{% endif %}
  <div class="third-margin">
    <h1>GENERATE A NEW API KEY</h1>
  </div>
  <form method="post">
    <input type="hidden" name="method" value="POST"></input>
    <input type="hidden" name="action" value="generate_api_token"></input>
    <input type="hidden" name="csrf-token" value="{{ csrf_token }}"/>
    <div class="smalltext">
      <p>Generate a new API key, to integrate with other systems.</p>
    </div>
    <div class="row justify-start">
      <label class="align" for="name">Key Name</label>
      <input type="text" id="name" name="name"></input> (defaults to creation time)
    </div>
    <div class="row justify-end">
      <input type="submit" value="Generate">
    </div>
  </form>
 </div></div>
 {% endblock %}
 {% block pagesource %}/templates/ssh-public-keys.html{% endblock %}
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,29 +0,0 @@
 ---
 version: "3.8"
 services:
  app:
    image: 3wordchant/capsul-flask:latest
    build: .
    volumes:
      - "./:/app/code"
    depends_on:
      - db
    ports:
      - "5000:5000"
    environment:
      - "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
    # 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"
    volumes:
      - "postgres:/var/lib/postgresql/data"
    environment:
      POSTGRES_USER: capsul
      POSTGRES_PASSWORD: capsul
      POSTGRES_DB: capsul
 volumes:
  postgres:
--- a/docs/architecture.md
+++ b/docs/architecture.md
@ -0,0 +1,30 @@
 # hub-and-spoke architecture
 The "Hub" runs the web application and talks to the Postrges database, while the "Spoke"s are responsible for creating/managing virtual machines. One instance of the capsul-flask application can run in hub mode and spoke mode at the same time. 
 The Hub and the Spoke must be configured to communicate securely with each-other over HTTPS. They both have to be able to dial each-other directly.  The URLs / auth tokens they use are configured both in the config file (`HUB_URL`, `SPOKE_HOST_ID`, `SPOKE_HOST_TOKEN` and `HUB_TOKEN`) and in the database (the `id`, `https_url`, and `token` columns in the `hosts` table).
 ![](images/hub-and-spoke1.png)
 This diagram was created with https://app.diagrams.net/.
 To edit it, download the <a download href="readme/hub-and-spoke.xml">diagram file</a> and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
 right now I have 2 types of operations, immediate mode and async.
 both types of operations do assignment synchronously. so if the system cant assign the operation to one or more hosts (spokes),
 or whatever the operation requires, then it will fail. 
 some operations tolerate partial failures, like, `capacity_avaliable` will succeed if at least one spoke succeeds.
 for immediate mode requests (like `list`, `capacity_avaliable`, `destroy`), assignment and completion of the operation are the same thing.
 for async ones, they can be assigned without knowing whether or not they succeeded (`create`).
 ![](images/hub-and-spoke2.png)
 This diagram was created with https://app.diagrams.net/.
 To edit it, download the <a download href="readme/hub-and-spoke.xml">diagram file</a> and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
 if you issue a create, and it technically could go to any number of hosts, but only one host responds, it will succeed 
 but if you issue a create and somehow 2 hosts both think they own that task, it will fail and throw a big error. cuz it expects exactly 1 to own the create task
 currently its not set up to do any polling.  its not really like a queue at all. It's all immediate for the most part 
--- a/docs/btcpay.md
+++ b/docs/btcpay.md
@ -0,0 +1,68 @@
 ## <a name="BTCPAY_PRIVATE_KEY"></a>Setting up the BTCPAY_PRIVATE_KEY 
 Generate a private key and the accompanying bitpay SIN for the btcpay API client. 
 I used this code as an example: https://github.com/bitpay/bitpay-python/blob/master/bitpay/key_utils.py#L6
 ```
 $ pipenv run python ./readme/generate_btcpay_keys.py
 ```
 It should output something looking like this:
 ```
 -----BEGIN EC PRIVATE KEY-----
 EXAMPLEIArx/EXAMPLEKH23EXAMPLEsYXEXAMPLE5qdEXAMPLEcFHoAcEXAMPLEK
 oUQDQgAEnWs47PT8+ihhzyvXX6/yYMAWWODluRTR2Ix6ZY7Z+MV7v0W1maJzqeqq
 NQ+cpBvPDbyrDk9+Uf/sEaRCma094g==
 -----END EC PRIVATE KEY-----
 EXAMPLEwzAEXAMPLEEXAMPLEURD7EXAMPLE
 ```
 In order to register the key with the btcpay server, you have to first generate a pairing token using the btcpay server interface.
 This requires your btcpay server account to have access to the capsul store. Ask Cass about this.
 Navigate to `Manage store: Access Tokens` at: `https://btcpay.cyberia.club/stores/<store-id>/Tokens`
 ![](images/btcpay_sin_pairing.jpg)
 Finally, send an http request to the btcpay server to complete the pairing:
 ```
 curl -H "Content-Type: application/json" https://btcpay.cyberia.club/tokens -d "{'id': 'EXAMPLEwzAEXAMPLEEXAMPLEURD7EXAMPLE', 'pairingCode': 'XXXXXXX'}"
 ```
 It should respond with a token: 
 ```
 {"data":[{"policies":[],"pairingCode":"XXXXXXX","pairingExpiration":1589473817597,"dateCreated":1589472917597,"facade":"merchant","token":"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx","label":"capsulflask"}]}
 ```
 And you should see the token in the btcpay server UI:
 ![](images/paired.jpg)
 Now simply set your `BTCPAY_PRIVATE_KEY` variable in `.env`
 NOTE: make sure to use single quotes and replace the new lines with \n.
 ```
 BTCPAY_PRIVATE_KEY='-----BEGIN EC PRIVATE KEY-----\nEXAMPLEIArx/EXAMPLEKH23EXAMPLEsYXEXAMPLE5qdEXAMPLEcFHoAcEXAMPLEK\noUQDQgAEnWs47PT8+ihhzyvXX6/yYMAWWODluRTR2Ix6ZY7Z+MV7v0W1maJzqeqq\nNQ+cpBvPDbyrDk9+Uf/sEaRCma094g==\n-----END EC PRIVATE KEY-----'
 ```
 -----
 ## <a name="testing"></a>testing cryptocurrency payments
 I used litecoin to test cryptocurrency payments, because its the simplest & lowest fee cryptocurrency that BTCPay server supports. You can download the easy-to-use litecoin SPV wallet `electrum-ltc` from [github.com/pooler/electrum-ltc](https://github.com/pooler/electrum-ltc) or [electrum-ltc.org](https://electrum-ltc.org/), set up a wallet, and then either purchase some litecoin from an exchange, or [ask Forest for some litecoin](https://sequentialread.com/capsul-rollin-onwards-with-a-web-application/#sqr-comment-container) to use for testing.
 ## <a name="0_conf_diagram"></a>sequence diagram explaining how BTC payment process works (how we accept 0-confirmation transactions 😀)
 ![btcpayment_process](images/btcpayment_process.png)
 This diagram was created with https://app.diagrams.net/.
 To edit it, download the <a download href="readme/btcpayment_process.drawio">diagram file</a> and edit it with the https://app.diagrams.net/ web application, or you may run the application from [source](https://github.com/jgraph/drawio) if you wish.
--- a/docs/capsul.webp
+++ b/docs/capsul.webp
--- a/docs/configuration.md
+++ b/docs/configuration.md
@ -0,0 +1,89 @@
 # Configuring Capsul-Flask
 Create a `.env` file to set up the application configuration:
 ```
 nano .env
 ```
 You can enter any environment variables referenced in [`__init__.py`](../capsulflask/__init__.py) to this file.
 For example you may enter your SMTP credentials like this:
 ```
 MAIL_USERNAME=forest@nullhex.com
 MAIL_DEFAULT_SENDER=forest@nullhex.com
 MAIL_PASSWORD=**************
 ```
 ## <a name="example"></a>Example configuration from capsul.org (production):
 ```
 #LOG_LEVEL=DEBUG
 BASE_URL="https://capsul.org"
 # hub url is used by the SPOKE_MODE to contact the hub. Since this server is the hub,
 # this is fine. In fact it runs into problems (routing related?) when I set it to capsul.org.
 # similarly the baikal "spoke" (set up in the hosts table in the db) has "http://localhost:5000" as the https_url
 HUB_URL="http://localhost:5000"
 HUB_MODE_ENABLED="t"
 SPOKE_MODE_ENABLED="t"
 HUB_MODEL="capsul-flask"
 SPOKE_MODEL="shell-scripts"
 SPOKE_HOST_ID="baikal"
 SPOKE_HOST_TOKEN="<redacted>"
 HUB_TOKEN="<redacted>"
 # smtp.. see https://flask-mail.readthedocs.io/en/latest/#configuring-flask-mail
 MAIL_SERVER="smtp.nullhex.com"
 # MAIL_USE_SSL means SMTP with STARTTLS
 MAIL_USE_SSL=true
 # MAIL_USE_TLS means SMTP wrapped in TLS
 MAIL_USE_TLS=false
 MAIL_PORT="465"
 MAIL_USERNAME="capsul@nullhex.com"
 MAIL_PASSWORD="<redacted>"
 MAIL_DEFAULT_SENDER="capsul@nullhex.com"
 # stripe
 STRIPE_SECRET_KEY="sk_live_<redacted>"
 STRIPE_PUBLISHABLE_KEY="pk_live_tGDHY7kBwqC71b4F0N7LZdGl00GZOw0iNJ"
 # internal
 SECRET_KEY="<redacted>"
 POSTGRES_CONNECTION_PARAMETERS="sslmode=verify-full sslrootcert=letsencrypt-root-ca.crt host=postgres.cyberia.club port=5432 ...<redacted>"
 # btcpay server
 BTCPAY_URL="https://beeteeceepae2.cyberia.club"
 BTCPAY_PRIVATE_KEY='-----BEGIN EC PRIVATE KEY-----\n<redacted>\n-----END EC PRIVATE KEY-----'
 ```
 ## <a name="config_that_lives_in_db"></a>Configuration-type-stuff that lives in the database 
  - `hosts` table:
    - `id` (corresponds to `SPOKE_HOST_ID` in the config)
    - `https_url`
    - `token` (corresponds to `SPOKE_HOST_TOKEN` in the config)
  - `os_images` table:
    - `id` 
    - `template_image_file_name`
    - `description`
    - `deprecated`
  - `vm_sizes` table:
    - `id` 
    - `dollars_per_month`
    - `memory_mb`
    - `vcpus`
    - `bandwidth_gb_per_month`
 ## <a name="docker_secrets"></a>Loading variables from files (docker secrets)
 To support [Docker Secrets](https://docs.docker.com/engine/swarm/secrets/), you can also load secret values from files – for example, to load `MAIL_PASSWORD` from `/run/secrets/mail_password`, set
 ```sh
 MAIL_PASSWORD_FILE=/run/secrets/mail_password
 ```
--- a/docs/database.md
+++ b/docs/database.md
@ -0,0 +1,50 @@
 # capsul-flask's relationship to its Database Server
 Capsul has a ["hub and spoke" architecture](./architecture.md). The "Hub" runs the web application and talks to the Postrges database, while the "Spoke"s are responsible for creating/managing virtual machines. One instance of the capsul-flask application can run in both hub mode and spoke mode at the same time, however there must only be one instance of the app running in "Hub" mode at any given time.
 The Postgres connections parameters are [configurable](./configuration.md).
 ## <a name="schema_management"></a>Database schema management (schema versions)
 capsul-flask has a concept of a schema version. When the application starts, it will query the database for a table named `schemaversion` that has one row and one column (`version`). If the `version` it finds is not equal to the `desiredSchemaVersion` variable set in `db.py`, it will run  migration scripts from the `schema_migrations` folder one by one until the `schemaversion` table shows the correct version.
 For example, the script named `02_up_xyz.sql` should contain code that migrates the database from schema version 1 to schema version 2. Likewise, the script `02_down_xyz.sql` should contain code that migrates from schema version 2 back to schema version 1.
 **IMPORTANT: if you need to make changes to the schema, make a NEW schema version. DO NOT EDIT the existing schema versions.**
 In general, for safety, schema version upgrades should not delete data. Schema version downgrades will simply throw an error and exit for now. 
 ## <a name="manual_queries"></a>Running manual database queries
 You can manually mess around with the database like this:
 ```
 pipenv run flask cli sql -f test.sql
 ```
 ```
 pipenv run flask cli sql -c 'SELECT * FROM vms'
 ```
 This one selects the vms table with the column name header:
 ```
 pipenv run flask cli sql -c "SELECT string_agg(column_name::text, ', ') from information_schema.columns WHERE table_name='vms'; SELECT * from vms"
 ```
 How to modify a payment manually, like if you get a chargeback or to fix customer payment issues:
 ```
 $ pipenv run flask cli sql -c "SELECT id, created, email, dollars, invalidated from payments"
 1, 2020-05-05T00:00:00, forest.n.johnson@gmail.com, 20.00, FALSE
 $ pipenv run flask cli sql -c "UPDATE payments SET invalidated = True WHERE id = 1"
 1 rows affected.
 $ pipenv run flask cli sql -c "SELECT id, created, email, dollars, invalidated from payments"
 1, 2020-05-05T00:00:00, forest.n.johnson@gmail.com, 20.00, TRUE
 ```
 ## how to view the logs on the database server (legion.cyberia.club)
 `sudo -u postgres pg_dump capsul-flask | gzip -9 > capsul-backup-2021-02-15.gz`
--- a/docs/deployment.md
+++ b/docs/deployment.md
@ -0,0 +1,87 @@
 # Deploying Capsul on a server
 Capsul has a ["hub and spoke" architecture](./architecture.md). The "Hub" runs the web application and talks to the Postrges database, while the "Spoke"s are responsible for creating/managing virtual machines. One instance of the capsul-flask application can run in both hub mode and spoke mode at the same time, however there must only be one instance of the app running in "Hub" mode at any given time.
 ## <a name="spoke_mode_prerequisites"></a>Installing prerequisites for Spoke Mode
 On your spoke (see [Architecture](./architecture.md) You'll need `libvirtd`, `dnsmasq`, and `qemu-kvm`, plus a `/tank` diectory with some operating system images in it:
 ```
 sudo apt install libvirt-daemon-system virtinst git dnsmasq qemu qemu-kvm
 sudo mkdir -p /var/www /tank/{vm,img,config}
 sudo mkdir -p /tank/img/debian/10
 cd !$
 sudo wget https://cloud.debian.org/images/cloud/buster/20201023-432/debian-10-genericcloud-amd64-20201023-432.qcow2 -O root.img.qcow2
 ```
 TODO: network set-up
 TODO: cyberia-cloudinit.yml
 ## Deploying capsul-flask
 ### <a name="deploy_manually"></a>Manually
 Follow the [local set-up instructions](./local-set-up.md) on your server. 
 Make sure to set `BASE_URL` correctly, generate your own secret tokens, and
 configure your own daemon management for the capsul-flask server (e.g. writing
 init scripts, or SystemD unit files).
 Use the suggested `gunicorn` command (with appropriately-set address and port),
 instead of `flask run`, to launch the server.
 For example, here is the SystemD service unit file we use in production for `capsul.org`:
 ```
 [Unit]
 Description=capsul-flask virtual machines as a service
 After=network.target
 [Service]
 ExecStart=/usr/local/bin/pipenv run gunicorn --bind 127.0.0.1:5000 -k gevent --worker-connections 1000 app:app
 Restart=on-failure
 WorkingDirectory=/opt/capsul-flask
 [Install]
 WantedBy=multi-user.target
 ```
 TODO: cron runner is required to run maintenance tasks for now, but in the future we want to build this into the python based task scheduler. 
 ### <a name="coop_cloud_docker"></a> Using Co-op Cloud's vanilla Docker Swarm configuration
 Download the Co-op Cloud swarm `compose.yml`:
 ```sh
 wget https://git.autonomic.zone/coop-cloud/capsul/src/branch/main/compose.yml
 ```
 Optionally, download add-on compose files for Stripe, BTCPay, and Spoke Mode:
 ```sh
 wget https://git.autonomic.zone/coop-cloud/capsul/src/branch/main/compose.{stripe,btcpay,spoke}.yml
 ```
 Then, create a `.env` file and configure appropriately -- you probably want to
 define most settings in [the Co-op Cloud `.envrc.sample`
 file](https://git.autonomic.zone/coop-cloud/capsul/src/branch/main/.envrc.sample).
 Load the environment variables (using Python `direnv`, or a manual `set -a && source .env && set +a`), insert any necessary secrets, then run the deployment:
 ```sh
 docker stack deploy -c compose.yml -c compose.stripe.yml your_capsul
 ```
 (where you'd add an extra `-c compose.btcpay.yml` for each optional compose file
 you want, and set `your_capsul` to the "stack name" you want).
 TODO: cron runner
 ### <a name="coop_cloud_abra"></a> Using Co-op Cloud's `abra` deployment tool
 Follow [the guide in the README for the Co-op Cloud capsul package](https://git.autonomic.zone/coop-cloud/capsul/).
 ### Using docker-compose
 TODO
--- a/docs/images/btcpay_sin_pairing.jpg
+++ b/docs/images/btcpay_sin_pairing.jpg
--- a/docs/images/btcpayment_process.drawio
+++ b/docs/images/btcpayment_process.drawio
--- a/docs/images/btcpayment_process.png
+++ b/docs/images/btcpayment_process.png
--- a/docs/images/generate_btcpay_keys.py
+++ b/docs/images/generate_btcpay_keys.py
--- a/docs/images/hub-and-spoke.xml
+++ b/docs/images/hub-and-spoke.xml
--- a/docs/images/hub-and-spoke1.png
+++ b/docs/images/hub-and-spoke1.png
--- a/docs/images/hub-and-spoke2.png
+++ b/docs/images/hub-and-spoke2.png
--- a/docs/images/paired.jpg
+++ b/docs/images/paired.jpg
--- a/docs/local-set-up.md
+++ b/docs/local-set-up.md
@ -0,0 +1,68 @@
 # How to run Capsul locally
 ## <a name="manually"></a>Manually
 Ensure you have the pre-requisites for the psycopg2 Postgres database adapter package:
 ```sh
 sudo apt install python3-dev libpq-dev
 pg_config --version
 ```
 Ensure you have the wonderful `pipenv` python package management and virtual environment cli:
 ```sh
 sudo apt install pipenv
 ```
 Create python virtual environment and install packages:
 ```sh
 pipenv install
 ```
 Run an instance of Postgres (I used docker for this, you can use whatever you want, point is its listening on `localhost:5432`):
 ```sh
 docker run --rm -it -e POSTGRES_PASSWORD=dev -p 5432:5432 postgres
 ```
 Run the app 
 ```sh
 pipenv run flask run
 ```
 or, using Gunicorn:
 ```sh
 pipenv run gunicorn --bind 127.0.0.1:5000 -k gevent --worker-connections 1000 app:app
 ```
 Note that by default when running locally, the `SPOKE_MODEL` is set to `mock`, meaning that it won't actually try to spawn vms.
 ## Crediting your account
 Once you log in for the first time, you will want to give yourself some free capsulbux so you can create fake capsuls for testing. 
 ```sh
 pipenv run flask cli sql -c "INSERT INTO payments (email, dollars) VALUES ('<your email address here>', 20.00)"
 ```
 ## Running scheduled tasks:
 ```sh
 pipenv run flask cli cron-task
 ```
 ## <a name="docker_compose"></a>Run locally with docker-compose
 If you have Docker and Docker-Compose installed, you can use the
 `3wordchant/capsul-flask` Docker image to launch capsul-flask, and a Postgres
 database server, for you:
 ```sh
 docker-compose up
 ```
 `capsul-flask` will read settings from your `.env` file as usual; you can set any of the options mentioned in the [configuration documentation](./configuration.md).
Author	SHA1	Message	Date
forest	9e6036da28	fix last couple of images on docs	2021-07-21 16:41:44 -05:00
3wc	9f8d169f1b	Smol docs tweaks	2021-07-21 21:05:23 +02:00
forest	617534cd1c	add Configuration-type-stuff that lives in the database	2021-07-21 21:05:23 +02:00
forest	bddf42b750	forest's ReadMe docs changes	2021-07-21 21:05:23 +02:00
3wc	6ee7a42686	Split README up into separate files	2021-07-21 21:05:23 +02:00
3wordchant	f848eda931	Merge pull request 'Disable BTCPay in the interface, if BTCPAY_PRIVATE_KEY is un-set' (#3 ) from optional-btcpay into master Reviewed-on: #3	2021-07-21 20:20:40 +02:00
3wordchant	46f49e8d8f	Merge pull request 'Auto-generate the pricing table from the database' (#4 ) from generated-prices into master Reviewed-on: #4	2021-07-21 19:32:09 +02:00
forest	36329796f0	define BTCPAY_ENABLED based on URL and btcpay key, pass it explicitly	2021-07-21 12:12:41 -05:00
forest	28271ee852	remove class="small" from pricing table cuz normal size fits fine	2021-07-21 11:53:44 -05:00
3wc	7923f3a99f	Auto-generate the pricing table from the database	2021-07-21 12:19:28 +02:00
3wc	7ed847251f	Don't load /btcpay if BTCPAY_PRIVATE_KEY un-set	2021-07-21 00:22:58 +02:00
3wc	e3a4776a5d	Hide the BTCPay link if BTCPAY_PRIVATE_KEY un-set	2021-07-21 00:20:38 +02:00
3wc	357d99cb91	Add load_config_vars context processor.. ..to allow accessing config variables in the templates. This removes the need for adding config variables manually to template contexts.	2021-07-21 00:19:38 +02:00
forest	b8279d7491	add about ssh link to faq	2021-07-19 18:09:02 -05:00
forest	908d02803f	move hardcoding public3 to the right place	2021-07-12 16:10:28 -05:00
forest	6e6bd2b143	fix syntax error	2021-07-12 16:00:37 -05:00
forest	47fbaab403	hardcode network_name=public3 to sidestep phantom dhcp lease issues	2021-07-12 15:59:20 -05:00
forest	06a2bd3a6f	add public_ipv4_first_usable_ip, public_ipv4_last_usable_ip	2021-07-12 14:38:56 -05:00
forest	fbe9c7fca4	fix last IP address hanging off the end of the display on admin page	2021-07-12 12:27:07 -05:00
forest	6bdb133153	make admin display work better on phones	2021-07-12 12:23:27 -05:00
forest	b459e56f3a	use the provided network_name when creating a capsul	2021-07-12 12:19:56 -05:00
forest	be54117736	migration 17: network_name -> virtual_bridge_name, add network_name col	2021-07-12 12:16:32 -05:00
forest	aaf33a245b	point capsul at new public3/virbr3 network	2021-07-12 11:29:37 -05:00
forest	ad9c3476c7	simplify cidr block logic a little bit	2021-07-12 11:29:33 -05:00
forest	fcbea1e29b	fixing capsul creation after I broke it with the pre-allocated IP address changes	2021-07-11 12:18:58 -05:00
forest	a2f2e744e4	MAIL_USE_TLS=False, MAIL_USE_SSL=True defaults	2021-07-11 10:28:47 -05:00
forest	79ef90c380	hub allocate capsul IP addr when the create operation is being claimed create.sh will now be passed two extra arguments from the web app: network_name and public_ipv4_address network_name will be virbr1 or virbr2 or whatever the network is called and public_ipv4_address will be an ipv4 from that network which is not currently being used	2021-07-09 17:08:51 -05:00
		`@ -1,2 +0,0 @@`
			`DROP TABLE api_keys;`
			`UPDATE schemaversion SET version = 16;`