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

Compare commits

base: Skynet:31f54b1e921a39d54dd5734ea2b9af4ab374a636
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:9120a81d6b7ec7307ad1b051858a91abedf62364
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

2 commits
31f54b1e92 ... 9120a81d6b

Author SHA1 Message Date
Brendan Golden
9120a81d6b
feat: switch over to using forjo for inputs
All checks were successful
Build_Deploy / linter (push) Successful in 6s
Details
Build_Deploy / build (push) Successful in 3m56s
Details
Build_Deploy / deploy_dns (push) Successful in 45s
Details
Build_Deploy / deploy_active (active) (push) Successful in 50s
Details
Build_Deploy / deploy_active (active-core) (push) Successful in 1m20s
Details
Build_Deploy / deploy_active (active-ext) (push) Successful in 29s
Details
2024-08-10 21:32:51 +01:00
Brendan Golden
186833f70c
fix: use github as the default url for actions, will still be recommending to use the fully qualified link for it though 2024-08-10 20:41:48 +01:00
3 changed files with 142 additions and 205 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,19 +151,17 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723315618,
"lastModified": 1715528953, "narHash": "sha256-03V1tJGmg+T5fvfAAwoHaDxDbrNwJHe7Y/AwNLDfqbw=",
"narHash": "sha256-NWoCV1SauW8H/MibwAC+JWoomjpkIruGqfV/JTM1D4Q=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fcompsoc", "rev": "f62ddd8f0a3c59c85e62ee6e9c80e3d9e058e484",
"repo": "presentations%2Fpresentations", "revCount": 70,
"rev": "4855b0468e1e5118d11130b164b1d57a42251add", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fcompsoc", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"
"repo": "presentations%2Fpresentations",
"type": "gitlab"
} }
}, },
"crane": { "crane": {
@ -467,11 +465,11 @@
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1692351612, "lastModified": 1721727458,
"narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=", "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "78789c30d64dea2396c9da516bbcc8db3a475207", "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -547,16 +545,16 @@
}, },
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1693087214, "lastModified": 1722995383,
"narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4", "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.05", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },
@ -794,11 +792,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1693060755, "lastModified": 1723151389,
"narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", "rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -855,19 +853,17 @@
"nixpkgs-24_05": "nixpkgs-24_05" "nixpkgs-24_05": "nixpkgs-24_05"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723233349,
"lastModified": 1721563973, "narHash": "sha256-0NqGJ+wFxmK6DEEvlZ+jGMdDkIaQ+S54kBStwkGUaO8=",
"narHash": "sha256-y+Rag94tKu8Z6ouJlfxFb8EK9fKs1TNZa4nX7MT2kZg=", "ref": "refs/heads/master",
"owner": "compsoc1%2Fskynet", "rev": "a98a93cf22cd53a92143703a0a5b6f76438a15ba",
"repo": "misc%2Fnixos-mailserver", "revCount": 594,
"rev": "806a4cfd2174b3941e9426d75ed09561c547e6fd", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"
"repo": "misc%2Fnixos-mailserver",
"type": "gitlab"
} }
}, },
"skynet_discord_bot": { "skynet_discord_bot": {
@ -877,19 +873,17 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723319789,
"lastModified": 1717453955, "narHash": "sha256-hrWDD9U0YSdvYayyDk1R6ZT7rmJp2jBx1/si3p/DuDY=",
"narHash": "sha256-axbeauP+9PP4qiwCiMvvGd6XTnjv12+QkZP3K2yFCeU=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "905aaa96206310a638498d91d04e16641b33d842",
"repo": "discord-bot", "revCount": 105,
"rev": "48b52f3c0905af7341e45e2b950aba43af68c80e", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/discord-bot"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/discord-bot"
"repo": "discord-bot",
"type": "gitlab"
} }
}, },
"skynet_ldap_backend": { "skynet_ldap_backend": {
@ -899,19 +893,17 @@
"utils": "utils_4" "utils": "utils_4"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723234129,
"lastModified": 1717782746, "narHash": "sha256-tfsT9VYV3YgFRUKbjFyV4o1kVJHcUY87kh2vcu6jAkU=",
"narHash": "sha256-LZovqXjhDIUe/T+bU5wtwN1RbcPjkZK6yQNhPa9Nrwc=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "5f6a086e808b811095e36875fb656864cf11c5f5",
"repo": "ldap%2Fbackend", "revCount": 232,
"rev": "5b94811276d70b00cc292081f623b6f52a710b84", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/ldap_backend"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend"
"repo": "ldap%2Fbackend",
"type": "gitlab"
} }
}, },
"skynet_ldap_frontend": { "skynet_ldap_frontend": {
@ -920,19 +912,17 @@
"utils": "utils_5" "utils": "utils_5"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723234619,
"lastModified": 1708277300, "narHash": "sha256-jHqIg3ltestGKaR4vHr44nnq3Pv7yr9gGwkvONEJxoA=",
"narHash": "sha256-Y8wKzGJQ69w375faAYGukvuTFez6YGeV+w4TOD4XosA=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "71f5928c66a43e788a9a00b90a1326c1bb82ffd2",
"repo": "ldap%2Ffrontend", "revCount": 228,
"rev": "36c5e5bbae7adcc404bec6d643cae5fd8a6c87bb", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/ldap_frontend"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/ldap_frontend"
"repo": "ldap%2Ffrontend",
"type": "gitlab"
} }
}, },
"skynet_website": { "skynet_website": {
@ -941,19 +931,17 @@
"utils": "utils_6" "utils": "utils_6"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723316173,
"lastModified": 1707154174, "narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=",
"narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "871ecc6c232b82f0e67e30cf1485250ec603108e",
"repo": "website%2F2017", "revCount": 14,
"rev": "c81db388fac570a8cb646391ea461b9e60282043", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/website_2017"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/website_2017"
"repo": "website%2F2017",
"type": "gitlab"
} }
}, },
"skynet_website_2009": { "skynet_website_2009": {
@ -962,19 +950,17 @@
"utils": "utils_7" "utils": "utils_7"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723317982,
"lastModified": 1718585207, "narHash": "sha256-qkTYtwcPAKmdN2cJidhBbGcm6yY1M76zw9NFyqjJnn4=",
"narHash": "sha256-jlCZv+KCCiI0Cx0nnMFPalBdx/fN2JgLNXvc4OAwNvE=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "2d0e20c683068b692bf8765273b3531d77005d09",
"repo": "website%2F2009", "revCount": 12,
"rev": "12712f3b3ffc80782cc520d46f91b9f5df1fab69", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/website_2009"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/website_2009"
"repo": "website%2F2009",
"type": "gitlab"
} }
}, },
"skynet_website_2017": { "skynet_website_2017": {
@ -983,19 +969,17 @@
"utils": "utils_8" "utils": "utils_8"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723316173,
"lastModified": 1707154174, "narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=",
"narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "871ecc6c232b82f0e67e30cf1485250ec603108e",
"repo": "website%2F2017", "revCount": 14,
"rev": "c81db388fac570a8cb646391ea461b9e60282043", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/website_2017"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/website_2017"
"repo": "website%2F2017",
"type": "gitlab"
} }
}, },
"skynet_website_2023": { "skynet_website_2023": {
@ -1004,20 +988,17 @@
"utils": "utils_9" "utils": "utils_9"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie",
"lastModified": 1696876711, "lastModified": 1696876711,
"narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191",
"type": "gitlab" "revCount": 12,
"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": "gitlab" "type": "git",
"url": "https://forgejo.skynet.ie/Skynet/website_2017"
} }
}, },
"skynet_website_games": { "skynet_website_games": {
@ -1026,19 +1007,17 @@
"utils": "utils_10" "utils": "utils_10"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723240375,
"lastModified": 1708103254, "narHash": "sha256-kFQ3Eu2A3M8L5nyEnUj0cRjvliIYElLXVsHjQygLRaQ=",
"narHash": "sha256-/1ElBw+oc1dzwgr7VVLkQFRITteckH1IwbZpgpz8Qvg=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "cf37628959054ad24dbc988d28ea1183aa94a14e",
"repo": "website%2Fgames.skynet.ie", "revCount": 10,
"rev": "f43a01ef62494cef3e7f1e86d8169867e2df136b", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/website_games"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/website_games"
"repo": "website%2Fgames.skynet.ie",
"type": "gitlab"
} }
}, },
"skynet_website_renew": { "skynet_website_renew": {
@ -1047,19 +1026,17 @@
"utils": "utils_11" "utils": "utils_11"
}, },
"locked": { "locked": {
"host": "gitlab.skynet.ie", "lastModified": 1723232841,
"lastModified": 1720558362, "narHash": "sha256-uWMUKTp7rIrwYr4CWRmlPmFJo97ezBUQL7VLnAJBXac=",
"narHash": "sha256-fNKFqkP35tzBhBy0L8xGOJ7B3EXh+khu3bOBlGqlPks=", "ref": "refs/heads/main",
"owner": "compsoc1%2Fskynet", "rev": "baa8b6d8a59fc4fd7c6abcbb7b0dda4b8482df49",
"repo": "website%2Falumni-renew", "revCount": 44,
"rev": "44ab695bab61d20d6d873f1c3a702b5a8874dd5e", "type": "git",
"type": "gitlab" "url": "https://forgejo.skynet.ie/Skynet/wiki"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "type": "git",
"owner": "compsoc1%2Fskynet", "url": "https://forgejo.skynet.ie/Skynet/wiki"
"repo": "website%2Falumni-renew",
"type": "gitlab"
} }
}, },
"stable": { "stable": {
@ -1350,11 +1327,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1692799911, "lastModified": 1710146030,
"narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {

98
flake.nix
View file

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