From b6f2071a91a3c757d15ded14b009231752a36285 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Tue, 18 Mar 2025 18:51:29 -0400 Subject: [PATCH 1/2] add docker secret, fix docker pool size --- systems/palatine-hill/docker/default.nix | 22 +++++++++++----------- users/alice/secrets.yaml | 7 ++++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/systems/palatine-hill/docker/default.nix b/systems/palatine-hill/docker/default.nix index 33149f2..2af50cd 100644 --- a/systems/palatine-hill/docker/default.nix +++ b/systems/palatine-hill/docker/default.nix @@ -31,47 +31,47 @@ default-address-pools = [ { base = "169.254.2.0/23"; - size = "28"; + size = 28; } { base = "169.254.4.0/22"; - size = "28"; + size = 28; } { base = "169.254.8.0/21"; - size = "28"; + size = 28; } { base = "169.254.16.0/20"; - size = "28"; + size = 28; } { base = "169.254.32.0/19"; - size = "28"; + size = 28; } { base = "169.254.64.0/18"; - size = "28"; + size = 28; } { base = "169.254.128.0/18"; - size = "28"; + size = 28; } { base = "169.254.192.0/19"; - size = "28"; + size = 28; } { base = "169.254.224.0/20"; - size = "28"; + size = 28; } { base = "169.254.240.0/21"; - size = "28"; + size = 28; } { base = "169.254.248.0/22"; - size = "28"; + size = 28; } ]; mtu = 9000; diff --git a/users/alice/secrets.yaml b/users/alice/secrets.yaml index 1103242..0216b97 100644 --- a/users/alice/secrets.yaml +++ b/users/alice/secrets.yaml @@ -8,6 +8,7 @@ alice: attic-nix-cache-reader: ENC[AES256_GCM,data:DWIkRri3lHJOVXIAbHWJL7cCV4FHjB91bbpPAib/5ZDKap3xjnxUjwswc7wjO1hCoV3+gmep1a64kma6MJts4bcAug5bPyrrPy//rVpCYvSbSmbPz5k4sW5GLU/Sf4NyBevsQo9KRrphpoSUQEFQB27vabYDjjkB051/qJo1B9B7nqmrSyd3np4YdyHAgUiMyJt0oqx8nXySz3XZU+DIM8/OhMZILpnEWIgyP2K7j8JNNpZZJ5sD/icUy6Vba/4LcKjtmYtfQ+HO1soyF6aMiQSjhp7fzJHktwa9kgB3oDzIg3KyCJYS2RNW7mW9Dd1T,iv:fvhGFU22KgknMpJbOkA3v29bKzRVX6hi7V7xJgSUjPg=,tag:TjGSUl0XXS7jlhP/NG4cvQ==,type:str] attic-nix-cache-writer: ENC[AES256_GCM,data:vxSeys7EJDyatZFpeyxeDzaKGqDtm3atpVly6+BPHUFTrlLaVl86roGZjpBB9wwOMuP007qJNva0HQcTONbSyNw/snUU5JpaFWLT87Eu81V8gdulzHwm61caQ4A/e1ylKkdtwalNymBSyWi9b+SOWXTgralrg9L3OHw+nVuZaAi8QXF2ImLoZ2vXl7MGNXParflV2KK2uqfRatDZMbSSFipT0tQpkNTBTA6l8woILK3BKrHdYq+D8n4EmRowSuMWuN1uknyctb4+Ap3AeBITvyJjKejocQ9qK9plP6CChiC4Z1mmt/HOrfXYXiJO+Va64rOYRywMga8=,iv:bAx7iR24dpIOudkiFOc/xmIG73rcaMDdhWjiBO4BsBM=,tag:gtTyldhdRV97YJREG5lPjA==,type:str] attic-nix-cache-admin: ENC[AES256_GCM,data:OP02nJTo0cx8M9cR+P7cpI1gEXCKqXWehlaL+dYGwGSUnQ6iSC25vpdZ5SSnjyhiBZe+VnYld+b5PO+OOt7NMGxVvQ0zcuvrG7qfhEpIfGrbx9S9cEV2eAMchG/Hua609MUTbFYKvpwWw6tFZD2dYYQv2gXI7mYSeN0Tw4i2x1f/+cKDtV+ak+UHRgEe/f5OdE8v5I6dRXUQGVOBSRAQkfYDFuI2JUz4oNJsz66YkdMtgudhqWi4mekODD3v2Gcg/zAv1PogaHaIH1BHNvLQ/DsNVcvLsnTb6inM3cTCyPpHcx+VwPO7g9kYNV8xcCRkAIvX6aFzRVT0tJcEXFWStMnKS8nr8HoKFQ==,iv:ftmN3jK5qa6SwrSyhhL3PZls2hTG6xGa0LW7ycdkYxQ=,tag:TQCELzJQjsMfAJseZ7tB4w==,type:str] + gitea-actions-token: ENC[AES256_GCM,data:QTEPMAh1RWWJ/O3yhkQkEBTdVL8XhIRGCDbiM0lLjfILKF4SpSJ2sA==,iv:mBaaB1JHb2KVc9n2pdeX4pSMvb7q5z3joMT7rR5Whgs=,tag:ef+58SI4AUeqUsk3RVDsRQ==,type:str] sops: kms: [] gcp_kms: [] @@ -41,8 +42,8 @@ sops: ZERFTlFyNjhOb3VCaW43ZXFHT1Vxc0UK7YV+BU7dCEOZxpqkQA394eDsnthvorj6 7bqrCdeU+6DU7DmFs6++BrNO2tx8vvOa1im+ZGrM/gZAJdv/7R2d6Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-01-26T04:17:36Z" - mac: ENC[AES256_GCM,data:BJ5d3iqdIBwqtnYOYfmsFqnJDXz67uzJ4UKWrjVUEgr4Nc95tE8mEyV40poZk/wAJGJMSDdRhsPmZI4H1xztkjkTsUCUJ2rR+SZ6gP1VhSEXu7bSvv63+bnajZQi9kZrfN0EZN8TLzzVHVvSVHcNEfbq9STWkZq6zCk9E2cUfhk=,iv:MQ/lQkNi/S3bfz1PegcVfwy06RsxdQwZIU6sdOjkhgU=,tag:l5tK1SUwjTolliPkbfNDHg==,type:str] + lastmodified: "2025-03-18T22:08:52Z" + mac: ENC[AES256_GCM,data:3Hr8FyzfZvvtyusqdDOjggDGFlBwyOq2VND+/jtNbY5i5JPK+qTkamn98IKkcHSPooaIVzEAek91fZDo90mYRhCzEwfbLATmFXPHsZHUg+5nD8VzcNUWQDb2/ey4RPhzTMtXfY9v9wdIcTdBKYKSZ61puptSX8nJ2S74ag6B5AY=,iv:J+VxUvwWE496DqTsVXdlpxgkf8zGT9uDvt6RLrmc0n0=,tag:X2Qg3DDzOTBDqo+6eQPHvw==,type:str] pgp: - created_at: "2024-09-05T06:10:22Z" enc: |- @@ -57,4 +58,4 @@ sops: -----END PGP MESSAGE----- fp: 5EFFB75F7C9B74EAA5C4637547940175096C1330 unencrypted_suffix: _unencrypted - version: 3.9.3 + version: 3.9.4 -- 2.48.1 From 5b5835e0045f88aaa1824122665b35990e2a9853 Mon Sep 17 00:00:00 2001 From: ahuston-0 Date: Tue, 18 Mar 2025 19:18:02 -0400 Subject: [PATCH 2/2] fix collabora code service name --- systems/palatine-hill/docker/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/palatine-hill/docker/nextcloud.nix b/systems/palatine-hill/docker/nextcloud.nix index daa97c5..bdcb3de 100644 --- a/systems/palatine-hill/docker/nextcloud.nix +++ b/systems/palatine-hill/docker/nextcloud.nix @@ -100,7 +100,7 @@ in }; "docker/collabora" = { owner = "www-data"; - restartUnits = [ "docker-collabora.service" ]; + restartUnits = [ "docker-collabora-code.service" ]; }; }; }; -- 2.48.1