From 86613f682a82414f9c082cc6bac0f25d8be1b258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sun, 31 Dec 2023 15:52:11 +0100 Subject: [PATCH] remove nextcloud --- config/instance-20221213-1915.nix | 3 - config/services/nextcloud.nix | 92 ----------------------------- secrets/instance-20221213-1915.yaml | 7 +-- zones/chir.rs.nix | 3 +- 4 files changed, 3 insertions(+), 102 deletions(-) delete mode 100644 config/services/nextcloud.nix diff --git a/config/instance-20221213-1915.nix b/config/instance-20221213-1915.nix index 21832373..a427c24c 100644 --- a/config/instance-20221213-1915.nix +++ b/config/instance-20221213-1915.nix @@ -18,7 +18,6 @@ ./services/atticd.nix ./services/minecraft.nix ./services/postgres.nix - ./services/nextcloud.nix ./services/mautrix-discord.nix ./services/mautrix-telegram.nix ./services/mautrix-whatsapp.nix @@ -87,8 +86,6 @@ "L /var/lib/acme - - - - /persist/var/lib/acme" "L /var/lib/tailscale/tailscaled.state - - - - /persist/var/lib/tailscale/tailscaled.state" "d /build - - - - -" - "L /var/lib/nextcloud - - - - /persist/var/lib/nextcloud" - "d /persist/var/lib/nextcloud 0750 nextcloud nextcloud - -" "L /var/lib/ipfs - - - - /persist/var/lib/ipfs" "L /var/lib/uptime-kuma - - - - /persist/var/lib/uptime-kuma" ]; diff --git a/config/services/nextcloud.nix b/config/services/nextcloud.nix deleted file mode 100644 index 6e28c15c..00000000 --- a/config/services/nextcloud.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - pkgs, - config, - ... -}: { - services.nextcloud = { - appstoreEnable = true; - caching.redis = true; - config = { - adminpassFile = config.sops.secrets."services/nextcloud/adminpass".path; - adminuser = "darkkirb"; - dbhost = "/run/postgresql"; - dbname = "nextcloud"; - dbtype = "pgsql"; - dbuser = "nextcloud"; - defaultPhoneRegion = "DE"; - objectstore.s3 = { - autocreate = false; - bucket = "nextcloud-chir-rs"; - enable = true; - hostname = "ams1.vultrobjects.com"; - key = "X86D3HKJ3Y92IASK0XIG"; - secretFile = config.sops.secrets."services/nextcloud/s3".path; - usePathStyle = true; - useSsl = true; - }; - overwriteProtocol = "https"; - }; - enable = true; - enableImagemagick = true; - extraAppsEnable = true; - extraOptions = { - redis = { - host = config.services.redis.servers.nextcloud.unixSocket; - port = 0; - dbindex = 0; - }; - }; - hostName = "cloud.chir.rs"; - https = true; - package = pkgs.nextcloud28; - phpOptions = { - "opcache.save_comments" = "1"; - "opcache.validate_timestamps" = "0"; - "opcache.jit" = "1255"; - "opcache.jit_buffer_size" = "128M"; - }; - poolSettings = { - pm = "dynamic"; - "pm.max_children" = 460; - "pm.start_servers" = 4; - "pm.min_spare_servers" = 4; - "pm.max_spare_servers" = 64; - }; - webfinger = true; - }; - sops.secrets."services/nextcloud/adminpass".owner = "nextcloud"; - sops.secrets."services/nextcloud/s3".owner = "nextcloud"; - services.redis.servers.nextcloud = { - enable = true; - user = "nextcloud"; - }; - services.postgresql.ensureDatabases = ["nextcloud"]; - services.postgresql.ensureUsers = [ - { - name = "nextcloud"; - ensurePermissions = { - "DATABASE attic" = "ALL PRIVILEGES"; - }; - } - ]; - services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { - listen = [ - { - addr = "127.0.0.1"; - port = 13286; - } - ]; - }; - - services.caddy.virtualHosts."cloud.chir.rs" = { - useACMEHost = "chir.rs"; - logFormat = pkgs.lib.mkForce ""; - extraConfig = '' - import baseConfig - reverse_proxy { - to http://127.0.0.1:13286 - header_up Host cloud.chir.rs - } - ''; - }; -} diff --git a/secrets/instance-20221213-1915.yaml b/secrets/instance-20221213-1915.yaml index be8eb026..26fd2837 100644 --- a/secrets/instance-20221213-1915.yaml +++ b/secrets/instance-20221213-1915.yaml @@ -21,9 +21,6 @@ services: secretKey: ENC[AES256_GCM,data:dOn2HftJvcPDfHe/7i7Z6teh8OG2FDS5dmeKekCtxxJ0+sO5i17k8g==,iv:5GdyGAuiT9exvJh8IefDAK5JL60wWB6u+zWAmNF/Ilc=,tag:dhrfEiyuF8OZHuf2ksEw0A==,type:str] ssh: host-key: ENC[AES256_GCM,data:oiy1thPKRVgH0XltFQCKwGMdLZde8zp1Ag1dL/el/2jXp1be1Evtr+kkZv56nhlaJ6KpYi5VsfrfpFVnKUkcYGUMmqVf2lFDu2fPcWB+PW7nol9K+sVRhHgTPP1wz385o5bof4OnbMF9sUbV0PT/pd4yAvluKq9s2vBBb2GEZ+HDBwkurmgVrFqUb66AvCdncXTpK47qpWZQMDTMGKqv5d1hJOoCCIulX3iJ4ko2xDD7qRlFtcdLNFLw3q4R6eP+L0OqoQs8dnjpIQOLVItzHTHTTcQRVoFvD7OMYSyU5RIIxTIOoS9tWzQu/QpHpO4cgjQ/GX09uj+a6/Cy8Itavd88YeSoYEPGwBYEciYLakFpNQ8aFl0yEsEMdZbfHgOUAOlbv28Mv93+RFMs5HrdIup/lZr5PsCBSsrMVkwJNVQKTxbN34LCTGOeCkuzohAwmwEVB/Ysuh23WyFKcdkGWAwlnVvgaNT5/TsNTCCI8Hf6fJecD4imWrJAtlXG7o+mnE+f0LlixxsnMgSnlkX4,iv:mnW23zPiSDoluMjQJEUFHDkVO6IT/4+RgAlaKuie3Qw=,tag:F+KOH/MkjrF1wYCR9OzFkQ==,type:str] - nextcloud: - adminpass: ENC[AES256_GCM,data:xB6PspGdPXCxLW2pTTisgGSDefuUui/y0rUUCKbpSXZQcjlOu2n8T1tyFvb3sv2PwkF7bEvzIqmXLfOFxXX0mA==,iv:AwGxw3czHeD5fgAor0EZtZDXHVT71mUUeguWpXytRRI=,tag:7w0AdobWwrXEo0HMHRE2Tw==,type:str] - s3: ENC[AES256_GCM,data:qOGmE4tlNF19uGlGmAD8CkUgyMXCU2jYyUmw3tQXOB7h2Kmdz4h0Ew==,iv:Pn5FtxcgDaq3JtBdSn68TUCkSN24raIXn0InNqHco9E=,tag:B3soDnb3fuM0/2vasVhRFw==,type:str] mautrix: sliding-sync: ENC[AES256_GCM,data:Md1TdEaxDFNCaHLHCTSfSzlxL59iFRBRaFzRsNkglUAG0TzWwQyEcN+youXV5iqmrram6v9hTaLuEZXQwFl6Tj30/XLtAjXgohT09GOo8g==,iv:/KCwuYAr6AeiLPsmkOaHlKiS6fTyuMKNg3O3w94hY0I=,tag:73ZpoqgERZ0ndIaK2eF5og==,type:str] telegram: ENC[AES256_GCM,data:w3KZ7wBTV1jW2K5FcUvy0ULVsRTW3O8gLpwQYwN+ovnKbcnyMp9tuAbNXB4P/LLfm5+9XCYqmAfrCFTXH8+6Tq4HvS+Y4713TTOHKdUR6j5onSbIsrNYUeWGGn0B0kkGC0layWKLhM/kMZjvK7ZzH8SPXutMrSY9dObhfb8glvLZhN0n9mdFR179MG8v8UjUmNpIBM2HZNKsJ9KIRyhPuu8V7qlj1AsnyoSTXTHhaSoS0bOJXVn+iPWhNBeMO01KfpnliK1nhI3Lm1fnVELUgPxxK6EF4bgz5ycjhxUPto7L4vuwd3grlUKi8FokbhnP0zr7/rxMkw/QM1cj3MlwvEUFtWSp7g==,iv:mhHPexuxL51VXHgtR9eLg6EhQ3ImrKOb/ytuGpDeyuI=,tag:OrPgTV0WadNURA5BsgPv9A==,type:str] @@ -55,8 +52,8 @@ sops: bVJUcDZLWTk3MiszOWp4enRRQmNsajQKF8QJs/Wb0SqnvsQEkRKlS1Ms9xLIdyvZ QCFAPclaOfaTLTiRJWXjDneBkMBduYKkRPiXCR+Bn7i4z8ixLXFmWw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-12-31T09:43:39Z" - mac: ENC[AES256_GCM,data:kfGjmxOn0iHMPGyZd1uEuUfDt/NoO9gN0bEqvBr3VU4qcz33FEUa3csp2wVxuur9FAOMWvkabQzqJJZnXZ+XifkKc7BtJwV1dpqsKukF7keVUcpkOyaYnsYgo8ZV/8hN64OFlVrbXiAJKMmlq7cXCC/xrMmuIdudhqBVXo73o8Q=,iv:ZPPL92bgkD5C9DOKuAagP3bIpVfq9qVrKKoGNSfjjAw=,tag:QKrRrZ0rKOvJucvQhPwYqg==,type:str] + lastmodified: "2023-12-31T14:51:29Z" + mac: ENC[AES256_GCM,data:1RmJ4S5xhamBWnvBTAgRWF6dNfurP0BFOiMZIivDWf6au/hvk4UEnsrRIn+EsYN7WX0KgRxoRTjprvMMeEJFqU4bGoH8dpHGCbkydIR5jvSiGsJSg95DdNbuk8DYOo58AHvUzcebyp2HQxYm0ho4DFfkLmuLCa1o0o/H2Fm2v1c=,iv:192+KiXK5OizU78CIu9ifCmCRo/L+9Sk9VBy9kZ+t/8=,tag:gReh3GfwwOL7CT0qGDRAtw==,type:str] pgp: - created_at: "2022-12-14T15:34:13Z" enc: | diff --git a/zones/chir.rs.nix b/zones/chir.rs.nix index f8d5e26a..d675b345 100644 --- a/zones/chir.rs.nix +++ b/zones/chir.rs.nix @@ -144,7 +144,7 @@ with dns.lib.combinators; let SOA = { nameServer = "ns1.chir.rs."; adminEmail = "lotte@chir.rs"; - serial = 45; + serial = 46; }; NS = [ "ns1.chir.rs." @@ -238,7 +238,6 @@ with dns.lib.combinators; let mediaproxy.CNAME = ["mediaproxy-chir-rs.b-cdn.net."]; cache.CNAME = ["cache-chir-rs.b-cdn.net."]; attic = createFullZone {}; - cloud = createZone oracleBase; lotte.CNAME = ["lotte-chir-rs.b-cdn.net."]; status = createZone oracleBase; sliding-sync = createZone oracleBase;