Clone core module in staging and prod, move bad stuff to experimental

12 files changed, 0 insertions, 880 deletions

diff --git a/app/bad.csi-s3/deploy/csi-s3.hcl b/app/bad.csi-s3/deploy/csi-s3.hcl
deleted file mode 100644
index 8e70c6a..0000000
--- a/app/bad.csi-s3/deploy/csi-s3.hcl
+++ /dev/null
@@ -1,39 +0,0 @@
-job "plugin-csi-s3-nodes" {
-  datacenters = ["neptune", "pluton"]
-
-  # you can run node plugins as service jobs as well, but this ensures
-  # that all nodes in the DC have a copy.
-  type = "system"
-
-  group "nodes" {
-    task "plugin" {
-      driver = "docker"
-
-      config {
-        image = "ctrox/csi-s3:v1.2.0-rc.1"
-
-        args = [
-          "--endpoint=unix://csi/csi.sock",
-          "--nodeid=${node.unique.id}",
-          "--logtostderr",
-          "--v=5",
-        ]
-
-        # node plugins must run as privileged jobs because they
-        # mount disks to the host
-        privileged = true
-      }
-
-      csi_plugin {
-        id        = "csi-s3"
-        type      = "node"
-        mount_dir = "/csi"
-      }
-
-      resources {
-        cpu    = 500
-        memory = 256
-      }
-    }
-  }
-}
diff --git a/app/bad.csi-s3/deploy/dummy-volume.hcl b/app/bad.csi-s3/deploy/dummy-volume.hcl
deleted file mode 100644
index 67dfd39..0000000
--- a/app/bad.csi-s3/deploy/dummy-volume.hcl
+++ /dev/null
@@ -1,20 +0,0 @@
-id           = "dummy-volume"
-name         = "dummy-volume"
-type         = "csi"
-plugin_id    = "csi-s3"
-
-capability {
-  access_mode     = "single-node-writer"
-  attachment_mode = "file-system"
-}
-
-secrets {
-  accessKeyId = "GKfd94f06139bb73de5642baf5"
-  secretAccessKey = "a4fa6c956d847b145a823c4615e4655126c67babf3cce2337b4d73cd381d7f06"
-  endpoint = "https://garage-staging.home.adnab.me"
-  region = "garage-staging"
-}
-
-parameters {
-  mounter = "rclone"
-}
diff --git a/app/bad.nextcloud/config/litestream.yml b/app/bad.nextcloud/config/litestream.yml
deleted file mode 100644
index 46eca93..0000000
--- a/app/bad.nextcloud/config/litestream.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-dbs:
-  - path: /ephemeral/nextcloud.db
-    replicas:
-      - url: s3://nextcloud-db/nextcloud.db
-        region: garage-staging
-        endpoint: http://{{ env "attr.unique.network.ip-address" }}:3990
-        access-key-id: {{ key "secrets/nextcloud/s3_access_key" | trimSpace }}
-        secret-access-key:  {{ key "secrets/nextcloud/s3_secret_key" | trimSpace }}
-        force-path-style: true
-        sync-interval: 60s
diff --git a/app/bad.nextcloud/deploy/nextcloud.hcl b/app/bad.nextcloud/deploy/nextcloud.hcl
deleted file mode 100644
index 45d1b6e..0000000
--- a/app/bad.nextcloud/deploy/nextcloud.hcl
+++ /dev/null
@@ -1,137 +0,0 @@
-job "nextcloud" {
-  datacenters = ["neptune"]
-  type = "service"
-  
-  group "nextcloud" {
-    count = 1
-
-    network {
-      port "http" {
-        to = 80
-      }
-    }
-
-    ephemeral_disk {
-      size    = 10000
-    }
-
-    restart {
-      attempts = 10
-      delay    = "30s"
-    }
-
-    task "restore-db" {
-      lifecycle {
-        hook = "prestart"
-        sidecar = false
-      }
-
-      driver = "docker"
-      config {
-        image = "litestream/litestream:0.3.7"
-        args = [
-          "restore", "-config", "/etc/litestream.yml", "/ephemeral/nextcloud.db"
-        ]
-        volumes = [
-          "../alloc/data:/ephemeral",
-          "secrets/litestream.yml:/etc/litestream.yml"
-        ]
-      }
-      user = "33"
-
-      template {
-        data = file("../config/litestream.yml")
-        destination = "secrets/litestream.yml"
-      }
-
-      resources {
-        memory = 200
-        cpu = 1000
-      }
-    }
-
-    task "nextcloud" {
-      driver = "docker"
-      config {
-        image = "nextcloud:22.2.3-apache"
-        ports = [ "http" ]
-        #entrypoint = [ "/bin/sh", "-c" ]
-        #command = "apache2-foreground"
-
-        volumes = [
-          "../alloc/data:/var/www/html/data",
-        ]
-      }
-      user = "33"
-
-      template {
-        data = <<EOH
-SQLITE_DATABASE=nextcloud
-NEXTCLOUD_ADMIN_USER={{ key "secrets/nextcloud/admin_user" }}
-NEXTCLOUD_ADMIN_PASSWORD={{ key "secrets/nextcloud/admin_pass" }}
-NEXTCLOUD_TRUSTED_DOMAINS=cloud.home.adnab.me
-OVERWRITEHOST=cloud.home.adnab.me
-OVERWRITEPROTOCOL=https
-OBJECTSTORE_S3_HOST={{ env "attr.unique.network.ip-address" }}
-OBJECTSTORE_S3_PORT=3990
-OBJECTSTORE_S3_BUCKET=nextcloud-data
-OBJECTSTORE_S3_KEY={{ key "secrets/nextcloud/s3_access_key" }}
-OBJECTSTORE_S3_SECRET={{ key "secrets/nextcloud/s3_secret_key" }}
-OBJECTSTORE_S3_SSL=false
-OBJECTSTORE_S3_REGION=garage-staging
-OBJECTSTORE_S3_USEPATH_STYLE=true
-EOH
-        destination = "secrets/env"
-        env = true
-      }
-
-      resources {
-        memory = 2500
-        cpu = 1000
-      }
-
-      service {
-        port = "http"
-        tags = [
-          "tricot cloud.home.adnab.me 100",
-        ]
-        check {
-          type = "tcp"
-          port = "http"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-    }
-
-    task "replicate-db" {
-      driver = "docker"
-      config {
-        image = "litestream/litestream:0.3.7"
-        args = [
-          "replicate", "-config", "/etc/litestream.yml"
-        ]
-        volumes = [
-          "../alloc/data:/ephemeral",
-          "secrets/litestream.yml:/etc/litestream.yml"
-        ]
-      }
-      user = "33"
-
-      template {
-        data = file("../config/litestream.yml")
-        destination = "secrets/litestream.yml"
-      }
-
-      resources {
-        memory = 200
-        cpu = 100
-      }
-    }
-  }
-}
diff --git a/app/bad.nextcloud/secrets/nextcloud/admin_pass b/app/bad.nextcloud/secrets/nextcloud/admin_pass
deleted file mode 100644
index ffc9830..0000000
--- a/app/bad.nextcloud/secrets/nextcloud/admin_pass
+++ /dev/null
@@ -1 +0,0 @@
-CMD_ONCE openssl rand -base64 9
diff --git a/app/bad.nextcloud/secrets/nextcloud/admin_user b/app/bad.nextcloud/secrets/nextcloud/admin_user
deleted file mode 100644
index 7ff2967..0000000
--- a/app/bad.nextcloud/secrets/nextcloud/admin_user
+++ /dev/null
@@ -1 +0,0 @@
-USER Username for administrator account
diff --git a/app/bad.nextcloud/secrets/nextcloud/s3_access_key b/app/bad.nextcloud/secrets/nextcloud/s3_access_key
deleted file mode 100644
index 692dc34..0000000
--- a/app/bad.nextcloud/secrets/nextcloud/s3_access_key
+++ /dev/null
@@ -1 +0,0 @@
-USER S3 access key ID for database storage
diff --git a/app/bad.nextcloud/secrets/nextcloud/s3_secret_key b/app/bad.nextcloud/secrets/nextcloud/s3_secret_key
deleted file mode 100644
index 8bef13c..0000000
--- a/app/bad.nextcloud/secrets/nextcloud/s3_secret_key
+++ /dev/null
@@ -1 +0,0 @@
-USER S3 secret key for database storage
diff --git a/app/bad.yugabyte/deploy/yugabyte.hcl b/app/bad.yugabyte/deploy/yugabyte.hcl
deleted file mode 100644
index e7efa7a..0000000
--- a/app/bad.yugabyte/deploy/yugabyte.hcl
+++ /dev/null
@@ -1,204 +0,0 @@
-job "yugabytedb" {
-  type = "service"
-  datacenters = [ "neptune", "pluton" ]
-
-  priority = 80
-
-  constraint {
-    attribute = "${attr.cpu.arch}"
-    value     = "amd64"
-  }
-
-  group "master" {
-    count = 3
-
-    constraint {
-      attribute = "${attr.unique.hostname}"
-      operator  = "regexp"
-      value     = "(caribou|cariacou|carcajou)"
-    }
-
-    network {
-      port "admin" { static = 7000 }
-      port "master-rpc" { static = 7100 }
-    }
-
-    update {
-      max_parallel = 1
-      min_healthy_time = "30s"
-      healthy_deadline = "5m"
-    }
-
-    task "master" {
-      driver = "docker"
-
-      config {
-        image = "yugabytedb/yugabyte:2.11.1.0-b305"
-        command = "/home/yugabyte/bin/yb-master"
-        args = [ 
-          "--fs_data_dirs=/mnt/master",
-          "--replication_factor=3",
-          "--master_addresses=10.42.0.21:7100,10.42.0.22:7100,10.42.0.23:7100",
-          "--rpc_bind_addresses=0.0.0.0:7100",
-          "--placement_cloud=deuxfleurs",
-          "--placement_region=staging",
-          "--placement_zone=neptune",
-          "--minloglevel=1",
-        ]
-        volumes = [
-          "/mnt/ssd/yugabyte/master:/mnt/master",
-        ]
-        network_mode = "host"
-        logging {
-          type = "journald"
-        }
-      }
-
-      resources {
-        memory = 1000
-        cpu = 1000
-      }
-
-      kill_signal = "SIGINT"
-      kill_timeout = "20s"
-
-      service {
-        tags = ["yugabyte-master-rpc"]
-        port = 7100
-        address_mode = "driver"
-        name = "yugabyte-master-rpc"
-        check {
-          type = "tcp"
-          port = 7100
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-
-      service {
-        tags = ["yugabyte-admin"]
-        port = 7000
-        address_mode = "driver"
-        name = "yugabyte-admin"
-        check {
-          type = "tcp"
-          port = 7000
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-
-      restart { 
-        interval = "30m"  
-        attempts = 10  
-        delay    = "15s"  
-        mode     = "delay"
-      }
-    }
-  }
-
-  group "tserver" {
-    count = 3
-
-    constraint {
-      attribute = "${attr.unique.hostname}"
-      operator  = "!="
-      value     = "spoutnik"
-    }
-
-    network {
-      port "ysql" { static = 5433 }
-      port "tserver-rpc" { static = 9100 }
-    }
-
-    update {
-      max_parallel = 1
-      min_healthy_time = "30s"
-      healthy_deadline = "5m"
-    }
-
-    task "tserver" {
-      driver = "docker"
-
-      config {
-        image = "yugabytedb/yugabyte:2.11.1.0-b305"
-        command = "/home/yugabyte/bin/yb-tserver"
-        args = [ 
-          "--fs_data_dirs=/mnt/tserver",
-          "--start_pgsql_proxy",
-          "--tserver_master_addrs=10.42.0.21:7100,10.42.0.22:7100,10.42.0.23:7100",
-          "--rpc_bind_addresses=0.0.0.0:9100",
-          "--placement_cloud=deuxfleurs",
-          "--placement_region=staging",
-          "--placement_zone=neptune",
-          "--minloglevel=1",
-        ]
-        volumes = [
-          "/mnt/ssd/yugabyte/tserver:/mnt/tserver",
-        ]
-        network_mode = "host"
-        logging {
-          type = "journald"
-        }
-      }
-
-      resources {
-        memory = 1000
-        cpu = 1000
-      }
-
-      kill_signal = "SIGINT"
-      kill_timeout = "20s"
-
-      service {
-        tags = ["yugabyte-tserver-rpc"]
-        port = 9100
-        address_mode = "driver"
-        name = "yugabyte-tserver-rpc"
-        check {
-          type = "tcp"
-          port = 9100
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-
-      service {
-        tags = [ "yugabyte-ysql" ]
-        port = 5433
-        address_mode = "driver"
-        name = "yugabyte-ysql"
-        check {
-          type = "tcp"
-          port = 5433
-          address_mode = "driver"
-          interval = "60s"
-          timeout = "5s"
-          check_restart {
-            limit = 3
-            grace = "90s"
-            ignore_warnings = false
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/core/deploy/core.hcl b/app/core/deploy/core.hcl
deleted file mode 100644
index f57f21d..0000000
--- a/app/core/deploy/core.hcl
+++ /dev/null
@@ -1,71 +0,0 @@
-job "core" {
-  datacenters = ["dc1", "neptune"]
-  type = "system"
-  priority = 90
-
-  constraint {
-    attribute = "${attr.cpu.arch}"
-    value     = "amd64"
-  }
-
-  update {
-    max_parallel     = 1
-    stagger = "1m"
-  }
-
-  group "network" {
-    task "diplonat" {
-      driver = "docker"
-
-      config {
-        image = "lxpz/amd64_diplonat:3"
-        network_mode = "host"
-        readonly_rootfs = true
-        volumes = [
-          "secrets:/etc/diplonat",
-        ]
-      }
-
-      restart {
-        interval = "30m"
-        attempts = 2
-        delay    = "15s"
-        mode     = "delay"
-      }
-
-      template {
-        data = "{{ key \"secrets/consul/consul-ca.crt\" }}"
-        destination = "secrets/consul-ca.crt"
-      }
-
-      template {
-        data = "{{ key \"secrets/consul/consul-client.crt\" }}"
-        destination = "secrets/consul-client.crt"
-      }
-
-      template {
-        data = "{{ key \"secrets/consul/consul-client.key\" }}"
-        destination = "secrets/consul-client.key"
-      }
-
-      template {
-        data = <<EOH
-DIPLONAT_REFRESH_TIME=60
-DIPLONAT_EXPIRATION_TIME=300
-DIPLONAT_CONSUL_NODE_NAME={{ env "attr.unique.hostname" }}
-DIPLONAT_CONSUL_URL=https://localhost:8501
-DIPLONAT_CONSUL_CA_CERT=/etc/diplonat/consul-ca.crt
-DIPLONAT_CONSUL_CLIENT_CERT=/etc/diplonat/consul-client.crt
-DIPLONAT_CONSUL_CLIENT_KEY=/etc/diplonat/consul-client.key
-RUST_LOG=debug
-EOH
-        destination = "secrets/env"
-        env = true
-      }
-
-      resources {
-        memory = 40
-      }
-    }
-  }
-}
diff --git a/app/secretmgr.py b/app/secretmgr.py
deleted file mode 100755
index 8b17f61..0000000
--- a/app/secretmgr.py
+++ /dev/null
@@ -1,380 +0,0 @@
-#!/usr/bin/env python3
-
-# DEPENDENCY: python-consul
-import consul
-
-# DEPENDENCY: python-ldap
-import ldap
-
-# DEPENDENCY: passlib
-from passlib.hash import ldap_salted_sha1
-
-import os
-import sys
-import glob
-import subprocess
-import getpass
-import base64
-from secrets import token_bytes
-
-
-"""
-TODO: this will be a utility to handle secrets in the Consul database
-for the various components of the Deuxfleurs infrastructure
-
-Functionnalities:
-- check that secrets are correctly configured
-- help user fill in secrets
-- create LDAP service users and fill in corresponding secrets
-- maybe one day: manage SSL certificates and keys
-
-It uses files placed in <module_name>/secrets/* to know what secrets
-it should handle. These secret files contain directives for what to do
-about these secrets.
-
-Example directives:
-
-USER <description>
-(a secret that must be filled in by the user)
-
-USER_LONG <description>
-(the same, indicates that the secret fits on several lines)
-
-CMD <command>
-(a secret that is generated by running this command)
-
-CMD_ONCE <command>
-(same, but value is not changed when doing a regen)
-
-CONST <constant value>
-(the secret has a constant value set here)
-
-CONST_LONG
-<constant value, several lines>
-(same)
-
-SERVICE_DN <service name> <service description>
-(the LDAP DN of a service user)
-
-SERVICE_PASSWORD <service name>
-(the LDAP password for the corresponding service user)
-
-SSL_CERT <cert name> <list of domains>
-(a SSL domain for the given domains)
-
-SSL_KEY <cert name>
-(the SSL key going with corresponding certificate)
-
-RSA_PUBLIC_KEY <key name> <key description>
-(a public RSA key)
-
-RSA_PRIVATE_KEY <key name>
-(the corresponding private RSA key)
-"""
-
-
-# Parameters
-LDAP_URL = "ldap://localhost:1389"
-SERVICE_DN_SUFFIX = "ou=services,ou=users,dc=deuxfleurs,dc=fr"
-consul_server = consul.Consul()
-
-
-# ----
-
-USER             = "USER"
-USER_LONG        = "USER_LONG"
-CMD              = "CMD"
-CMD_ONCE         = "CMD_ONCE"
-CONST            = "CONST"
-CONST_LONG       = "CONST_LONG"
-SERVICE_DN       = "SERVICE_DN"
-SERVICE_PASSWORD = "SERVICE_PASSWORD"
-SSL_CERT         = "SSL_CERT"
-SSL_KEY          = "SSL_KEY"
-RSA_PUBLIC_KEY   = "RSA_PUBLIC_KEY"
-RSA_PRIVATE_KEY  = "RSA_PRIVATE_KEY"
-
-class bcolors:
-    HEADER = '\033[95m'
-    OKBLUE = '\033[94m'
-    OKCYAN = '\033[96m'
-    OKGREEN = '\033[92m'
-    WARNING = '\033[93m'
-    FAIL = '\033[91m'
-    ENDC = '\033[0m'
-    BOLD = '\033[1m'
-    UNDERLINE = '\033[4m'
-
-def read_secret(key, file_path):
-    lines = [l.strip() for l in open(file_path, "r")]
-    if len(lines) == 0:
-        print(bcolors.FAIL, "ERROR:", bcolors.ENDC, "Empty file in", file_path)
-        sys.exit(-1)
-    l0 = lines[0].split(" ")
-    stype = l0[0]
-    secret = {"type": stype, "key": key}
-    if stype in [USER, USER_LONG]:
-        secret["desc"] = " ".join(l0[1:])
-    elif stype in [CMD, CMD_ONCE]:
-        secret["cmd"] = " ".join(l0[1:])
-    elif stype == CONST:
-        secret["value"] = " ".join(l0[1:])
-    elif stype == CONST_LONG:
-        secret["value"] = "\n".join(lines[1:])
-    elif stype in [SERVICE_DN, SERVICE_PASSWORD]:
-        secret["service"] = l0[1]
-        if stype == SERVICE_DN:
-            secret["service_desc"] = " ".join(l0[2:])
-    elif stype in [SSL_CERT, SSL_KEY]:
-        secret["cert_name"] = l0[1]
-        if stype == SSL_CERT:
-            secret["cert_domains"] = l0[2:]
-    elif stype in [RSA_PUBLIC_KEY, RSA_PRIVATE_KEY]:
-        secret["key_name"] = l0[1]
-        if stype == RSA_PUBLIC_KEY:
-            secret["key_desc"] = " ".join(l0[2:])
-    else:
-        print(bcolors.FAIL, "ERROR:", bcolors.ENDC, "Invalid secret type", stype, "in", file_path)
-        sys.exit(-1)
-
-    return secret
-
-def read_secrets(module_list):
-    secrets = {}
-    for mod in module_list:
-        for file_path in glob.glob(mod.strip('/') + "/secrets/**", recursive=True):
-            if os.path.isfile(file_path):
-                key = '/'.join(file_path.split("/")[1:])
-                secrets[key] = read_secret(key, file_path)
-    return secrets
-
-def get_secrets_services(secrets):
-    services = {}
-    for key, secret in secrets.items():
-        if secret["type"] not in [SERVICE_DN, SERVICE_PASSWORD]:
-            continue
-        svc = secret["service"]
-        print(svc, "@", key, bcolors.OKCYAN, "...", bcolors.ENDC)
-        if svc not in services:
-            services[svc] = {
-                "dn": "cn=%s,%s"%(svc, SERVICE_DN_SUFFIX),
-                "desc": "(not provided)",
-                "pass": None,
-                "dn_at": [],
-                "pass_at": [],
-            }
-        if secret["type"] == SERVICE_DN:
-            services[svc]["dn_at"].append(key)
-            services[svc]["desc"] = secret["service_desc"]
-
-        if secret["type"] == SERVICE_PASSWORD:
-            services[svc]["pass_at"].append(key)
-            _, data = consul_server.kv.get(key)
-            if data is not None:
-                if services[svc]["pass"] is None:
-                    services[svc]["pass"] = data["Value"].decode('ascii').strip()
-
-    return services
-
-ldap_admin_conn = None
-def get_ldap_admin_conn():
-    global ldap_admin_conn
-    if ldap_admin_conn is None:
-        ldap_admin_conn = ldap.initialize(LDAP_URL)
-        ldap_user = input("LDAP admin user (full DN, please!): ")
-        ldap_pass = getpass.getpass("LDAP admin password: ")
-        ldap_admin_conn.simple_bind_s(ldap_user, ldap_pass)
-    return ldap_admin_conn
-
-# ---- CHECK COMMAND ----
-
-def check_secrets(module_list):
-    secrets = read_secrets(module_list)
-    print("Found", len(secrets), "secrets to check")
-    print()
-
-    check_secrets_presence(secrets)
-    check_secrets_services(secrets)
-
-def check_secrets_presence(secrets):
-    print("Checking secrets presence...")
-    for key in secrets.keys():
-        _, data = consul_server.kv.get(key)
-        if data is None:
-            print(key, bcolors.FAIL, "x", bcolors.ENDC)
-        else: 
-            print(key, bcolors.OKGREEN, "✓", bcolors.ENDC)
-    print()
-
-def check_secrets_services(secrets):
-    print("Checking secrets for LDAP service users...")
-    services = get_secrets_services(secrets)
-
-    for svc_name, svc in services.items():
-        for dn_key in svc["dn_at"]:
-            _, data = consul_server.kv.get(dn_key)
-            if data is not None:
-                got_val = data["Value"].decode('ascii').strip()
-                if got_val != svc["dn"]:
-                    print(svc_name, "wrong DN at", dn_key, bcolors.FAIL, "x", bcolors.ENDC)
-                    print("got:", got_val, "instead of:", svc["dn"])
-
-        if svc["pass"] is None:
-            print(svc_name, bcolors.FAIL, "no password stored", bcolors.ENDC)
-        else:
-            for pass_key in svc["pass_at"]:
-                _, data = consul_server.kv.get(pass_key)
-                if data is not None:
-                    got_val = data["Value"].decode('ascii').strip()
-                    if got_val != svc["pass"]:
-                        print(svc_name, "wrong pass at", dn_key, bcolors.FAIL, "x", bcolors.ENDC)
-
-            l = ldap.initialize(LDAP_URL)
-            try:
-                l.simple_bind_s(svc["dn"], svc["pass"])
-                print(svc_name, bcolors.OKGREEN, "✓", bcolors.ENDC)
-            except Exception as e:
-                print(svc_name, bcolors.FAIL, e, bcolors.ENDC)
-    print()
-
-
-# ---- GEN COMMAND ----
-
-def gen_secrets(module_list, regen):
-    secrets = read_secrets(module_list)
-    print("Found", len(secrets), "secrets to check and maybe generate")
-    print()
-
-    gen_secrets_base(secrets, regen)
-    gen_secrets_services(secrets, regen)
-
-    check_secrets_presence(secrets)
-    check_secrets_services(secrets)
-
-def gen_secrets_base(secrets, regen):
-    print("Filling in user secrets and cmd secrets...")
-
-    for key, secret in secrets.items():
-        _, data = consul_server.kv.get(key)
-        if data is not None and not regen:
-            continue
-
-        if secret["type"] == USER:
-            print("----")
-            print(key)
-            print("Description:", secret["desc"])
-            print("Enter value for secret, or ^C to skip:")
-            try:
-                val = input().strip()
-                consul_server.kv.put(key, val)
-                print(bcolors.OKCYAN, "Value set.", bcolors.ENDC)
-            except KeyboardInterrupt:
-                print(bcolors.WARNING, "Skipped.", bcolors.ENDC)
-
-        if secret["type"] == USER_LONG:
-            print("----")
-            print(key)
-            print("Description:", secret["desc"])
-            print("Enter value for secret, or ^C to skip:")
-            print("THIS IS A LONG VALUE, ENTER SEVERAL LINES AND FINISH WITH A LINE CONTAINING A SINGLE .")
-            try:
-                lines = []
-                while True:
-                    line = input().strip()
-                    if line == ".":
-                        break
-                    lines.append(line)
-                val = "\n".join(lines)
-                consul_server.kv.put(key, val)
-                print(bcolors.OKCYAN, "Value set.", bcolors.ENDC)
-            except KeyboardInterrupt:
-                print(bcolors.WARNING, "Skipped.", bcolors.ENDC)
-
-        if secret["type"] in [CONST, CONST_LONG]:
-            print("----")
-            print(key)
-            print("Resetting to constant value.")
-            consul_server.kv.put(key, secret["value"])
-            print(bcolors.OKCYAN, "Value set.", bcolors.ENDC)
-
-        if secret["type"] == CMD or (secret["type"] == CMD_ONCE and data is None):
-            print("----")
-            print(key)
-            print("Executing command:", secret["cmd"])
-            val = subprocess.check_output(["sh", "-c", secret["cmd"]])
-            consul_server.kv.put(key, val)
-            print(bcolors.OKCYAN, "Value set.", bcolors.ENDC)
-
-    print()
-
-def gen_secrets_services(secrets, regen):
-    print("Generating LDAP service accounts...")
-    services = get_secrets_services(secrets)
-
-    for svc_name, svc in services.items():
-        print("----")
-        print("Service:", svc_name)
-        print("Description:", svc["desc"])
-
-        for dn_key in svc["dn_at"]:
-            _, data = consul_server.kv.get(dn_key)
-            if data is None or data["Value"].decode('ascii').strip() != svc["dn"]:
-                print(bcolors.OKCYAN, "Setting DN", bcolors.ENDC, "at", dn_key)
-                consul_server.kv.put(dn_key, svc["dn"])
-
-        if svc["pass"] is None or regen:
-            print(bcolors.OKCYAN, "Generating new password", bcolors.ENDC)
-            svc["pass"] = base64.urlsafe_b64encode(token_bytes(12)).decode('ascii')
-
-        l = ldap.initialize(LDAP_URL)
-        try:
-            l.simple_bind_s(svc["dn"], svc["pass"])
-        except:
-            fix_service_user(svc)
-
-        for pass_key in svc["pass_at"]:
-            _, data = consul_server.kv.get(pass_key)
-            if data is None or data["Value"].decode('ascii').strip() != svc["pass"]:
-                print(bcolors.OKCYAN, "Setting password", bcolors.ENDC, "at", pass_key)
-                consul_server.kv.put(pass_key, svc["pass"])
-
-    print()
-
-def fix_service_user(svc):
-    print("Fixing service user", svc["dn"], "...")
-    l = get_ldap_admin_conn()
-    res = l.search_s(svc["dn"], ldap.SCOPE_BASE, "objectclass=*")
-    pass_crypt = ldap_salted_sha1.hash(svc["pass"])
-    if res is None or len(res) == 0:
-        print(bcolors.OKCYAN, "Creating entity...", bcolors.ENDC)
-        l.add_s(svc["dn"],
-                [
-                    ("objectclass",     [b"person", b"top"]),
-                    ("displayname",     [svc["desc"].encode('ascii')]),
-                    ("userpassword",     [pass_crypt.encode('ascii')]),
-                ])
-    else:
-        print(bcolors.OKCYAN, "Resetting entity password", bcolors.ENDC)
-        l.modify_s(svc["dn"],
-                [
-                    (ldap.MOD_REPLACE, "userpassword", [pass_crypt.encode('ascii')])
-                ])
-
-# ---- MAIN ----
-
-if __name__ == "__main__":
-    for i, val in enumerate(sys.argv):
-        if val == "check":
-            check_secrets(sys.argv[i+1:])
-            break
-        elif val == "gen":
-            gen_secrets(sys.argv[i+1:], False)
-            break
-        elif val == "regen":
-            gen_secrets(sys.argv[i+1:], True)
-            break
-        else:
-            print("Usage:")
-            print("    secretmgr.py [check|gen|regen] <module name>...")
-
-
diff --git a/app/shell.nix b/app/shell.nix
deleted file mode 100644
index c9b8053..0000000
--- a/app/shell.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  pkgs ? import <nixpkgs> {}
-}:
-
-with pkgs; mkShell {
-  nativeBuildInputs = [
-    nomad 
-    docker-compose
-    python39Packages.pip 
-    python39Packages.ldap 
-    python39Packages.consul 
-    python39Packages.passlib
-  ];
-}
-