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

fix: move to a better naming scheme for previous versions of teh skynet sites

Browse source
This commit is contained in:
silver 2024-06-14 20:36:16 +01:00
parent 69bd2be07c
commit fee1e34ca8
Signed by: silver
GPG key ID: 54E2C71918E93B74
3 changed files with 56 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
applications/skynet.ie.nix
View file

@ -21,7 +21,8 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.skynet.acme.domains = [ services.skynet.acme.domains = [
# the root one is already covered by teh certificate # the root one is already covered by teh certificate
"2016.skynet.ie" "2017.skynet.ie"
"2009.skynet.ie"
"discord.skynet.ie" "discord.skynet.ie"
"public.skynet.ie" "public.skynet.ie"
"renew.skynet.ie" "renew.skynet.ie"
@ -35,7 +36,12 @@ in {
value = config.services.skynet.host.ip; value = config.services.skynet.host.ip;
} }
{ {
record = "2016"; record = "2017";
r_type = "CNAME";
value = config.services.skynet.host.name;
}
{
record = "2009";
r_type = "CNAME"; r_type = "CNAME";
value = config.services.skynet.host.name; value = config.services.skynet.host.name;
} }
@ -63,9 +69,8 @@ in {
forceSSL = true; forceSSL = true;
useACMEHost = "skynet"; useACMEHost = "skynet";
locations = { locations = {
"/" = { # this alwas points to teh current version of teh site
root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}"; "/".root = "${inputs.skynet_website_2017.defaultPackage."x86_64-linux"}";
};
# this redirects old links to new format # this redirects old links to new format
"~* ~(?<username>[a-z_0-9]*)(?<files>\\S*)$" = { "~* ~(?<username>[a-z_0-9]*)(?<files>\\S*)$" = {
@ -75,11 +80,18 @@ in {
}; };
}; };
# archive of teh site as it was ~2012 to 2016 # 2017 to now
"2016.skynet.ie" = { "2017.skynet.ie" = {
forceSSL = true; forceSSL = true;
useACMEHost = "skynet"; useACMEHost = "skynet";
root = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}"; root = "${inputs.skynet_website_2017.defaultPackage."x86_64-linux"}";
};
# archive of teh site as it was ~2009 to 2017
"2009.skynet.ie" = {
forceSSL = true;
useACMEHost = "skynet";
root = "${inputs.skynet_website_2009.defaultPackage."x86_64-linux"}";
}; };
# a custom discord url, because we are too cheap otehrwise # a custom discord url, because we are too cheap otehrwise

64
flake.lock
View file

@ -620,11 +620,11 @@
}, },
"nixpkgs_14": { "nixpkgs_14": {
"locked": { "locked": {
"lastModified": 1689935543, "lastModified": 1690026219,
"narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
}, },
"nixpkgs_15": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 1690026219, "lastModified": 1689935543,
"narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,8 +807,8 @@
"skynet_discord_bot": "skynet_discord_bot", "skynet_discord_bot": "skynet_discord_bot",
"skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_backend": "skynet_ldap_backend",
"skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_ldap_frontend": "skynet_ldap_frontend",
"skynet_website": "skynet_website", "skynet_website_2009": "skynet_website_2009",
"skynet_website_2016": "skynet_website_2016", "skynet_website_2017": "skynet_website_2017",
"skynet_website_games": "skynet_website_games", "skynet_website_games": "skynet_website_games",
"skynet_website_renew": "skynet_website_renew" "skynet_website_renew": "skynet_website_renew"
} }
@ -922,45 +922,45 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"skynet_website": { "skynet_website_2009": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_14", "nixpkgs": "nixpkgs_14",
"utils": "utils_7" "utils": "utils_7"
}, },
"locked": {
"host": "gitlab.skynet.ie",
"lastModified": 1707154174,
"narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2023",
"rev": "c81db388fac570a8cb646391ea461b9e60282043",
"type": "gitlab"
},
"original": {
"host": "gitlab.skynet.ie",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2023",
"type": "gitlab"
}
},
"skynet_website_2016": {
"inputs": {
"nixpkgs": "nixpkgs_15",
"utils": "utils_8"
},
"locked": { "locked": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"lastModified": 1690726067, "lastModified": 1690726067,
"narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=", "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=",
"owner": "compsoc1%2Fskynet", "owner": "compsoc1%2Fskynet",
"repo": "website%2F2016", "repo": "website%2F2009",
"rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e", "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.skynet.ie", "host": "gitlab.skynet.ie",
"owner": "compsoc1%2Fskynet", "owner": "compsoc1%2Fskynet",
"repo": "website%2F2016", "repo": "website%2F2009",
"type": "gitlab"
}
},
"skynet_website_2017": {
"inputs": {
"nixpkgs": "nixpkgs_15",
"utils": "utils_8"
},
"locked": {
"host": "gitlab.skynet.ie",
"lastModified": 1707154174,
"narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"rev": "c81db388fac570a8cb646391ea461b9e60282043",
"type": "gitlab"
},
"original": {
"host": "gitlab.skynet.ie",
"owner": "compsoc1%2Fskynet",
"repo": "website%2F2017",
"type": "gitlab" "type": "gitlab"
} }
}, },

8
flake.nix
View file

@ -41,17 +41,17 @@
owner = "compsoc1%2Fskynet"; owner = "compsoc1%2Fskynet";
repo = "ldap%2Ffrontend"; repo = "ldap%2Ffrontend";
}; };
skynet_website = { skynet_website_2017 = {
type = "gitlab"; type = "gitlab";
host = "gitlab.skynet.ie"; host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet"; owner = "compsoc1%2Fskynet";
repo = "website%2F2023"; repo = "website%2F2017";
}; };
skynet_website_2016 = { skynet_website_2009 = {
type = "gitlab"; type = "gitlab";
host = "gitlab.skynet.ie"; host = "gitlab.skynet.ie";
owner = "compsoc1%2Fskynet"; owner = "compsoc1%2Fskynet";
repo = "website%2F2016"; repo = "website%2F2009";
}; };
skynet_website_renew = { skynet_website_renew = {
type = "gitlab"; type = "gitlab";