From 7399c8ee852d7d9d198e9ba958f5c4f6e23ee79e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 30 Jul 2023 14:05:20 +0000 Subject: [PATCH 01/16] fix: change the repo name to make room for the compsoc user --- .gitlab-ci.yml | 2 +- flake.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc921cd..7eb6274 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ update: - git add flake.lock - git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit" # we have a custom domain - - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc/skynet/nixos.git + - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc1/skynet/nixos.git - git push origin HEAD:$CI_COMMIT_REF_NAME only: refs: diff --git a/flake.nix b/flake.nix index 0b9444f..f165aef 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,11 @@ simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; # sso.skynet.ie - skynet_ldap_backend.url = "gitlab:compsoc%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie"; - skynet_ldap_frontend.url = "gitlab:compsoc%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie"; + skynet_ldap_backend.url = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie"; + skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie"; - skynet_website.url = "gitlab:compsoc%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie"; - skynet_website_2016.url = "gitlab:compsoc%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie"; + skynet_website.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie"; + skynet_website_2016.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie"; }; outputs = { self, nixpkgs, ... } @inputs: { From 7a35c8ebe4b2d9857cbc8a625f6231e0e7e1527a Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 14:06:48 +0000 Subject: [PATCH 02/16] [skip ci] Updated flake for skynet_website --- flake.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 1a01bab..c4f09f2 100644 --- a/flake.lock +++ b/flake.lock @@ -349,14 +349,14 @@ "host": "gitlab.skynet.ie", "lastModified": 1690694163, "narHash": "sha256-XhmAKdpFR6cl1/nmnVUuwkkdbr5vU8M5wEXmlyD2aQ4=", - "owner": "compsoc%2Fskynet%2Fldap", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", "rev": "4c69738122938dfb3c7a04b3b9457a0c3d6a5309", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", - "owner": "compsoc%2Fskynet%2Fldap", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", "type": "gitlab" } @@ -370,14 +370,14 @@ "host": "gitlab.skynet.ie", "lastModified": 1690673598, "narHash": "sha256-YMez0as7D9BlIASTcac9EMWwX1m088fLonpXfTDzVgU=", - "owner": "compsoc%2Fskynet%2Fldap", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", "rev": "5fb889e17854da5afd207943d4195397013123af", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", - "owner": "compsoc%2Fskynet%2Fldap", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", "type": "gitlab" } @@ -389,16 +389,16 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690483098, - "narHash": "sha256-JSN20pCt04XRjlSF9n8uth/QcsyUWXm2UCN3an8krJ0=", - "owner": "compsoc%2Fskynet%2Fwebsite", + "lastModified": 1690725984, + "narHash": "sha256-1WNUS3f+YP9wHTxRo//a3yhOow4lzKH+hiNEAOFGtRM=", + "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2023", - "rev": "87e29275cadcd6b37ff70bfdb682f940e3425585", + "rev": "aef61e067345dd3e1512e5b9b529183c066dd077", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", - "owner": "compsoc%2Fskynet%2Fwebsite", + "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2023", "type": "gitlab" } @@ -412,14 +412,14 @@ "host": "gitlab.skynet.ie", "lastModified": 1690076049, "narHash": "sha256-Jji6B+tFtv+giy1XHb2tu8JV3EWMzyvqWgIoW8gFrxk=", - "owner": "compsoc%2Fskynet%2Fwebsite", + "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2016", "rev": "6434595ef973eb5ed7aa11f2d0513330634168e9", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", - "owner": "compsoc%2Fskynet%2Fwebsite", + "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2016", "type": "gitlab" } From b0603e18af75e282d1f35016d4731d2d8e010d71 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 14:07:59 +0000 Subject: [PATCH 03/16] [skip ci] Updated flake for skynet_website_2016 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c4f09f2..057b1a5 100644 --- a/flake.lock +++ b/flake.lock @@ -410,11 +410,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690076049, - "narHash": "sha256-Jji6B+tFtv+giy1XHb2tu8JV3EWMzyvqWgIoW8gFrxk=", + "lastModified": 1690726067, + "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=", "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2016", - "rev": "6434595ef973eb5ed7aa11f2d0513330634168e9", + "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e", "type": "gitlab" }, "original": { From 1766536e56941a8df54c3c4266c11350b4de7523 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 14:09:16 +0000 Subject: [PATCH 04/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 057b1a5..b084777 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690694163, - "narHash": "sha256-XhmAKdpFR6cl1/nmnVUuwkkdbr5vU8M5wEXmlyD2aQ4=", + "lastModified": 1690726134, + "narHash": "sha256-Eyfp19sTcgmoNMhmtnjSS0DIOOeXCq38nHPpoDZLdkE=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "4c69738122938dfb3c7a04b3b9457a0c3d6a5309", + "rev": "142dbf99141be60686927cc66d60295ee2047cde", "type": "gitlab" }, "original": { From 4458d02e60b9a025f6ee3e7bf0049bbe19cc11c0 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 14:11:05 +0000 Subject: [PATCH 05/16] [skip ci] Updated flake for skynet_ldap_frontend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b084777..a59754d 100644 --- a/flake.lock +++ b/flake.lock @@ -368,11 +368,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690673598, - "narHash": "sha256-YMez0as7D9BlIASTcac9EMWwX1m088fLonpXfTDzVgU=", + "lastModified": 1690726255, + "narHash": "sha256-u0Q8LUqKfUtdjaVGRneQ3AouMx5Kce9OwIi7NgC34WI=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", - "rev": "5fb889e17854da5afd207943d4195397013123af", + "rev": "a189b6a34499cb12ab19507c861b279d33d4113b", "type": "gitlab" }, "original": { From f0bc3eea2e6c91ab18eb4eab6276f3de82428414 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 14:26:36 +0000 Subject: [PATCH 06/16] [skip ci] Updated flake for skynet_ldap_frontend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a59754d..51518a0 100644 --- a/flake.lock +++ b/flake.lock @@ -368,11 +368,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690726255, - "narHash": "sha256-u0Q8LUqKfUtdjaVGRneQ3AouMx5Kce9OwIi7NgC34WI=", + "lastModified": 1690727183, + "narHash": "sha256-/yggQCtRP1aOAWzV2DEzDGE0Hj5zo7uRBTqPB267ZQk=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", - "rev": "a189b6a34499cb12ab19507c861b279d33d4113b", + "rev": "f586d577843740d9d1cf94ecd847aa76629c5471", "type": "gitlab" }, "original": { From 90deec3940b385277ef2cd4c11ad0fb1065ecfb4 Mon Sep 17 00:00:00 2001 From: Evan Cassidy Date: Sun, 30 Jul 2023 20:19:38 +0000 Subject: [PATCH 07/16] [ldap] Add ldap_api access to manage ldap --- applications/ldap.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/applications/ldap.nix b/applications/ldap.nix index 5671859..a5a162c 100644 --- a/applications/ldap.nix +++ b/applications/ldap.nix @@ -181,16 +181,19 @@ Gonna use a priper nixos module for this olcAccess = [ /* custom access rules for userPassword attributes */ ''{0}to attrs=userPassword + by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage by self write by anonymous auth by * none'' ''{1}to attrs=mail,sshPublicKey,cn,sn,skDiscord + by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage by self write by * read'' /* allow read on anything else */ ''{2}to * + by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage by * read'' ]; @@ -224,4 +227,4 @@ Gonna use a priper nixos module for this }; }; }; -} \ No newline at end of file +} From 71620ff8921a215ef178e729b6da1026fbe2afc7 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 20:31:15 +0000 Subject: [PATCH 08/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 51518a0..d63317a 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690726134, - "narHash": "sha256-Eyfp19sTcgmoNMhmtnjSS0DIOOeXCq38nHPpoDZLdkE=", + "lastModified": 1690748420, + "narHash": "sha256-33uca7ZcC1fzJcITObkje0OihXJbpzrxDiNrglKFxM8=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "142dbf99141be60686927cc66d60295ee2047cde", + "rev": "11b348326a053b7b8798ca8aa08cb709df534263", "type": "gitlab" }, "original": { From d282667bf32640104815336c3e855da45de90b83 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 20:40:09 +0000 Subject: [PATCH 09/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d63317a..9fd58f4 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690748420, - "narHash": "sha256-33uca7ZcC1fzJcITObkje0OihXJbpzrxDiNrglKFxM8=", + "lastModified": 1690749572, + "narHash": "sha256-aHH5YZ0s+ixLT23ZiTe8DVMwaxOPLXY8/HjAHN6s3eY=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "11b348326a053b7b8798ca8aa08cb709df534263", + "rev": "4295803f02e1938934a0bddbdd2967713a0ce330", "type": "gitlab" }, "original": { From 6e70246f9d11cfc82fe52f4a11b49c67edf9a582 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 20:42:26 +0000 Subject: [PATCH 10/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 9fd58f4..1bc4bae 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690749572, + "lastModified": 1690749660, "narHash": "sha256-aHH5YZ0s+ixLT23ZiTe8DVMwaxOPLXY8/HjAHN6s3eY=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "4295803f02e1938934a0bddbdd2967713a0ce330", + "rev": "bf1d91e110a40f854e4c51a3b560cb4d38831b8c", "type": "gitlab" }, "original": { From 20d0b1215d808991c9ebd146eef50840aa8df3ef Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 30 Jul 2023 21:20:35 +0000 Subject: [PATCH 11/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1bc4bae..be302f8 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690749660, - "narHash": "sha256-aHH5YZ0s+ixLT23ZiTe8DVMwaxOPLXY8/HjAHN6s3eY=", + "lastModified": 1690752015, + "narHash": "sha256-76CzrDUEBuN11vTuyxA5Bd8QcE7bJaiisipmJf/YhB4=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "bf1d91e110a40f854e4c51a3b560cb4d38831b8c", + "rev": "344d958aec4ba2750713f76e63d310e83e040584", "type": "gitlab" }, "original": { From 092744e47129ea99277a7bb96124acc06045f982 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 1 Aug 2023 11:53:23 +0000 Subject: [PATCH 12/16] [skip ci] Updated flake for skynet_ldap_frontend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index be302f8..99875c5 100644 --- a/flake.lock +++ b/flake.lock @@ -368,11 +368,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690727183, - "narHash": "sha256-/yggQCtRP1aOAWzV2DEzDGE0Hj5zo7uRBTqPB267ZQk=", + "lastModified": 1690890784, + "narHash": "sha256-bqjKSRk+yuZre9GThioyA1DZ7Ckbo4KT7T7P/x92Gaw=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", - "rev": "f586d577843740d9d1cf94ecd847aa76629c5471", + "rev": "e3c05368fb062c227521b63b1fc9f7c6c5670977", "type": "gitlab" }, "original": { From f23f0c2d5463526d18f4fde48f1264be2e3c7af9 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 1 Aug 2023 12:03:42 +0000 Subject: [PATCH 13/16] [skip ci] Updated flake for skynet_ldap_frontend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 99875c5..1c186d0 100644 --- a/flake.lock +++ b/flake.lock @@ -368,11 +368,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690890784, - "narHash": "sha256-bqjKSRk+yuZre9GThioyA1DZ7Ckbo4KT7T7P/x92Gaw=", + "lastModified": 1690891405, + "narHash": "sha256-XCMwd8T69ax9tEVTk60elSBbwgfmqy+YEt2UKK/Xxew=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", - "rev": "e3c05368fb062c227521b63b1fc9f7c6c5670977", + "rev": "cac80847acd5ff0970e41234bf25f8a7ee9eb1cd", "type": "gitlab" }, "original": { From 8a996c9534a49f5d3bacd1d9b8b76b4611d25c16 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 1 Aug 2023 12:54:13 +0000 Subject: [PATCH 14/16] [skip ci] Updated flake for skynet_ldap_frontend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1c186d0..105615d 100644 --- a/flake.lock +++ b/flake.lock @@ -368,11 +368,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690891405, - "narHash": "sha256-XCMwd8T69ax9tEVTk60elSBbwgfmqy+YEt2UKK/Xxew=", + "lastModified": 1690894432, + "narHash": "sha256-FH3E1+Wy04yWA6m3UBzYnDJh8/hErXBq5Ym0bHEvUQ4=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", - "rev": "cac80847acd5ff0970e41234bf25f8a7ee9eb1cd", + "rev": "f05aa8cb5e645818a80e66dc1559163c2bf7ed78", "type": "gitlab" }, "original": { From 6e55898ee34ab5730187616ef32a6c68d2e9bcd3 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Wed, 2 Aug 2023 12:59:30 +0000 Subject: [PATCH 15/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 105615d..b8efc7d 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690752015, - "narHash": "sha256-76CzrDUEBuN11vTuyxA5Bd8QcE7bJaiisipmJf/YhB4=", + "lastModified": 1690981159, + "narHash": "sha256-Up0duMgleOgVrq22n9Xhvikz2YQw8qwV+bzPndBpKKw=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "344d958aec4ba2750713f76e63d310e83e040584", + "rev": "b892326545ab768561a57c637b57607e1e112fbc", "type": "gitlab" }, "original": { From d63f630cad699e7edfb95686c177fbc702d0f2ae Mon Sep 17 00:00:00 2001 From: runner_nix Date: Wed, 2 Aug 2023 13:57:36 +0000 Subject: [PATCH 16/16] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b8efc7d..4edfbd4 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690981159, - "narHash": "sha256-Up0duMgleOgVrq22n9Xhvikz2YQw8qwV+bzPndBpKKw=", + "lastModified": 1690984643, + "narHash": "sha256-Tow5BnFDCyagZqepp00DR3vK3nyo31XNb+nsAvjhHxs=", "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "b892326545ab768561a57c637b57607e1e112fbc", + "rev": "91ee2a246eb92d140ff5611ffbc1a3bc2136002b", "type": "gitlab" }, "original": {