From 06f82ef82b42fad193978bdbaf4acc626afe6392 Mon Sep 17 00:00:00 2001 From: sinavir Date: Tue, 20 Feb 2024 21:38:36 +0100 Subject: [PATCH] add ecoppens --- machines/hackens-org/_users.nix | 7 +++++++ machines/hackens-org/orga/authens.nix | 8 ++++---- npins/sources.json | 18 +++++++++--------- pubkeys/soyouzpanda.keys | 1 + 4 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 pubkeys/soyouzpanda.keys diff --git a/machines/hackens-org/_users.nix b/machines/hackens-org/_users.nix index d960b37..869866b 100644 --- a/machines/hackens-org/_users.nix +++ b/machines/hackens-org/_users.nix @@ -21,6 +21,12 @@ "$6$ujz06kXa4TgvPAbF$NaXkDuOUpf3.fBRh7JuygtS0V2U/Bz4N3DpbOznO.md44xEdlKwPH/pSbL9CQJBhI5kodaKZeSaoCyhzybBPA/"; openssh.authorizedKeys.keyFiles = [ ../../pubkeys/sinavir.keys ]; }; + ecoppens = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + hashedPassword = "$2b$05$c7kIDOunRJvgncWq5pmbXupy/wzUzCvN3b/RHgl/BjlUw891wI.Oa"; + openssh.authorizedKeys.keyFiles = [ ../../pubkeys/soyouzpanda.keys ]; + }; hbarral = { isNormalUser = true; extraGroups = [ "wheel" ]; @@ -29,6 +35,7 @@ root.openssh.authorizedKeys.keyFiles = [ ../../pubkeys/beigbeder.keys ../../pubkeys/sinavir.keys + ../../pubkeys/soyouzpanda.keys ]; }; }; diff --git a/machines/hackens-org/orga/authens.nix b/machines/hackens-org/orga/authens.nix index d7b5f82..32baafb 100644 --- a/machines/hackens-org/orga/authens.nix +++ b/machines/hackens-org/orga/authens.nix @@ -1,12 +1,12 @@ -{ lib, pythoncas, django, ldap, buildPythonPackage }: +{ lib, fetchgit, pythoncas, django, ldap, buildPythonPackage }: buildPythonPackage rec { pname = "authens"; version = "v0.1b5"; doCheck = false; - src = builtins.fetchGit { + src = fetchgit { url = "https://git.eleves.ens.fr/klub-dev-ens/authens.git"; - #rev = "master"; - #sha256 = "sha256-R0Nw212/BOPHfpspT5wzxtji1vxZ/JOuwr00naklWE8="; + rev = "58747e57b30b47f36a0ed3e7c80850ed7f1edbf9"; + hash = "sha256-R0Nw212/BOPHfpspT5wzxtji1vxZ/JOuwr00naklWE8="; }; propagatedBuildInputs = [ django ldap pythoncas ]; } diff --git a/npins/sources.json b/npins/sources.json index 74d40f4..7be29a7 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -8,9 +8,9 @@ "repo": "agenix" }, "branch": "main", - "revision": "564595d0ad4be7277e07fa63b5a991b3c645655d", - "url": "https://github.com/ryantm/agenix/archive/564595d0ad4be7277e07fa63b5a991b3c645655d.tar.gz", - "hash": "01dhrghwa7zw93cybvx4gnrskqk97b004nfxgsys0736823956la" + "revision": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "url": "https://github.com/ryantm/agenix/archive/8cb01a0e717311680e0cbca06a76cbceba6f3ed6.tar.gz", + "hash": "1ypp731d2h7i8fj5g2pdapwcrrk6ycxwzpvam045qxiajjdp01rw" }, "disko": { "type": "Git", @@ -20,9 +20,9 @@ "repo": "disko" }, "branch": "master", - "revision": "b4104fcaea42037b04c199a5d6784682a15be254", - "url": "https://github.com/nix-community/disko/archive/b4104fcaea42037b04c199a5d6784682a15be254.tar.gz", - "hash": "0shixlm3mgjw0f6anha89ixp36gfhcv508cbjj9488pvlrjd22is" + "revision": "d07de570ba05cec2807d058daaa044f6955720c7", + "url": "https://github.com/nix-community/disko/archive/d07de570ba05cec2807d058daaa044f6955720c7.tar.gz", + "hash": "18rli5h2xmzbbwambrcrg7r22vp0rmnjm55mcqc00n3fq5kscsqy" }, "dns.nix": { "type": "GitRelease", @@ -46,9 +46,9 @@ "repo": "nixpkgs" }, "branch": "nixos-unstable", - "revision": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", - "url": "https://github.com/NixOS/nixpkgs/archive/54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6.tar.gz", - "hash": "1lx3v67ymjr8vy49hzm9z52zzg7g5ak1x33qcp4vcp75rg04vlgs" + "revision": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", + "url": "https://github.com/NixOS/nixpkgs/archive/f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8.tar.gz", + "hash": "08zzqp8aadgqr1sbdw46wlydmv2h8i068mlx37lr2r1qmx2schai" } }, "version": 3 diff --git a/pubkeys/soyouzpanda.keys b/pubkeys/soyouzpanda.keys new file mode 100644 index 0000000..34b4881 --- /dev/null +++ b/pubkeys/soyouzpanda.keys @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKRDV4H+xWfskk4A+4CCEfgMOcjbiZqs0QkieH2vqe5S