From 724d1a5e7eb38893a9bbc2e11d0bd0a8679ec236 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Tue, 31 Aug 2021 02:04:25 -0400
Subject: [PATCH] Remove radicale now that everything is in nextcloud, decrease
 resources for wallabag

---
 docker/radicale/Dockerfile                   |  16 ---
 docker/radicale/files/MaskedName_Root_CA.crt |  43 -------
 nomad/radicale.nomad                         | 124 -------------------
 nomad/wallabag.nomad                         |   4 +-
 4 files changed, 2 insertions(+), 185 deletions(-)
 delete mode 100644 docker/radicale/Dockerfile
 delete mode 100755 docker/radicale/files/MaskedName_Root_CA.crt
 delete mode 100644 nomad/radicale.nomad

diff --git a/docker/radicale/Dockerfile b/docker/radicale/Dockerfile
deleted file mode 100644
index 169f8d3..0000000
--- a/docker/radicale/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM alpine:edge
-
-RUN adduser --uid 1009 --system radicale && \
-    addgroup --gid 1011 --system radicale && \
-    apk update && \
-    apk add --update --no-cache ca-certificates radicale
-
-# Copy masked.name root cert
-COPY files/MaskedName_Root_CA.crt /usr/local/share/ca-certificates/MaskedName_Root_CA.crt
-COPY files/logging /etc/radicale/logging
-
-# update ca certs
-RUN update-ca-certificates 2>/dev/null
-EXPOSE 5232
-
-CMD ["radicale"]
diff --git a/docker/radicale/files/MaskedName_Root_CA.crt b/docker/radicale/files/MaskedName_Root_CA.crt
deleted file mode 100755
index 31f76a9..0000000
--- a/docker/radicale/files/MaskedName_Root_CA.crt
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUYp8xo5t2lJFP3SiD1fJirgGUQJ0wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLbWFza2VkLm5hbWUwHhcNMjAwODI5MTkyMzEyWhcNMzAw
-ODI3MTkyMzQyWjAWMRQwEgYDVQQDEwttYXNrZWQubmFtZTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAMI7oR+KHvvznfnaAXDMO5qpSTCAYCyfjFEohYJf
-lOcnLONXb3f6sP5d1eltL+UTq0RVU5UP0aNW7hqDTa41MRw0JCDtB68yKdYq2hZf
-97gA+lj3MEJU6RTAKLrg75GRh/AbNEIgwvPuHKW6hMbtwOyM9DFU//W3xpusalXy
-RMFzAHfSDj9ci+UygUt9HINWd/SmMGG/8PghaRhfE44wRFMqYezeliIt2JIs43BV
-7HqG0Oev9WPeXmiaZUYKQetHiQqR14Mxiv1IGzCmwwN+9b4tZtZTa58oM5dPXfbb
-lrELQE5OsPaNtMtER3MgxovDN3VSCGH/O/GyaEWVanY5UF8CAwEAAaN7MHkwDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFBY8jW3fDVUp
-URt1prhmDMjkVikgMB8GA1UdIwQYMBaAFBY8jW3fDVUpURt1prhmDMjkVikgMBYG
-A1UdEQQPMA2CC21hc2tlZC5uYW1lMA0GCSqGSIb3DQEBCwUAA4IBAQAWQz4d3QzE
-W8NGA16ZPamlVubOLB5DtZz2qrSrn3DeObLIDShInV3qtRlDx9HYJLTCA75Ket0J
-NTsyMcTy2txd4I8hgdF30XJeEciN9wZ0mKEeP/YKDwe8V2XwWq4XYkDechlWHpZo
-PfWcoLprKwVUI4HzaqkNmwcmMUI4xAsC+SLe1mrebseKm49oOwdQs/oPVLK+0nEp
-RvD0aOvohILIa/2ZtKczvhB/L3fo5pg9Ex/0JDBdDHIedMabD3qn8Idse+P5Dfwa
-Ju2Ctyb+n1TTPxRDMxs2cFbA5irr+2ARJd8jtGS+1fyxogjOWS1RR523F+qIS3su
-KibGel+gFPpq
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIID0zCCArugAwIBAgIUM52uhXSeTCim1pmzucm/cnIgNp8wDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAxMLbWFza2VkLm5hbWUwHhcNMjAwODI5MTkyNzAwWhcNMjUw
-ODI4MTkyNzMwWjAtMSswKQYDVQQDEyJtYXNrZWQubmFtZSBJbnRlcm1lZGlhdGUg
-QXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8LuGo+As
-ICYWdJjBCY0snF/X+jF1tdcrQzNiRKESEb5dsDiy979bugCblPQDQ+g5WGqXX4pj
-UyZZE3ZwhOufISlGK0ow1aMjqS+pFlQ85KRD/jUtLPRUJuQF+m2YwId/Mg6/B7Qk
-d166uJkNxS+MGZCi2OYXeoivnOY7Q0Kj/0vIbc5Vt3kCRVg2ljLSQhoBd+85AHMR
-jeRjZMeYEYF2HTVwrg4DrC/r00MVtDcNqs6+M7YZ/rzny73GvfJWfWoB1C4piZlg
-fvUcSDL5HAhjiu5cSeIR7DTuVx7t4PoK6AqUkPygDtq1ZaLybXT7X6d072dR5AXO
-nWFLPaaGJ979iwIDAQABo4IBADCB/TAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUIkhVYBaK9CcvXG8FM2jKVZ16oZAwHwYDVR0jBBgw
-FoAUFjyNbd8NVSlRG3WmuGYMyORWKSAwUQYIKwYBBQUHAQEERTBDMEEGCCsGAQUF
-BzAChjVodHRwOi8vdmF1bHQuY29sdW1iaWEubWFza2VkLm5hbWU6ODIwMC92MS9w
-a2lfcm9vdC9jYTBHBgNVHR8EQDA+MDygOqA4hjZodHRwOi8vdmF1bHQuY29sdW1i
-aWEubWFza2VkLm5hbWU6ODIwMC92MS9wa2lfcm9vdC9jcmwwDQYJKoZIhvcNAQEL
-BQADggEBAK6HMgR+hpwjZCmf5NszDSHr7dYKZXP4LrcHPWs94nLM33UZ572ubGHs
-dKjRw8YD0cncrsypsYmEgR57U+DHkys394wkb7UOwy1Zvd5IIRXdP0cDylz0QzqM
-APnQYN+ismkoljhk9ey0Qbo3CmPjM+UQcAxuZQtA4M+riC1+jkude1uYL0szC6Y9
-4KetfvbNkedSaV5yJaRKCBhRcC4/GjpBG/odQ/5AfBPAFjZqhcIJWBrVYbTQVC79
-hMA1iwWJPmT9LsjMSUfxFTPzxRnNXQiKFz5kT2OiS1nqh8aOcyU9YC928pkifNJV
-KokuDezJFM7ie3d+EcBk1V9lHwOWdto=
------END CERTIFICATE-----
diff --git a/nomad/radicale.nomad b/nomad/radicale.nomad
deleted file mode 100644
index 3c76c9b..0000000
--- a/nomad/radicale.nomad
+++ /dev/null
@@ -1,124 +0,0 @@
-job "radicale" {
-  datacenters = ["columbia"]
-  region      = "global"
-  type        = "service"
-
-  constraint {
-    attribute = "${meta.storage_optimized}"
-    value     = "true"
-  }
-
-  update {
-    stagger      = "30s"
-    max_parallel = 1
-  }
-
-  group "radicale" {
-    count = 1
-
-    task "radicale" {
-      vault {
-        policies    = ["default", "ansible"]
-        change_mode = "restart"
-      }
-      driver = "docker"
-      config {
-        image   = "docker.service.masked.name:8082/radicale"
-        ports   = ["http"]
-        volumes = [
-            "/mnt/raid/radicale/collections:/collections"
-        ]
-      }
-
-      service {
-        name = "radicale"
-        port = "http"
-
-        check {
-          name     = "radicale"
-          type     = "tcp"
-          interval = "10s"
-          timeout  = "2s"
-          address_mode = "driver"
-        }
-      }
-
-      template {
-        data = <<EOH
-            {{- with secret "pki_int/issue/masked-dot-name" "common_name=radicale.service.masked.name" "alt_names=radicale.service.columbia.masked.name" -}}
-            {{- .Data.certificate -}}
-            {{- end -}}
-        EOH
-        destination   = "${NOMAD_SECRETS_DIR}/radicale.crt"
-        change_mode   = "restart"
-      }
-
-      template {
-        data = <<EOH
-            {{- with secret "pki_int/issue/masked-dot-name" "common_name=radicale.service.masked.name" "alt_names=radicale.service.columbia.masked.name" -}}
-            {{- .Data.private_key -}}
-            {{- end -}}
-        EOH
-        destination   = "${NOMAD_SECRETS_DIR}/radicale.key"
-        change_mode   = "restart"
-      }
-
-      template {
-        data = <<EOH
-[server]
-hosts = 0.0.0.0:5232
-max_connections = 20
-max_content_length = 10000000
-timeout = 60
-ssl = False
-
-[encoding]
-request = utf-8
-stock = utf-8
-
-[auth]
-type = htpasswd
-htpasswd_filename = /secrets/users
-htpasswd_encryption = bcrypt
-delay = 1
-realm = Radicale - Password Required
-
-[storage]
-type = multifilesystem
-filesystem_folder = /collections
-
-[logging]
-mask_passwords = True
-
-[headers]
-Access-Control-Allow-Origin = *
-EOH
-        destination = "local/config"
-      }
-
-
-      template {
-        data = <<EOH
-amarpreet:{{ with secret "kv/data/radicale" }}{{ .Data.data.amarpreet }}{{ end }}
-        EOH
-        destination = "secrets/users"
-      }
-
-      env {
-        RADICALE_CONFIG = "/local/config"
-      }
-
-      resources {
-        cpu    = 2000
-        memory = 2560
-      }
-    }
-
-    network {
-      port "http" {
-        to = 5232
-       }
-    }
-
-  }
-}
diff --git a/nomad/wallabag.nomad b/nomad/wallabag.nomad
index e846b04..c6607fb 100644
--- a/nomad/wallabag.nomad
+++ b/nomad/wallabag.nomad
@@ -73,8 +73,8 @@ job "wallabag" {
       }
 
       resources {
-        cpu    = 4000
-        memory = 2560
+        cpu    = 2000
+        memory = 256
       }
     }