Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://gitlab.skynet.ie/compsoc1/skynet/nixos

Browse source
This commit is contained in:
silver 2023-08-02 16:44:15 +01:00
commit 599f403149
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -31,7 +31,7 @@ update:
- git add flake.lock - git add flake.lock
- git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit" - git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit"
# we have a custom domain # 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 - git push origin HEAD:$CI_COMMIT_REF_NAME
only: only:
refs: refs:

5
applications/ldap.nix
View file

@ -181,16 +181,19 @@ Gonna use a priper nixos module for this
olcAccess = [ olcAccess = [
/* custom access rules for userPassword attributes */ /* custom access rules for userPassword attributes */
''{0}to attrs=userPassword ''{0}to attrs=userPassword
by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage
by self write by self write
by anonymous auth by anonymous auth
by * none'' by * none''
''{1}to attrs=mail,sshPublicKey,cn,sn,skDiscord ''{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 self write
by * read'' by * read''
/* allow read on anything else */ /* allow read on anything else */
''{2}to * ''{2}to *
by dn.exact="uid=ldap_api,ou=users,dc=skynet,dc=ie" manage
by * read'' by * read''
]; ];
@ -224,4 +227,4 @@ Gonna use a priper nixos module for this
}; };
}; };
}; };
} }

40
flake.lock
View file

@ -347,16 +347,16 @@
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"lastModified": 1690694163, "lastModified": 1690984643,
"narHash": "sha256-XhmAKdpFR6cl1/nmnVUuwkkdbr5vU8M5wEXmlyD2aQ4=", "narHash": "sha256-Tow5BnFDCyagZqepp00DR3vK3nyo31XNb+nsAvjhHxs=",
"owner": "compsoc%2Fskynet%2Fldap", "owner": "compsoc1%2Fskynet%2Fldap",
"repo": "backend", "repo": "backend",
"rev": "4c69738122938dfb3c7a04b3b9457a0c3d6a5309", "rev": "91ee2a246eb92d140ff5611ffbc1a3bc2136002b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"owner": "compsoc%2Fskynet%2Fldap", "owner": "compsoc1%2Fskynet%2Fldap",
"repo": "backend", "repo": "backend",
"type": "gitlab" "type": "gitlab"
} }
@ -368,16 +368,16 @@
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"lastModified": 1690673598, "lastModified": 1690894432,
"narHash": "sha256-YMez0as7D9BlIASTcac9EMWwX1m088fLonpXfTDzVgU=", "narHash": "sha256-FH3E1+Wy04yWA6m3UBzYnDJh8/hErXBq5Ym0bHEvUQ4=",
"owner": "compsoc%2Fskynet%2Fldap", "owner": "compsoc1%2Fskynet%2Fldap",
"repo": "frontend", "repo": "frontend",
"rev": "5fb889e17854da5afd207943d4195397013123af", "rev": "f05aa8cb5e645818a80e66dc1559163c2bf7ed78",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"owner": "compsoc%2Fskynet%2Fldap", "owner": "compsoc1%2Fskynet%2Fldap",
"repo": "frontend", "repo": "frontend",
"type": "gitlab" "type": "gitlab"
} }
@ -389,16 +389,16 @@
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"lastModified": 1690483098, "lastModified": 1690725984,
"narHash": "sha256-JSN20pCt04XRjlSF9n8uth/QcsyUWXm2UCN3an8krJ0=", "narHash": "sha256-1WNUS3f+YP9wHTxRo//a3yhOow4lzKH+hiNEAOFGtRM=",
"owner": "compsoc%2Fskynet%2Fwebsite", "owner": "compsoc1%2Fskynet%2Fwebsite",
"repo": "2023", "repo": "2023",
"rev": "87e29275cadcd6b37ff70bfdb682f940e3425585", "rev": "aef61e067345dd3e1512e5b9b529183c066dd077",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"owner": "compsoc%2Fskynet%2Fwebsite", "owner": "compsoc1%2Fskynet%2Fwebsite",
"repo": "2023", "repo": "2023",
"type": "gitlab" "type": "gitlab"
} }
@ -410,16 +410,16 @@
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"lastModified": 1690076049, "lastModified": 1690726067,
"narHash": "sha256-Jji6B+tFtv+giy1XHb2tu8JV3EWMzyvqWgIoW8gFrxk=", "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=",
"owner": "compsoc%2Fskynet%2Fwebsite", "owner": "compsoc1%2Fskynet%2Fwebsite",
"repo": "2016", "repo": "2016",
"rev": "6434595ef973eb5ed7aa11f2d0513330634168e9", "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"owner": "compsoc%2Fskynet%2Fwebsite", "owner": "compsoc1%2Fskynet%2Fwebsite",
"repo": "2016", "repo": "2016",
"type": "gitlab" "type": "gitlab"
} }

8
flake.nix
View file

@ -16,11 +16,11 @@
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
# sso.skynet.ie # sso.skynet.ie
skynet_ldap_backend.url = "gitlab:compsoc%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie"; skynet_ldap_backend.url = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie";
skynet_ldap_frontend.url = "gitlab:compsoc%2Fskynet%2Fldap/frontend?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.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie";
skynet_website_2016.url = "gitlab:compsoc%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie"; skynet_website_2016.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie";
}; };
outputs = { self, nixpkgs, ... } @inputs: { outputs = { self, nixpkgs, ... } @inputs: {