From f0e2e418aa7b2fd6ad3f75490b2bc8ab51b49976 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Tue, 12 Dec 2023 20:16:16 +0000 Subject: [PATCH] Cleanup Monica and git services --- hosts/linode/default.nix | 1 - hosts/linode/git.nix | 89 ---------------------------------------- hosts/linode/rei.nix | 27 ------------ secrets/monica.age | 38 ----------------- secrets/secrets.nix | 2 - 5 files changed, 157 deletions(-) delete mode 100644 hosts/linode/rei.nix delete mode 100644 secrets/monica.age diff --git a/hosts/linode/default.nix b/hosts/linode/default.nix index 06a8883..eeca23e 100644 --- a/hosts/linode/default.nix +++ b/hosts/linode/default.nix @@ -8,7 +8,6 @@ ./nextcloud.nix ./nginx.nix ./postgres.nix - ./rei.nix ./synapse.nix ]; greg.home = false; diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index df5968d..b0029c8 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -133,99 +133,10 @@ in { # CI SERVICES ########## ########################################################################################## - - # Service user - users.users.drone = { - isSystemUser = true; - group = "drone"; - home = droneDir; - }; - users.groups.drone = {}; - - # Environment secrets - age.secrets.drone = { - file = ../../secrets/drone.age; - owner = "root"; - }; - virtualisation.oci-containers = { backend = "podman"; - containers = { - "drone" = { - environment = { - DRONE_GITEA_SERVER = "https://${srcDomain}"; - DRONE_LOGS_DEBUG = "true"; - DRONE_SERVER_HOST = ciDomain; - DRONE_SERVER_PROTO = "https"; - DRONE_SERVER_PROXY_HOST = ciDomain; - DRONE_SERVER_PROXY_PROTO = "https"; - DRONE_TLS_AUTOCERT = "false"; # Suppress it generating SSL certificates, as our proxy handles that - }; - environmentFiles = [ - "/run/agenix/drone" - ]; - extraOptions = [ "--pull=newer" ]; - image = "drone/drone:2.17"; - ports = [ "${ciPort}:80" ]; - volumes = [ "${droneDir}:/data" ]; - }; - - "drone-docker" = { - environment = droneWorkerEnvironment; - environmentFiles = [ - "/run/agenix/drone" - ]; - extraOptions = [ "--pull=newer" ]; - image = "drone/drone-runner-docker:1.8"; - volumes = [ "/run/podman/podman.sock:/var/run/docker.sock" ]; - }; - }; }; - systemd.services = { - "podman-drone".serviceConfig = { - StateDirectory = "drone"; - StateDirectoryMode = pkgs.lib.mkForce "0777"; - WorkingDirectory = droneDir; - }; - - "drone-exec-runner" = { - environment = droneWorkerEnvironment; - description = "Drone pipeline runner that executes locally"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ - bash - drone-runner-exec - git - podman - ]; - - preStart = '' - mkdir -p ${execWorkDir} - cat /run/agenix/drone > ${execWorkDir}/conf.env - echo "" >> ${execWorkDir}/conf.env - ''; - script = "exec ${pkgs.drone-runner-exec}/bin/drone-runner-exec daemon ${execWorkDir}/conf.env"; - - serviceConfig = { - StateDirectory = "drone-exec"; - StateDirectoryMode = pkgs.lib.mkForce "0777"; - }; - }; - }; - - greg.proxies."${ciDomain}" = { - target = "http://localhost:${ciPort}"; - ssl = true; - genAliases = false; - }; - - ########################################################################################## - ########### - # CI WORKERS - ########## - ########################################################################################## virtualisation.podman = { enable = true; dockerCompat = true; diff --git a/hosts/linode/rei.nix b/hosts/linode/rei.nix deleted file mode 100644 index 55b3ab7..0000000 --- a/hosts/linode/rei.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, ... }: -{ - services.monica = { - enable = true; - appKeyFile = config.age.secrets.monica.path; - appURL = "https://people.thehellings.com"; - database = { - port = 5432; - }; - nginx = { - addSSL = true; - enableACME = true; - serverAliases = [ "people.thehellings.com" ]; - }; - }; - - age.secrets.monica = { - file = ../../secrets/monica.age; - owner = "monica"; - }; - - greg.backup.jobs.monica = { - src = "/var/lib/monica"; - dest = "monica"; - user = "monica"; - }; -} diff --git a/secrets/monica.age b/secrets/monica.age deleted file mode 100644 index 26f7658..0000000 --- a/secrets/monica.age +++ /dev/null @@ -1,38 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 mOmPfg X+7CjshhqaThstA+gFDN23HSrhaJPG/GSkeZSXRXqTg -btgSgDtB5tPaJMMfvZqv/CKqdAcFXBeHEm2ZuC8Fzvs --> ssh-ed25519 YJiRbw EW9X5R7XGczSOoC5fc0gsHgHcK3nTT/KQzjYurw9tws -MB2AyaJFx44mdbsK2sBAYjILuKZxXpd25Ci57q+WyiE --> ssh-ed25519 Nl/5yA lsY4ttlGcJ3FyPDh/Eg2P/xNsynBLLLqKIbzyVUVoQ0 -iEAOfYQyMaglmF+QeMatBLIgG5N2MUNDhM5LP/jNvuk --> ssh-rsa FS7DnA -QkRi9WLtEknHPvJktTXdMOMkEwufHU0JStgCc11rFACJ4ZAa7qb3448jWwq5slFi -G27RoJnMFmEhYkh5Yd6ck5fg/MELTLq/RHaXKJKUwcoXdej8EGN7B3/t+boVdMDK -ab37gwrQl4ek/8wlx/zNowkESPtNuA87MIOjOj2H7ZgvpchTPFqeTmNdR0AcoNBb -Yi7K8Y5yM3UPeUrot+Ad5wvqUzrlK77NNwsybvFSjeTCulUHlTj1FtIJL6xobT0v -IM4Iy/KcwjKK3QoIyMfAt95KuIRMT5GIkfdbQU/wUWSAunX8RiRV4USlkAgg5c0k -b7kKrGkCweAxfwD4AblVXmK9kN8SAwIMhh41PRRvTbtUJNtjUkFA3gNArpsmmVPI -5tNM8JUoe9E2F9WgJHkX4ctcN+Qu3gDKJbg7zvpTNLgw0wgfjh9h54L3p8L46x9L -Ut60f5oAYb6IqZu65WwTv5souNtq1soT3n3H2Tp7NPzAmdBy6G/p++xZ1RNfSeij -dnMMxOGmBiJ14upRaC7s5JZFbu/cwnX/2qLaY0sBXlpJpOFAsKmwd9TEm0+WCaSk -m5moOT7Ivjl8alPXQuOaAZfDFZvpcgOxNviy8iB1D22xkdkXerzbsL07uzKayU0r -SCi6XJmzCtS7TKbfmDjbLnDcVPylkWaKxXw9ekKoZBJ7LPMSfBVVPD+Zap20tV+u -pnfTkLTW3o8pRjvcip1Hl9XuWvyMnIgoKL4CYc0JzLQAcieRn8tVbDXes0O1pAMh -1LWwBHYQyVFTM8qIqpbt/ndKTB9euqEMzeMJ3oMYhDIchozSSwmbsRMrKqh6gWdI -ldeYn3F9sEi5pQwDA0KikDCuT2W2oek+KlQKKquGln/nWf+5m6HTgwvA7QxgIfZi -wYuG9aYxOWwylyUDeHCUJLQ7RPJk6Cik32pVEMaviNwTOnQPBlyzFAwDlq+0crdj -dV+6vo/rRY3UyU7FCuWE8SVZFTwP4E8SfEiqYgOOhE/6jDkAo8q32eEgLMG/9hi4 -Ro6Zy6DEv5la3cHZEUz550K8PHhajScoOiNK5RcG0YgBpLO93awz/iyrUDM2KuwS -xNFcpD165x9VpD2F9yNzvIqnTc3F5rDWa7PhffOV1ECdZaUgxhX8vuNN78sW+A4L -ppuJsVgx1rQFxtavUijFbS5Oona0aOlRLQop2BaW9an+PIRghsYJb/e3vjIGshVH -T5GxobOT7C7nxxs+ovdUUNmr0bWEINicQ9eTAHFx6pGSzgodMS1qrtROoY1L3+My -KVAeLhS7S4ls3W7TDm/AnqNoZG/HUOEyBkXOOzOGgZvD7/LiohNVzW/e1rLO2ziQ -QZByHxpv5gHZCUSq+3jqrA --> ssh-ed25519 FpzvfQ ztmplW5LE5mbFG2oxsnUQ5botTjz1427pPi47zwKTVs -l2leKVw0HKME7pfbP2P/S6YgwR+UDnLfLdyOszZ+2Tw --> ssh-ed25519 GdLgCQ otYdayZhkpESECiKhTSuaoJufMNzdGNboK06fMDWWnM -EmdT4yHbso/SqzJsHpYIHZpTUTUM+5V57yJkftIusSY --> >p|7o:_-grease O:zn -55ZZNnY7ZEWxwJDA ---- 6P7VSDuTwwkEO0Kc9r1COPei6CpAdumIdh9nwWtKQd8 -ː[5{MsݧGR ͋ OҬj9d;;/|"HaA $i#DvU1[(Y5j< \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index b0492e6..f3f31e5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -34,8 +34,6 @@ in "3proxy.age".publicKeys = everyone; - "monica.age".publicKeys = everyone; - "linode-forgejo-runner.age".publicKeys = everyone; "jude-forgejo-runner.age".publicKeys = everyone; }