Compare commits
28 commits
#142_insta
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
94a5fb6574
|
|||
| 8f22c8d98b | |||
| b5b6c67ea9 | |||
| 42be2a0efc | |||
| 90f8ed3af2 | |||
| e0957270ae | |||
| 5577446d6c | |||
|
5e40212ecc | ||
|
|
85fe376560 | ||
|
|
8ae0d53932 | ||
|
48b7cd2e54
|
|||
|
|
f33e14d8d1 | ||
|
|
cc49e0da6d | ||
|
|
f99c50a039 | ||
|
|
3629567abc | ||
|
|
8f45538316 | ||
|
|
84cd3538fd | ||
|
|
6788ca566a | ||
|
|
6c6068bf89 | ||
|
|
6af7acaac3 | ||
|
|
494d9bdf38 | ||
|
|
4555186ba0 | ||
|
|
d21d7b25b9 | ||
|
fb9eef1adf
|
|||
|
53afebb619
|
|||
|
|
b56bfecd4e | ||
|
|
30c2ee5349 | ||
|
|
64ece3c0fd |
5 changed files with 71 additions and 50 deletions
|
|
@ -27,7 +27,6 @@ in {
|
||||||
age.secrets.acme.file = ../secrets/dns_certs.secret.age;
|
age.secrets.acme.file = ../secrets/dns_certs.secret.age;
|
||||||
|
|
||||||
security.acme = {
|
security.acme = {
|
||||||
preliminarySelfsigned = false;
|
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
|
|
||||||
defaults = {
|
defaults = {
|
||||||
|
|
|
||||||
|
|
@ -470,7 +470,7 @@ in {
|
||||||
|
|
||||||
mailserver = {
|
mailserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
stateVersion = 1;
|
stateVersion = 3;
|
||||||
|
|
||||||
fqdn = "${cfg.sub}.${cfg.domain}";
|
fqdn = "${cfg.sub}.${cfg.domain}";
|
||||||
domains = [
|
domains = [
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,11 @@ in {
|
||||||
r_type = "CNAME";
|
r_type = "CNAME";
|
||||||
value = config.services.skynet.host.name;
|
value = config.services.skynet.host.name;
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
record = "wolves";
|
||||||
|
r_type = "CNAME";
|
||||||
|
value = config.services.skynet.host.name;
|
||||||
|
}
|
||||||
{
|
{
|
||||||
record = "public";
|
record = "public";
|
||||||
r_type = "CNAME";
|
r_type = "CNAME";
|
||||||
|
|
@ -80,6 +85,12 @@ in {
|
||||||
"www.skynet.ie" = main_site;
|
"www.skynet.ie" = main_site;
|
||||||
"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
|
# a custom discord url, because we are too cheap otehrwise
|
||||||
"discord.skynet.ie" = {
|
"discord.skynet.ie" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
|
|
||||||
|
|
@ -52,24 +52,36 @@ in {
|
||||||
committee = lib.lists.unique (
|
committee = lib.lists.unique (
|
||||||
# Committee - Core
|
# Committee - Core
|
||||||
[
|
[
|
||||||
|
# President
|
||||||
"silver"
|
"silver"
|
||||||
"eoghanconlon73"
|
# Secretary
|
||||||
"nanda"
|
"kaiden"
|
||||||
|
# Treasurer
|
||||||
|
"peace"
|
||||||
|
# PRO
|
||||||
|
"amymucko"
|
||||||
|
# HSO
|
||||||
"skyapples"
|
"skyapples"
|
||||||
"generically"
|
|
||||||
]
|
]
|
||||||
# Committee - OCM
|
# Committee - OCM
|
||||||
++ [
|
++ [
|
||||||
|
"connormc"
|
||||||
|
"cordlesscoder"
|
||||||
|
"dca_"
|
||||||
"eliza"
|
"eliza"
|
||||||
"amymucko"
|
"emilyrutai"
|
||||||
"archiedms"
|
"generically"
|
||||||
"kaiden"
|
"mysticwolf"
|
||||||
|
"nanda"
|
||||||
|
"rituk_0817"
|
||||||
|
"sania_m"
|
||||||
|
"shourjyo24_"
|
||||||
|
"sunny"
|
||||||
|
"tatabbyi"
|
||||||
|
"wormyworm5"
|
||||||
]
|
]
|
||||||
# Committee - SISTEM
|
# Committee - SISTEM
|
||||||
++ [
|
++ []
|
||||||
"peace"
|
|
||||||
"milan"
|
|
||||||
]
|
|
||||||
# Admins are part of Committee as well
|
# Admins are part of Committee as well
|
||||||
++ cfg.admin
|
++ cfg.admin
|
||||||
);
|
);
|
||||||
|
|
@ -78,8 +90,6 @@ in {
|
||||||
"evanc"
|
"evanc"
|
||||||
"eliza"
|
"eliza"
|
||||||
"esy"
|
"esy"
|
||||||
# for temp reasons
|
|
||||||
"peace"
|
|
||||||
];
|
];
|
||||||
trainee = [];
|
trainee = [];
|
||||||
lifetime = [];
|
lifetime = [];
|
||||||
|
|
|
||||||
73
flake.lock
generated
73
flake.lock
generated
|
|
@ -90,11 +90,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723391194,
|
"lastModified": 1723500950,
|
||||||
"narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=",
|
"narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=",
|
||||||
"owner": "silver_rust",
|
"owner": "silver_rust",
|
||||||
"repo": "bfom",
|
"repo": "bfom",
|
||||||
"rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c",
|
"rev": "7f339f28442758ecc3f1697e3f70d441973664b9",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -148,11 +148,11 @@
|
||||||
"utils": "utils_2"
|
"utils": "utils_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741131635,
|
"lastModified": 1758582048,
|
||||||
"narHash": "sha256-W65UdgryecEzfS6myQ+1Sj5P3yBCJRlGRf+fU78Ei2g=",
|
"narHash": "sha256-SIt6rPXx7O3YMrEw8YrwHNMjOrrJLu/Tf1sMll1Qp9A=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "b5089910d0d0b303b634c7e125ac0b9ba8728bd9",
|
"rev": "4d825caf25cb966ddb5ce33a0e9b2aa73b0262c6",
|
||||||
"revCount": 111,
|
"revCount": 130,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
|
"url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
|
||||||
},
|
},
|
||||||
|
|
@ -359,11 +359,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749636823,
|
"lastModified": 1750779888,
|
||||||
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=",
|
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "623c56286de5a3193aa38891a6991b28f9bab056",
|
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -542,11 +542,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-25_05": {
|
"nixpkgs-25_05": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749727998,
|
"lastModified": 1753749649,
|
||||||
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
|
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
|
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -896,15 +896,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1715413075,
|
"lastModified": 1756787288,
|
||||||
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
|
"narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
|
"rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -1023,11 +1024,11 @@
|
||||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
"nixpkgs-25_05": "nixpkgs-25_05"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750183846,
|
"lastModified": 1758367587,
|
||||||
"narHash": "sha256-owKJ2rsa/0WVZQAprlbqgVAAGlz3MFuvgNea3+ic4fs=",
|
"narHash": "sha256-crj6Ps1BwNbmsk7I7v6K2Dw55vczuQRtTklYiFiQ0Jw=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "c097bd662c9e1aea8c1fca10d57188e81c5574a0",
|
"rev": "8bca7ebf09d3eb2bfcafe41b9133ee262f09558d",
|
||||||
"revCount": 743,
|
"revCount": 794,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"
|
"url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"
|
||||||
},
|
},
|
||||||
|
|
@ -1044,11 +1045,11 @@
|
||||||
"utils": "utils_3"
|
"utils": "utils_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1757023884,
|
"lastModified": 1758295049,
|
||||||
"narHash": "sha256-E+lp2PyQo9vakrwAjcB+krIGPi095CaAbZ/49tWvCtw=",
|
"narHash": "sha256-h14Vl/OVguj5jD54xf+3w3DBIloQkoFBH86/xJ35jV8=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "7526a82bb7c384c16a09992458868b2f669ed279",
|
"rev": "313be247d96131fbea418b826d7b68521c48bd8a",
|
||||||
"revCount": 320,
|
"revCount": 326,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Skynet/discord-bot"
|
"url": "https://forgejo.skynet.ie/Skynet/discord-bot"
|
||||||
},
|
},
|
||||||
|
|
@ -1086,11 +1087,11 @@
|
||||||
"utils": "utils_5"
|
"utils": "utils_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751234352,
|
"lastModified": 1757267915,
|
||||||
"narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=",
|
"narHash": "sha256-cJA/dTc+VCjODKu5WEycBrEZRxd4STzxhpfUK2kIS4g=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "1dae2ecb2623d55c88a237d55198efd51e0fd8fe",
|
"rev": "3d882056bc78707ff57321862522ca8d1fc2a3c1",
|
||||||
"revCount": 249,
|
"revCount": 252,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Skynet/ldap_backend"
|
"url": "https://forgejo.skynet.ie/Skynet/ldap_backend"
|
||||||
},
|
},
|
||||||
|
|
@ -1124,11 +1125,11 @@
|
||||||
"utils": "utils_7"
|
"utils": "utils_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1732375016,
|
"lastModified": 1758195787,
|
||||||
"narHash": "sha256-Y+bJw85TNOp8N369OV0VrDdm3oDy8CXG+GUuG6pZjbo=",
|
"narHash": "sha256-YK5rEiaPqH19PPwMO/smF3SJDdEosGyqUQ8pDEmnfK8=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "8987e33cb709e7f2c30017e77edf9161b87d9885",
|
"rev": "afd55717913278d4541ae0d21ca915a045423574",
|
||||||
"revCount": 29,
|
"revCount": 31,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Skynet/website_2023"
|
"url": "https://forgejo.skynet.ie/Skynet/website_2023"
|
||||||
},
|
},
|
||||||
|
|
@ -1302,11 +1303,11 @@
|
||||||
"utils": "utils_16"
|
"utils": "utils_16"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1752925027,
|
"lastModified": 1758635905,
|
||||||
"narHash": "sha256-APuWWdod4L3mgSBXJTukfbB8s37NvzUkju+lELUD7PI=",
|
"narHash": "sha256-PPqhD2RHUOwJrbey72H1wnmdpeELilwKlND4TR5qo2k=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "917c316e7606995362b436f5c6248f058c762176",
|
"rev": "eb1fc042b5d410b17dd63c492c03be78443ed07f",
|
||||||
"revCount": 166,
|
"revCount": 167,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forgejo.skynet.ie/Skynet/wiki"
|
"url": "https://forgejo.skynet.ie/Skynet/wiki"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue