From 9517f24d6fd9ec5826ee8790657b190e2b3efb42 Mon Sep 17 00:00:00 2001 From: asyncnomi Date: Thu, 19 Jun 2025 21:11:12 +0200 Subject: [PATCH 1/3] add gitlab url to point to its fqdn, add asyncnomi keys for agenix --- profiles/gitlab.nix | 2 ++ pubkeys/asyncnomi.keys | 2 ++ secrets/secrets.nix | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 pubkeys/asyncnomi.keys diff --git a/profiles/gitlab.nix b/profiles/gitlab.nix index 60c6bb2..b614178 100644 --- a/profiles/gitlab.nix +++ b/profiles/gitlab.nix @@ -34,6 +34,8 @@ in }; extraConfig.ldap = { enabled = true; + host = "gitlab2.federez.net"; + https = true; servers = { main = { label = "LDAP"; diff --git a/pubkeys/asyncnomi.keys b/pubkeys/asyncnomi.keys new file mode 100644 index 0000000..150f0a1 --- /dev/null +++ b/pubkeys/asyncnomi.keys @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAEAQC3wkkW58044OeMnwbok+KQJrxNVPLx8Bbh4ukfADkBNFhve0+XDHMdMXRsD8MEheiRW/tlkHOljD2206cYIfW5w/lCJIWnP/EJgOfQ+vSQ5cJMXjP18Wm7HBYsyc4PYdeZLbRS6lFYisWkSwKscO1sy3s5JtftMI5/QXK6al1Xbnr5K2mkeB90w3aiaUCz2pXXe1SiHitTmIeiuEY/4iycEBxkxEupSEivCBHoSO7uBpEhasZcpSxTz/303Ti4+JgWs69xUooyEuIhcwjWH/91a0LV+5yKzOpdDQeJrSv8Cw1EQmmGM0ZJv7wFKKQ3ht9DXZd4lrvPtyWSD+JYOSRSsNCEMy6dPX7uUdcDwkwnrdPaxBOXFOB1InTGQWVnMGBsG0aK7UkwmPuoJXhaordrHFEac9aIcg5P7q1D8S+L6u/DdFq2IGZsymTrSAJsHQJ6q9wnOwGmiLaPw4WBaagzdlTmNz6WODG/9I25vQsC3z+I4Q39NG1u9/d+f465e2Z79D8X3H/pfKkAllgOrMY2eWVqjttZpjCbFo2Ckpat7JRYrvUIQCrzbhWK0uwUlH7+wGDqcPPrtpLYtVfKcWR8G4hFZl7HzN18riNHJ3158Pf4Te4/OzC6kbXa62zFpB9BWXoL8VXfDHaNv/5LB27Ikqd3QsCJfuhUBpFbndiUtlO/WSSx/ryPv3P0tWWlLcZXHTgTAzSjd+Git2FWXnSQd4QY5N48zVZE4jMK92ZBb1sqoDQnsWv5PeBWFiti/fNbJhqUJhraUerNpXgkNgxq6I1CTWG27cq8cA2v8Pf3VTM26NlQU3fR+m5ClbzS2iAeNjnh8dN9jx+q+4f5d/WS4HhsbBE+0l7sOaNp/ahOTPandZcU4wELc1sWkF/8apI1NItFtESU+So5gGs4nCoE8DXGV6kMPHsL4lmOlCVMjqe35AXu6XLQidocAKMr2sZxvaB/57oKPf6w+XjAxN2Aur8J6ocBGiePVK+VOud3NdpJLQ6QNeI4n7NHXBh9NVuS/RTy9r/EtoSXDwibINWNNDSCANLT7WQNorM4LiJRVFFfAcmwaCY1LbYnnr27qrboPTMT+jrOOQn35wZboAC531oD//qt7VP03uQeeXtFlUmZYywAdhStour7YsmwnxdEe8B+FfRmdhFaOlWdoMnUrziNdWHWTuIH0UIiB/DuF8eGLRtAdDBT3cFOHDMekx0LW/a1BYn3dXXuW+p7gTQUtEZXe+NJcgc62dSPFXwVKo8sogjFQzscupkFFXn3FSmfH91iVa8B84AhAZi/bZ5TslccHr3C+333RJ8holOOynOfFxryN5mKPP4ycypF66TNcZ5/b/klpvUt7BitvPZT asyncnomi@rezo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIENo/g3BZ1bJViYE6EY4VZO96a4q8U4nWKjTprQJtjEH asyncnomi@rezo \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 30122d9..26f5b3b 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -14,8 +14,9 @@ let bensmrs = readKeyFile ../pubkeys/bensmrs.keys; tomate = readKeyFile ../pubkeys/tomate.keys; jeltz = readKeyFile ../pubkeys/jeltz.keys; + asyncnomi = readKeyFile ../pubkeys/asyncnomi.keys; - active-admins = raito ++ bensmrs ++ tomate ++ jeltz; + active-admins = raito ++ bensmrs ++ tomate ++ jeltz ++ asyncnomi; matrix-admins = active-admins; vaultwarden-admins = active-admins; -- 2.47.2 From 342b9a17c6063a1e066eb3282b4bd3f71a04c98f Mon Sep 17 00:00:00 2001 From: asyncnomi Date: Thu, 19 Jun 2025 21:29:22 +0200 Subject: [PATCH 2/3] me cannot see --- profiles/gitlab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/gitlab.nix b/profiles/gitlab.nix index b614178..df2b051 100644 --- a/profiles/gitlab.nix +++ b/profiles/gitlab.nix @@ -24,6 +24,8 @@ in services.gitlab = { enable = true; + host = "gitlab2.federez.net"; + https = true; databasePasswordFile = secrets.gitlab-db-password.path; initialRootPasswordFile = secrets.gitlab-initial-root-password.path; secrets = { @@ -34,8 +36,6 @@ in }; extraConfig.ldap = { enabled = true; - host = "gitlab2.federez.net"; - https = true; servers = { main = { label = "LDAP"; -- 2.47.2 From 267b8d94c8fa4c0d579cfb728ff3e3b2b0b1acd6 Mon Sep 17 00:00:00 2001 From: asyncnomi Date: Thu, 19 Jun 2025 22:28:27 +0200 Subject: [PATCH 3/3] unstable-small version bump to update gitlab --- npins/sources.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 9ded7b3..5d7edb2 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -48,8 +48,8 @@ "nixpkgs": { "type": "Channel", "name": "nixos-unstable-small", - "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.05pre777042.1d3a750cb7d8/nixexprs.tar.xz", - "hash": "0g2q7g6chpmaa0b6py8aqgwx71gvxlpirijlk6b0y5z15r0hdabk" + "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre818584.a269ce395284/nixexprs.tar.xz", + "hash": "0gjazqi3z82wkzlkchg7bvf60iippxsa7d204iz0bjgrv1vm8ki8" } }, "version": 5 -- 2.47.2