Compare commits

...
Sign in to create a new pull request.

28 commits

Author SHA1 Message Date
94a5fb6574
fix: had forgotten someone
Some checks failed
Build_Deploy / linter (push) Successful in 6s
Build_Deploy / build (push) Successful in 13s
Build_Deploy / deploy_dns (push) Successful in 1m0s
Build_Deploy / deploy_active (active) (push) Successful in 1m2s
Build_Deploy / deploy_active (active-core) (push) Failing after 1m31s
Build_Deploy / deploy_active (active-ext) (push) Successful in 31s
2025-09-23 15:43:48 +01:00
8f22c8d98b Merge pull request 'New committee for 2025/2026 year' (#143) from 2025_committee_agm into main
Some checks failed
Build_Deploy / linter (push) Successful in 6s
Build_Deploy / build (push) Successful in 27s
Build_Deploy / deploy_dns (push) Successful in 1m2s
Build_Deploy / deploy_active (active) (push) Successful in 1m8s
Build_Deploy / deploy_active (active-core) (push) Failing after 1m38s
Build_Deploy / deploy_active (active-ext) (push) Successful in 35s
Reviewed-on: #143
2025-09-23 14:16:50 +00:00
b5b6c67ea9 feat: final batch of new committee 2025-09-23 14:16:32 +00:00
42be2a0efc feat: third batch of new committee 2025-09-23 14:16:32 +00:00
90f8ed3af2 feat: second batch of new committee 2025-09-23 14:16:32 +00:00
e0957270ae feat: initial batch of new committee 2025-09-23 14:16:32 +00:00
5577446d6c feat: remove non committee and reorganise based on who was already on committee.
Also added labels for Core
2025-09-23 14:16:32 +00:00
sysadm
5e40212ecc Updated flake for skynet_website_wiki
Some checks failed
Build_Deploy / linter (push) Successful in 7s
Build_Deploy / build (push) Successful in 14s
Build_Deploy / deploy_dns (push) Successful in 1m8s
Build_Deploy / deploy_active (active) (push) Successful in 1m13s
Build_Deploy / deploy_active (active-ext) (push) Successful in 36s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m28s
2025-09-23 13:59:36 +00:00
sysadm
85fe376560 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 6s
Build_Deploy / build (push) Successful in 27s
Build_Deploy / deploy_dns (push) Successful in 1m3s
Build_Deploy / deploy_active (active) (push) Successful in 1m9s
Build_Deploy / deploy_active (active-core) (push) Failing after 1m44s
Build_Deploy / deploy_active (active-ext) (push) Successful in 36s
2025-09-22 23:01:41 +00:00
sysadm
8ae0d53932 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 14s
Build_Deploy / build (push) Successful in 43s
Build_Deploy / deploy_dns (push) Successful in 1m17s
Build_Deploy / deploy_active (active) (push) Successful in 1m27s
Build_Deploy / deploy_active (active-ext) (push) Successful in 38s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m57s
2025-09-22 21:44:55 +00:00
48b7cd2e54
nix: bump nixpkgs and mailserver
Some checks failed
Build_Deploy / linter (push) Successful in 15s
Build_Deploy / build (push) Successful in 32s
Build_Deploy / deploy_dns (push) Successful in 1m24s
Build_Deploy / deploy_active (active) (push) Successful in 1m23s
Build_Deploy / deploy_active (active-ext) (push) Successful in 43s
Build_Deploy / deploy_active (active-core) (push) Failing after 4m5s
2025-09-20 17:33:30 +01:00
sysadm
f33e14d8d1 Updated flake for simple-nixos-mailserver
Some checks failed
Build_Deploy / linter (push) Successful in 7s
Build_Deploy / deploy_dns (push) Has been cancelled
Build_Deploy / deploy_active (active) (push) Has been cancelled
Build_Deploy / deploy_active (active-core) (push) Has been cancelled
Build_Deploy / deploy_active (active-ext) (push) Has been cancelled
Build_Deploy / build (push) Has been cancelled
2025-09-20 11:27:40 +00:00
sysadm
cc49e0da6d Updated flake for skynet_discord_bot
Some checks failed
Build_Deploy / linter (push) Successful in 8s
Build_Deploy / build (push) Successful in 19s
Build_Deploy / deploy_dns (push) Successful in 1m22s
Build_Deploy / deploy_active (active) (push) Failing after 1m21s
Build_Deploy / deploy_active (active-ext) (push) Successful in 55s
Build_Deploy / deploy_active (active-core) (push) Failing after 5m30s
2025-09-19 15:21:10 +00:00
sysadm
f99c50a039 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 8s
Build_Deploy / build (push) Successful in 39s
Build_Deploy / deploy_dns (push) Successful in 1m16s
Build_Deploy / deploy_active (active) (push) Failing after 1m15s
Build_Deploy / deploy_active (active-ext) (push) Successful in 37s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m22s
2025-09-18 19:04:33 +00:00
sysadm
3629567abc Updated flake for skynet_website
Some checks failed
Build_Deploy / linter (push) Successful in 13s
Build_Deploy / build (push) Successful in 17s
Build_Deploy / deploy_dns (push) Successful in 1m17s
Build_Deploy / deploy_active (active) (push) Failing after 1m17s
Build_Deploy / deploy_active (active-ext) (push) Successful in 45s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m28s
2025-09-18 11:43:29 +00:00
sysadm
8f45538316 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 13s
Build_Deploy / build (push) Successful in 24s
Build_Deploy / deploy_dns (push) Successful in 1m5s
Build_Deploy / deploy_active (active) (push) Failing after 1m11s
Build_Deploy / deploy_active (active-ext) (push) Successful in 37s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m26s
2025-09-17 14:23:16 +00:00
sysadm
84cd3538fd Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 6s
Build_Deploy / build (push) Successful in 29s
Build_Deploy / deploy_dns (push) Successful in 1m2s
Build_Deploy / deploy_active (active) (push) Failing after 1m7s
Build_Deploy / deploy_active (active-ext) (push) Successful in 36s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m17s
2025-09-16 22:33:02 +00:00
sysadm
6788ca566a Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 41s
Build_Deploy / build (push) Successful in 58s
Build_Deploy / deploy_dns (push) Successful in 1m15s
Build_Deploy / deploy_active (active) (push) Successful in 1m17s
Build_Deploy / deploy_active (active-ext) (push) Successful in 40s
Build_Deploy / deploy_active (active-core) (push) Failing after 4m23s
2025-09-16 20:31:42 +00:00
sysadm
6c6068bf89 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 9s
Build_Deploy / build (push) Successful in 44s
Build_Deploy / deploy_dns (push) Successful in 1m19s
Build_Deploy / deploy_active (active) (push) Failing after 1m13s
Build_Deploy / deploy_active (active-ext) (push) Successful in 34s
Build_Deploy / deploy_active (active-core) (push) Failing after 4m35s
2025-09-14 00:00:25 +00:00
sysadm
6af7acaac3 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 6s
Build_Deploy / build (push) Successful in 22s
Build_Deploy / deploy_dns (push) Successful in 1m5s
Build_Deploy / deploy_active (active) (push) Successful in 1m3s
Build_Deploy / deploy_active (active-ext) (push) Successful in 38s
Build_Deploy / deploy_active (active-core) (push) Failing after 1m54s
2025-09-13 23:44:23 +00:00
sysadm
494d9bdf38 Updated flake for skynet_discord_bot
Some checks failed
Build_Deploy / linter (push) Successful in 8s
Build_Deploy / build (push) Successful in 15s
Build_Deploy / deploy_dns (push) Successful in 58s
Build_Deploy / deploy_active (active) (push) Successful in 1m1s
Build_Deploy / deploy_active (active-ext) (push) Successful in 32s
Build_Deploy / deploy_active (active-core) (push) Failing after 1m48s
2025-09-11 12:03:07 +00:00
sysadm
4555186ba0 Updated flake for skynet_discord_bot
Some checks failed
Build_Deploy / linter (push) Successful in 7s
Build_Deploy / build (push) Successful in 40s
Build_Deploy / deploy_dns (push) Successful in 1m0s
Build_Deploy / deploy_active (active) (push) Successful in 1m6s
Build_Deploy / deploy_active (active-ext) (push) Successful in 37s
Build_Deploy / deploy_active (active-core) (push) Failing after 1m48s
2025-09-11 11:51:17 +00:00
sysadm
d21d7b25b9 Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 11s
Build_Deploy / build (push) Successful in 16s
Build_Deploy / deploy_dns (push) Successful in 1m7s
Build_Deploy / deploy_active (active) (push) Failing after 1m9s
Build_Deploy / deploy_active (active-ext) (push) Successful in 34s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m47s
2025-09-11 11:39:34 +00:00
fb9eef1adf
fix: forgot to actually set a DNS record for wolves
Some checks failed
Build_Deploy / linter (push) Successful in 7s
Build_Deploy / build (push) Successful in 26s
Build_Deploy / deploy_dns (push) Successful in 1m2s
Build_Deploy / deploy_active (active) (push) Failing after 1m8s
Build_Deploy / deploy_active (active-ext) (push) Successful in 35s
Build_Deploy / deploy_active (active-core) (push) Failing after 2m35s
2025-09-11 12:13:27 +01:00
53afebb619
feat: add a wolves subdomain
Some checks failed
Build_Deploy / linter (push) Successful in 21s
Build_Deploy / build (push) Successful in 27s
Build_Deploy / deploy_dns (push) Successful in 1m7s
Build_Deploy / deploy_active (active) (push) Successful in 1m3s
Build_Deploy / deploy_active (active-ext) (push) Successful in 35s
Build_Deploy / deploy_active (active-core) (push) Failing after 3m10s
2025-09-11 10:39:43 +01:00
sysadm
b56bfecd4e Updated flake for compsoc_public
Some checks failed
Build_Deploy / linter (push) Successful in 7s
Build_Deploy / build (push) Successful in 35s
Build_Deploy / deploy_dns (push) Successful in 59s
Build_Deploy / deploy_active (active) (push) Successful in 1m3s
Build_Deploy / deploy_active (active-ext) (push) Successful in 33s
Build_Deploy / deploy_active (active-core) (push) Failing after 3m28s
2025-09-08 00:36:22 +00:00
sysadm
30c2ee5349 Updated flake for skynet_ldap_backend
Some checks failed
Build_Deploy / linter (push) Successful in 9s
Build_Deploy / build (push) Successful in 14s
Build_Deploy / deploy_dns (push) Successful in 1m1s
Build_Deploy / deploy_active (active) (push) Successful in 1m8s
Build_Deploy / deploy_active (active-ext) (push) Successful in 33s
Build_Deploy / deploy_active (active-core) (push) Failing after 4m9s
2025-09-07 17:59:56 +00:00
sysadm
64ece3c0fd Updated flake for skynet_ldap_backend
Some checks failed
Build_Deploy / linter (push) Successful in 23s
Build_Deploy / build (push) Successful in 1m6s
Build_Deploy / deploy_dns (push) Successful in 1m36s
Build_Deploy / deploy_active (active-ext) (push) Successful in 38s
Build_Deploy / deploy_active (active-core) (push) Failing after 3m11s
Build_Deploy / deploy_active (active) (push) Failing after 1m4s
2025-09-07 17:29:47 +00:00
5 changed files with 71 additions and 50 deletions

View file

@ -27,7 +27,6 @@ in {
age.secrets.acme.file = ../secrets/dns_certs.secret.age;
security.acme = {
preliminarySelfsigned = false;
acceptTerms = true;
defaults = {

View file

@ -470,7 +470,7 @@ in {
mailserver = {
enable = true;
stateVersion = 1;
stateVersion = 3;
fqdn = "${cfg.sub}.${cfg.domain}";
domains = [

View file

@ -48,6 +48,11 @@ in {
r_type = "CNAME";
value = config.services.skynet.host.name;
}
{
record = "wolves";
r_type = "CNAME";
value = config.services.skynet.host.name;
}
{
record = "public";
r_type = "CNAME";
@ -80,6 +85,12 @@ in {
"www.skynet.ie" = main_site;
"skynet.ie" = main_site;
"wolves.skynet.ie" = {
forceSSL = true;
useACMEHost = "skynet";
locations."/".return = "307 https://ulwolves.ie/society/computer";
};
# a custom discord url, because we are too cheap otehrwise
"discord.skynet.ie" = {
forceSSL = true;

View file

@ -52,24 +52,36 @@ in {
committee = lib.lists.unique (
# Committee - Core
[
# President
"silver"
"eoghanconlon73"
"nanda"
# Secretary
"kaiden"
# Treasurer
"peace"
# PRO
"amymucko"
# HSO
"skyapples"
"generically"
]
# Committee - OCM
++ [
"connormc"
"cordlesscoder"
"dca_"
"eliza"
"amymucko"
"archiedms"
"kaiden"
"emilyrutai"
"generically"
"mysticwolf"
"nanda"
"rituk_0817"
"sania_m"
"shourjyo24_"
"sunny"
"tatabbyi"
"wormyworm5"
]
# Committee - SISTEM
++ [
"peace"
"milan"
]
++ []
# Admins are part of Committee as well
++ cfg.admin
);
@ -78,8 +90,6 @@ in {
"evanc"
"eliza"
"esy"
# for temp reasons
"peace"
];
trainee = [];
lifetime = [];

73
flake.lock generated
View file

@ -90,11 +90,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1723391194,
"narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=",
"lastModified": 1723500950,
"narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=",
"owner": "silver_rust",
"repo": "bfom",
"rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c",
"rev": "7f339f28442758ecc3f1697e3f70d441973664b9",
"type": "gitlab"
},
"original": {
@ -148,11 +148,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1741131635,
"narHash": "sha256-W65UdgryecEzfS6myQ+1Sj5P3yBCJRlGRf+fU78Ei2g=",
"lastModified": 1758582048,
"narHash": "sha256-SIt6rPXx7O3YMrEw8YrwHNMjOrrJLu/Tf1sMll1Qp9A=",
"ref": "refs/heads/main",
"rev": "b5089910d0d0b303b634c7e125ac0b9ba8728bd9",
"revCount": 111,
"rev": "4d825caf25cb966ddb5ce33a0e9b2aa73b0262c6",
"revCount": 130,
"type": "git",
"url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
},
@ -359,11 +359,11 @@
]
},
"locked": {
"lastModified": 1749636823,
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
"lastModified": 1750779888,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "623c56286de5a3193aa38891a6991b28f9bab056",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github"
},
"original": {
@ -542,11 +542,11 @@
},
"nixpkgs-25_05": {
"locked": {
"lastModified": 1749727998,
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
"lastModified": 1753749649,
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
"type": "github"
},
"original": {
@ -896,15 +896,16 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1715413075,
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
"lastModified": 1756787288,
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-unstable",
"type": "indirect"
}
},
@ -1023,11 +1024,11 @@
"nixpkgs-25_05": "nixpkgs-25_05"
},
"locked": {
"lastModified": 1750183846,
"narHash": "sha256-owKJ2rsa/0WVZQAprlbqgVAAGlz3MFuvgNea3+ic4fs=",
"lastModified": 1758367587,
"narHash": "sha256-crj6Ps1BwNbmsk7I7v6K2Dw55vczuQRtTklYiFiQ0Jw=",
"ref": "refs/heads/master",
"rev": "c097bd662c9e1aea8c1fca10d57188e81c5574a0",
"revCount": 743,
"rev": "8bca7ebf09d3eb2bfcafe41b9133ee262f09558d",
"revCount": 794,
"type": "git",
"url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"
},
@ -1044,11 +1045,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1757023884,
"narHash": "sha256-E+lp2PyQo9vakrwAjcB+krIGPi095CaAbZ/49tWvCtw=",
"lastModified": 1758295049,
"narHash": "sha256-h14Vl/OVguj5jD54xf+3w3DBIloQkoFBH86/xJ35jV8=",
"ref": "refs/heads/main",
"rev": "7526a82bb7c384c16a09992458868b2f669ed279",
"revCount": 320,
"rev": "313be247d96131fbea418b826d7b68521c48bd8a",
"revCount": 326,
"type": "git",
"url": "https://forgejo.skynet.ie/Skynet/discord-bot"
},
@ -1086,11 +1087,11 @@
"utils": "utils_5"
},
"locked": {
"lastModified": 1751234352,
"narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=",
"lastModified": 1757267915,
"narHash": "sha256-cJA/dTc+VCjODKu5WEycBrEZRxd4STzxhpfUK2kIS4g=",
"ref": "refs/heads/main",
"rev": "1dae2ecb2623d55c88a237d55198efd51e0fd8fe",
"revCount": 249,
"rev": "3d882056bc78707ff57321862522ca8d1fc2a3c1",
"revCount": 252,
"type": "git",
"url": "https://forgejo.skynet.ie/Skynet/ldap_backend"
},
@ -1124,11 +1125,11 @@
"utils": "utils_7"
},
"locked": {
"lastModified": 1732375016,
"narHash": "sha256-Y+bJw85TNOp8N369OV0VrDdm3oDy8CXG+GUuG6pZjbo=",
"lastModified": 1758195787,
"narHash": "sha256-YK5rEiaPqH19PPwMO/smF3SJDdEosGyqUQ8pDEmnfK8=",
"ref": "refs/heads/main",
"rev": "8987e33cb709e7f2c30017e77edf9161b87d9885",
"revCount": 29,
"rev": "afd55717913278d4541ae0d21ca915a045423574",
"revCount": 31,
"type": "git",
"url": "https://forgejo.skynet.ie/Skynet/website_2023"
},
@ -1302,11 +1303,11 @@
"utils": "utils_16"
},
"locked": {
"lastModified": 1752925027,
"narHash": "sha256-APuWWdod4L3mgSBXJTukfbB8s37NvzUkju+lELUD7PI=",
"lastModified": 1758635905,
"narHash": "sha256-PPqhD2RHUOwJrbey72H1wnmdpeELilwKlND4TR5qo2k=",
"ref": "refs/heads/main",
"rev": "917c316e7606995362b436f5c6248f058c762176",
"revCount": 166,
"rev": "eb1fc042b5d410b17dd63c492c03be78443ed07f",
"revCount": 167,
"type": "git",
"url": "https://forgejo.skynet.ie/Skynet/wiki"
},