From 005b0bb5e42c5855585a107421d7f638095cf138 Mon Sep 17 00:00:00 2001 From: James Walker Date: Sun, 9 Mar 2025 20:54:32 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20remove=20traefik?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 12 ++++---- nix/hosts/plato/configuration.nix | 1 - nix/modules/k3s/common.nix | 2 +- nix/modules/traefik/default.nix | 51 ------------------------------- nix/secrets/secrets.yaml | 5 ++- 5 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 nix/modules/traefik/default.nix diff --git a/flake.lock b/flake.lock index 4763732..2fc0bab 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1741461731, - "narHash": "sha256-BBQfGvO3GWOV+5tmqH14gNcZrRaQ7Q3tQx31Frzoip8=", + "lastModified": 1741563526, + "narHash": "sha256-FAJ7jIwFq1gxbxS+cdhtTxFM8eLWgP0jQGaVIvA/bug=", "owner": "nix-community", "repo": "home-manager", - "rev": "7f4c60a3d6e548dbc13666565c22cb3f8dcdad44", + "rev": "597f9c2f06af8791b31c48ad05471ac5afbd0f0a", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", + "lastModified": 1741402956, + "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3", "type": "github" }, "original": { diff --git a/nix/hosts/plato/configuration.nix b/nix/hosts/plato/configuration.nix index f07e262..751aaf4 100644 --- a/nix/hosts/plato/configuration.nix +++ b/nix/hosts/plato/configuration.nix @@ -18,7 +18,6 @@ in ../../modules/minecraft ../../modules/postgresql ../../modules/sops - ../../modules/traefik ]; boot = { binfmt.emulatedSystems = [ "aarch64-linux" ]; diff --git a/nix/modules/k3s/common.nix b/nix/modules/k3s/common.nix index 16e9ec1..17f9317 100644 --- a/nix/modules/k3s/common.nix +++ b/nix/modules/k3s/common.nix @@ -1,7 +1,7 @@ { config, ... }: { services.k3s = { - enable = true; + enable = false; tokenFile = config.sops.secrets.k3s-token.path; }; sops.secrets.k3s-token = { diff --git a/nix/modules/traefik/default.nix b/nix/modules/traefik/default.nix deleted file mode 100644 index 6bf4e96..0000000 --- a/nix/modules/traefik/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, ... }: - -{ - services.traefik = { - enable = true; - group = "docker"; - environmentFiles = [ - config.sops.secrets.traefik.path - ]; - staticConfigOptions = { - api = { - dashboard = true; - insecure = true; - }; - certificatesResolvers = { - myresolver = { - acme = { - email = "walkah@walkah.net"; - storage = "/var/lib/traefik/acme.json"; - dnsChallenge = { - provider = "cloudflare"; - }; - }; - }; - }; - entryPoints = { - web = { - address = ":80"; - http = { - redirections = { - entryPoint = { - to = "websecure"; - scheme = "https"; - }; - }; - }; - }; - websecure = { - address = ":443"; - }; - }; - providers = { - docker = { }; - }; - }; - }; - - sops.secrets.traefik = { - owner = "traefik"; - }; -} diff --git a/nix/secrets/secrets.yaml b/nix/secrets/secrets.yaml index e1b8eaf..fe48f77 100644 --- a/nix/secrets/secrets.yaml +++ b/nix/secrets/secrets.yaml @@ -1,7 +1,6 @@ matrix-registration-secret: ENC[AES256_GCM,data:Sn3pGBq4U3Tgw0pYaetnBLRiNdFGnMxAxyfrxhF9kFDMFijKSy9XBj71M5XxV4shYQyPvu2WDnPR1YvyoQVlv8cEoXhX7++JlYsp/2ZfKIzp4iMxh24z57Cw8vg=,iv:/zxlIeI9gWWCHbejYgz8pjjOrukKome0/bmcXuG3/yE=,tag:3fc3c96H3pO1FUO7p3T4gw==,type:str] ipfs-cluster-secret: ENC[AES256_GCM,data:fmZ1USrJlR8fbulr1Kn8LDkMl/c6OkIN5M5q4X0MLO77K8zPwTXm0+M8ZHfq36rnuxBV0gsTiYBn47DSQLaDkONOPuEu99EGuIYZ9qZQVaZ/RC12ej6bpHaaX3m3j48szOXwJdoyDWlP32ZFanMznO8+EwAz5ccNV03ck/Rh/qpq9pWt/QjNhqtAkwFkooGB0aWRdHlillsB/SGQJk/moweIQk3qz2Ya4cN21Cxfssd08TDacjNCUekIgZ/xuXV7j8dCV/qiAOJEfaHn,iv:bAEDTTeQvg+sE67nEuSZhxqJBZVXFRNIPOZGkPYy9dY=,tag:82eBLePaqu7tYu0MtefMOQ==,type:str] drone: ENC[AES256_GCM,data:UKh2qyZq5eTiEpdbGve+fCQZzSx/j+wUv9eHT/ToU9b51rwA7XJQC4g3rvljBL9X7DFVVdsWOdG6y1eRGImdelJ5hwxa8oK5CBpaGLGjd9+Hm8SS+Q+PAFDW6fdsPtDDgK5jjykcIlJ7u9mjCffFsCGw3UWfHxnniCnIba9e499XU+VR6l96U3oGOsrr0XO/d2zwrOm3mvXQL1P3cE+se4/UDKrdABGfKWyGqZ9xgi6Q7PTSmRv4AtpwpgF1URBvPVqs6yoexWetksLv+Xk5H50EeucbMOA+oUSJ06fUMECFRF9thRrdUbtK,iv:CiZz6NSksNMGmZxWS7uE69O6UnvTkRWbeBwC1bUqR9o=,tag:qcLmseQgkjMVv2uNXPFHzw==,type:str] -traefik: ENC[AES256_GCM,data:SEjgraDDpdJnaOEZVi/0Vtr3J/jQ3zC2kZaMmMRKhRd77EkXC6eeSbOaORv30QSXcfipm8INT45TKZfRSdbnoV6XbgAqLyLmef3LkmMt+eA=,iv:bbns12ZiqeBha0eWEARMixFfPDHzF8PBjUEeEdkwf6Q=,tag:ft2k2CQk7VmfWiGhhyHVfQ==,type:str] akkoma-secret-key-base: ENC[AES256_GCM,data:OQBGkyjhDeNz40bBMMqLU7S6s4r6CtatOxJ5RNdba5m5NQO+JJ5/sEuOjJrJ29oRGjHFYwmUcAB9vptWdGZdcA==,iv:oYh9fh12cNYJOgC8DAxyYxw8dp1Fmd1CijNpgmn/AV8=,tag:E9W/5TWPjIgjE3o/QAky0A==,type:str] akkoma-signing-salt: ENC[AES256_GCM,data:KtOdcHM8XLY=,iv:RXvLlSyPzK6HYFxwyKEnDw1llmfNC5ambqvGiAkVxnA=,tag:LLna293WAYoBlr0j3U6zkg==,type:str] akkoma-vapid-private-key: ENC[AES256_GCM,data:D8Dh53yOgKrcsttJ36xyV1locXBV2BB2EG/rOfIctCbOItdsodtpMCAwRg==,iv:xzheaTo0b3szYGvZmc3ucPi9lYXJStznAUyWNQ9TATE=,tag:tHV5DUFuvq2F9yRFmHrQXQ==,type:str] @@ -79,8 +78,8 @@ sops: WlZuY2ExWWJ1VzBpY2kzaUZCcVJMZHcKoqKBQEe+3UnAhqbc7Nq8zgEVoFFjryaY c8ALKqMIaMjAeA8ZU4ZTIu13pMYcJ+gAlPATt0vmsTn0Q0XIiudpJQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-08T22:11:05Z" - mac: ENC[AES256_GCM,data:CC4S0Hyd9y9McI9nrK6syQfLdrIUmmdzjldDwY/f+X2pjQhQrA/qikU/si4jrz44Zbew4Byu0add2MF4Yb1zM4q3Nbj2RYTyvkO+An5Vmajp/rHXfdbadrqGMPB9iai4jIoDzJtCIeB+p3W6I1ZbkaSJJ7aXqdgy2eJufDmglns=,iv:uDoS/bRsPhEv/TGqGnMB2E9+QBv104qANJFcZG6a/LI=,tag:+vihdtQ3rdH1glVnmr5N1Q==,type:str] + lastmodified: "2025-03-10T00:53:29Z" + mac: ENC[AES256_GCM,data:TunatWdp9M2jhNHpqgabC9DCNr1D3uYZaAJRzpTBVX+ZFDFAV7DKEghX8A+jpRIxmqjqXMgrhnN4BQqobBHKxtIWY4hKNxoPuDdGLydL1AT9D+Z5b5q1XIMshirgYeSYaHEjpIKcozb2hxnabxxTEDl3HmwEi9i6jtl2vPPGSJc=,iv:+pwU3cNJ6LIdZ4GiJi4OPRqQjlWUuwgKCJilr0blcsU=,tag:C4/oSw6Cxpi/8AwQ1ANzgw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4