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

Compare commits

base: Skynet:9120a81d6b7ec7307ad1b051858a91abedf62364
Branches Tags
Skynet:main
Skynet:test-nixos-pelican
Skynet:#76-Nuked-Backup
Skynet:#70-logging-dns
Skynet:#56-external-dns
Skynet:#52-dns-for-non-nixos
Skynet:second-interface-routing
Skynet:add_automx2
..
compare: Skynet:31f54b1e921a39d54dd5734ea2b9af4ab374a636
Branches Tags
Skynet:test-nixos-pelican
Skynet:main
Skynet:#76-Nuked-Backup
Skynet:#70-logging-dns
Skynet:#56-external-dns
Skynet:#52-dns-for-non-nixos
Skynet:second-interface-routing
Skynet:add_automx2

No commits in common. "9120a81d6b7ec7307ad1b051858a91abedf62364" and "31f54b1e921a39d54dd5734ea2b9af4ab374a636" have entirely different histories.
9120a81d6b ... 31f54b1e92

3 changed files with 205 additions and 142 deletions
Show stats Expand all files Collapse all files

8
applications/git/forgejo.nix
View file

@ -93,10 +93,10 @@ in {
# You can temporarily allow registration to create an admin user. # You can temporarily allow registration to create an admin user.
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
# Add support for actions, based on act: https://github.com/nektos/act # Add support for actions, based on act: https://github.com/nektos/act
actions = { # actions = {
ENABLED = true; # ENABLED = true;
DEFAULT_ACTIONS_URL = "github"; # DEFAULT_ACTIONS_URL = "github";
}; # };
# Sending emails is completely optional # Sending emails is completely optional
# You can send a test email from the web UI at: # You can send a test email from the web UI at:
# Profile Picture > Site Administration > Configuration > Mailer Configuration # Profile Picture > Site Administration > Configuration > Mailer Configuration

241
flake.lock
View file

@ -151,17 +151,19 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1723315618, "host": "gitlab.skynet.ie",
"narHash": "sha256-03V1tJGmg+T5fvfAAwoHaDxDbrNwJHe7Y/AwNLDfqbw=", "lastModified": 1715528953,
"ref": "refs/heads/main", "narHash": "sha256-NWoCV1SauW8H/MibwAC+JWoomjpkIruGqfV/JTM1D4Q=",
"rev": "f62ddd8f0a3c59c85e62ee6e9c80e3d9e058e484", "owner": "compsoc1%2Fcompsoc",
"revCount": 70, "repo": "presentations%2Fpresentations",
"type": "git", "rev": "4855b0468e1e5118d11130b164b1d57a42251add",
"url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" "owner": "compsoc1%2Fcompsoc",
"repo": "presentations%2Fpresentations",
"type": "gitlab"
} }
}, },
"crane": { "crane": {
@ -465,11 +467,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1721727458, "lastModified": 1692351612,
"narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", "rev": "78789c30d64dea2396c9da516bbcc8db3a475207",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,16 +547,16 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1722995383, "lastModified": 1693087214,
"narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-unstable", "ref": "nixos-23.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -792,11 +794,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1723151389, "lastModified": 1693060755,
"narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2", "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -853,17 +855,19 @@
"nixpkgs-24_05": "nixpkgs-24_05" "nixpkgs-24_05": "nixpkgs-24_05"
}, },
"locked": { "locked": {
"lastModified": 1723233349, "host": "gitlab.skynet.ie",
"narHash": "sha256-0NqGJ+wFxmK6DEEvlZ+jGMdDkIaQ+S54kBStwkGUaO8=", "lastModified": 1721563973,
"ref": "refs/heads/master", "narHash": "sha256-y+Rag94tKu8Z6ouJlfxFb8EK9fKs1TNZa4nX7MT2kZg=",
"rev": "a98a93cf22cd53a92143703a0a5b6f76438a15ba", "owner": "compsoc1%2Fskynet",
"revCount": 594, "repo": "misc%2Fnixos-mailserver",
"type": "git", "rev": "806a4cfd2174b3941e9426d75ed09561c547e6fd",
"url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" "owner": "compsoc1%2Fskynet",
"repo": "misc%2Fnixos-mailserver",
"type": "gitlab"
} }
}, },
"skynet_discord_bot": { "skynet_discord_bot": {
@ -873,17 +877,19 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1723319789, "host": "gitlab.skynet.ie",
"narHash": "sha256-hrWDD9U0YSdvYayyDk1R6ZT7rmJp2jBx1/si3p/DuDY=", "lastModified": 1717453955,
"ref": "refs/heads/main", "narHash": "sha256-axbeauP+9PP4qiwCiMvvGd6XTnjv12+QkZP3K2yFCeU=",
"rev": "905aaa96206310a638498d91d04e16641b33d842", "owner": "compsoc1%2Fskynet",
"revCount": 105, "repo": "discord-bot",
"type": "git", "rev": "48b52f3c0905af7341e45e2b950aba43af68c80e",
"url": "https://forgejo.skynet.ie/Skynet/discord-bot" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/discord-bot" "owner": "compsoc1%2Fskynet",
"repo": "discord-bot",
"type": "gitlab"
} }
}, },
"skynet_ldap_backend": { "skynet_ldap_backend": {
@ -893,17 +899,19 @@
"utils": "utils_4" "utils": "utils_4"
}, },
"locked": { "locked": {
"lastModified": 1723234129, "host": "gitlab.skynet.ie",
"narHash": "sha256-tfsT9VYV3YgFRUKbjFyV4o1kVJHcUY87kh2vcu6jAkU=", "lastModified": 1717782746,
"ref": "refs/heads/main", "narHash": "sha256-LZovqXjhDIUe/T+bU5wtwN1RbcPjkZK6yQNhPa9Nrwc=",
"rev": "5f6a086e808b811095e36875fb656864cf11c5f5", "owner": "compsoc1%2Fskynet",
"revCount": 232, "repo": "ldap%2Fbackend",
"type": "git", "rev": "5b94811276d70b00cc292081f623b6f52a710b84",
"url": "https://forgejo.skynet.ie/Skynet/ldap_backend" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/ldap_backend" "owner": "compsoc1%2Fskynet",
"repo": "ldap%2Fbackend",
"type": "gitlab"
} }
}, },
"skynet_ldap_frontend": { "skynet_ldap_frontend": {
@ -912,17 +920,19 @@
"utils": "utils_5" "utils": "utils_5"
}, },
"locked": { "locked": {
"lastModified": 1723234619, "host": "gitlab.skynet.ie",
"narHash": "sha256-jHqIg3ltestGKaR4vHr44nnq3Pv7yr9gGwkvONEJxoA=", "lastModified": 1708277300,
"ref": "refs/heads/main", "narHash": "sha256-Y8wKzGJQ69w375faAYGukvuTFez6YGeV+w4TOD4XosA=",
"rev": "71f5928c66a43e788a9a00b90a1326c1bb82ffd2", "owner": "compsoc1%2Fskynet",
"revCount": 228, "repo": "ldap%2Ffrontend",
"type": "git", "rev": "36c5e5bbae7adcc404bec6d643cae5fd8a6c87bb",
"url": "https://forgejo.skynet.ie/Skynet/ldap_frontend" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/ldap_frontend" "owner": "compsoc1%2Fskynet",
"repo": "ldap%2Ffrontend",
"type": "gitlab"
} }
}, },
"skynet_website": { "skynet_website": {
@ -931,17 +941,19 @@
"utils": "utils_6" "utils": "utils_6"
}, },
"locked": { "locked": {
"lastModified": 1723316173, "host": "gitlab.skynet.ie",
"narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=", "lastModified": 1707154174,
"ref": "refs/heads/main", "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=",
"rev": "871ecc6c232b82f0e67e30cf1485250ec603108e", "owner": "compsoc1%2Fskynet",
"revCount": 14, "repo": "website%2F2017",
"type": "git", "rev": "c81db388fac570a8cb646391ea461b9e60282043",
"url": "https://forgejo.skynet.ie/Skynet/website_2017" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/website_2017" "owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"type": "gitlab"
} }
}, },
"skynet_website_2009": { "skynet_website_2009": {
@ -950,17 +962,19 @@
"utils": "utils_7" "utils": "utils_7"
}, },
"locked": { "locked": {
"lastModified": 1723317982, "host": "gitlab.skynet.ie",
"narHash": "sha256-qkTYtwcPAKmdN2cJidhBbGcm6yY1M76zw9NFyqjJnn4=", "lastModified": 1718585207,
"ref": "refs/heads/main", "narHash": "sha256-jlCZv+KCCiI0Cx0nnMFPalBdx/fN2JgLNXvc4OAwNvE=",
"rev": "2d0e20c683068b692bf8765273b3531d77005d09", "owner": "compsoc1%2Fskynet",
"revCount": 12, "repo": "website%2F2009",
"type": "git", "rev": "12712f3b3ffc80782cc520d46f91b9f5df1fab69",
"url": "https://forgejo.skynet.ie/Skynet/website_2009" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/website_2009" "owner": "compsoc1%2Fskynet",
"repo": "website%2F2009",
"type": "gitlab"
} }
}, },
"skynet_website_2017": { "skynet_website_2017": {
@ -969,17 +983,19 @@
"utils": "utils_8" "utils": "utils_8"
}, },
"locked": { "locked": {
"lastModified": 1723316173, "host": "gitlab.skynet.ie",
"narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=", "lastModified": 1707154174,
"ref": "refs/heads/main", "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=",
"rev": "871ecc6c232b82f0e67e30cf1485250ec603108e", "owner": "compsoc1%2Fskynet",
"revCount": 14, "repo": "website%2F2017",
"type": "git", "rev": "c81db388fac570a8cb646391ea461b9e60282043",
"url": "https://forgejo.skynet.ie/Skynet/website_2017" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/website_2017" "owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"type": "gitlab"
} }
}, },
"skynet_website_2023": { "skynet_website_2023": {
@ -988,17 +1004,20 @@
"utils": "utils_9" "utils": "utils_9"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie",
"lastModified": 1696876711, "lastModified": 1696876711,
"narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
"revCount": 12, "type": "gitlab"
"type": "git",
"url": "https://forgejo.skynet.ie/Skynet/website_2017"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
"type": "git", "type": "gitlab"
"url": "https://forgejo.skynet.ie/Skynet/website_2017"
} }
}, },
"skynet_website_games": { "skynet_website_games": {
@ -1007,17 +1026,19 @@
"utils": "utils_10" "utils": "utils_10"
}, },
"locked": { "locked": {
"lastModified": 1723240375, "host": "gitlab.skynet.ie",
"narHash": "sha256-kFQ3Eu2A3M8L5nyEnUj0cRjvliIYElLXVsHjQygLRaQ=", "lastModified": 1708103254,
"ref": "refs/heads/main", "narHash": "sha256-/1ElBw+oc1dzwgr7VVLkQFRITteckH1IwbZpgpz8Qvg=",
"rev": "cf37628959054ad24dbc988d28ea1183aa94a14e", "owner": "compsoc1%2Fskynet",
"revCount": 10, "repo": "website%2Fgames.skynet.ie",
"type": "git", "rev": "f43a01ef62494cef3e7f1e86d8169867e2df136b",
"url": "https://forgejo.skynet.ie/Skynet/website_games" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/website_games" "owner": "compsoc1%2Fskynet",
"repo": "website%2Fgames.skynet.ie",
"type": "gitlab"
} }
}, },
"skynet_website_renew": { "skynet_website_renew": {
@ -1026,17 +1047,19 @@
"utils": "utils_11" "utils": "utils_11"
}, },
"locked": { "locked": {
"lastModified": 1723232841, "host": "gitlab.skynet.ie",
"narHash": "sha256-uWMUKTp7rIrwYr4CWRmlPmFJo97ezBUQL7VLnAJBXac=", "lastModified": 1720558362,
"ref": "refs/heads/main", "narHash": "sha256-fNKFqkP35tzBhBy0L8xGOJ7B3EXh+khu3bOBlGqlPks=",
"rev": "baa8b6d8a59fc4fd7c6abcbb7b0dda4b8482df49", "owner": "compsoc1%2Fskynet",
"revCount": 44, "repo": "website%2Falumni-renew",
"type": "git", "rev": "44ab695bab61d20d6d873f1c3a702b5a8874dd5e",
"url": "https://forgejo.skynet.ie/Skynet/wiki" "type": "gitlab"
}, },
"original": { "original": {
"type": "git", "host": "gitlab.skynet.ie",
"url": "https://forgejo.skynet.ie/Skynet/wiki" "owner": "compsoc1%2Fskynet",
"repo": "website%2Falumni-renew",
"type": "gitlab"
} }
}, },
"stable": { "stable": {
@ -1327,11 +1350,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1692799911,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github" "type": "github"
}, },
"original": { "original": {

98
flake.nix
View file

@ -18,40 +18,80 @@
colmena.url = "github:zhaofengli/colmena"; colmena.url = "github:zhaofengli/colmena";
attic.url = github:zhaofengli/attic; attic.url = github:zhaofengli/attic;
# we host our own # email
# simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver";
simple-nixos-mailserver = { simple-nixos-mailserver = {
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
url = "git+https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"; type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
repo = "misc%2Fnixos-mailserver";
}; };
###################### # account.skynet.ie
### skynet backend ### skynet_ldap_backend = {
###################### type = "gitlab";
skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; host = "gitlab.skynet.ie";
skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; owner = "compsoc1%2Fskynet";
skynet_website_renew.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; repo = "ldap%2Fbackend";
skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; };
skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; skynet_ldap_frontend = {
type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
repo = "ldap%2Ffrontend";
};
skynet_website_renew = {
type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
repo = "website%2Falumni-renew";
};
skynet_website_games = {
type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
repo = "website%2Fgames.skynet.ie";
};
skynet_discord_bot = {
type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
repo = "discord-bot";
};
compsoc_public = {
type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fcompsoc";
repo = "presentations%2Fpresentations";
};
##################### # skynet.ie
### compsoc stuff ### skynet_website = {
##################### type = "gitlab";
compsoc_public.url = "git+https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"; host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
################# repo = "website%2F2017";
### skynet.ie ### };
################# skynet_website_2023 = {
type = "gitlab";
# this should always point to teh current website host = "gitlab.skynet.ie";
skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; owner = "compsoc1%2Fskynet";
repo = "website%2F2017";
# these are past versions of teh website rev = "c4d61c753292bf73ed41b47b1607cfc92a82a191";
skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; };
# this is not 100% right since this is from teh archive from 2022 or so skynet_website_2017 = {
skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; type = "gitlab";
host = "gitlab.skynet.ie";
# this is more of 2012 than 2009 but started in 2009 owner = "compsoc1%2Fskynet";
skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; repo = "website%2F2017";
};
skynet_website_2009 = {
type = "gitlab";
host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet";
repo = "website%2F2009";
};
}; };
nixConfig = { nixConfig = {