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/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 +} diff --git a/flake.lock b/flake.lock index 1a01bab..4edfbd4 100644 --- a/flake.lock +++ b/flake.lock @@ -347,16 +347,16 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690694163, - "narHash": "sha256-XhmAKdpFR6cl1/nmnVUuwkkdbr5vU8M5wEXmlyD2aQ4=", - "owner": "compsoc%2Fskynet%2Fldap", + "lastModified": 1690984643, + "narHash": "sha256-Tow5BnFDCyagZqepp00DR3vK3nyo31XNb+nsAvjhHxs=", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", - "rev": "4c69738122938dfb3c7a04b3b9457a0c3d6a5309", + "rev": "91ee2a246eb92d140ff5611ffbc1a3bc2136002b", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", - "owner": "compsoc%2Fskynet%2Fldap", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "backend", "type": "gitlab" } @@ -368,16 +368,16 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690673598, - "narHash": "sha256-YMez0as7D9BlIASTcac9EMWwX1m088fLonpXfTDzVgU=", - "owner": "compsoc%2Fskynet%2Fldap", + "lastModified": 1690894432, + "narHash": "sha256-FH3E1+Wy04yWA6m3UBzYnDJh8/hErXBq5Ym0bHEvUQ4=", + "owner": "compsoc1%2Fskynet%2Fldap", "repo": "frontend", - "rev": "5fb889e17854da5afd207943d4195397013123af", + "rev": "f05aa8cb5e645818a80e66dc1559163c2bf7ed78", "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" } @@ -410,16 +410,16 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690076049, - "narHash": "sha256-Jji6B+tFtv+giy1XHb2tu8JV3EWMzyvqWgIoW8gFrxk=", - "owner": "compsoc%2Fskynet%2Fwebsite", + "lastModified": 1690726067, + "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=", + "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2016", - "rev": "6434595ef973eb5ed7aa11f2d0513330634168e9", + "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", - "owner": "compsoc%2Fskynet%2Fwebsite", + "owner": "compsoc1%2Fskynet%2Fwebsite", "repo": "2016", "type": "gitlab" } 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: {