diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 0af1f8c..b56a189 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -30,6 +30,7 @@ in { "2016.skynet.ie" "discord.skynet.ie" "public.skynet.ie" + "renew.skynet.ie" ]; skynet_dns.records = [ @@ -54,6 +55,11 @@ in { r_type = "CNAME"; value = cfg.host.name; } + { + record = "renew"; + r_type = "CNAME"; + value = cfg.host.name; + } ]; networking.firewall.allowedTCPPorts = [80 443]; @@ -89,6 +95,13 @@ in { root = "${inputs.compsoc_public.packages.x86_64-linux.default}"; locations."/".extraConfig = "autoindex on;"; }; + + # for alumni members to renew their account + "renew.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}"; + }; }; }; }; diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 7a59359..7a24b03 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -55,7 +55,7 @@ in { } ]; - environment.systemPackages = [ pkgs.vim ]; + environment.systemPackages = [pkgs.vim]; networking.firewall.allowedTCPPorts = [80 443]; diff --git a/flake.lock b/flake.lock index 1b1112b..0923b61 100644 --- a/flake.lock +++ b/flake.lock @@ -444,6 +444,20 @@ "type": "indirect" } }, + "nixpkgs_15": { + "locked": { + "lastModified": 1695837737, + "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1676300157, @@ -574,7 +588,8 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", - "skynet_website_2016": "skynet_website_2016" + "skynet_website_2016": "skynet_website_2016", + "skynet_website_renew": "skynet_website_renew" } }, "rust-analyzer-src": { @@ -724,6 +739,27 @@ "type": "gitlab" } }, + "skynet_website_renew": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_9" + }, + "locked": { + "host": "gitlab.skynet.ie", + "lastModified": 1696097295, + "narHash": "sha256-+aO0iZ9Gd8ZyvPLWTDnfq04WTYAxE/nOHw9sqEUsto4=", + "owner": "compsoc1%2Fskynet%2Fwebsite", + "repo": "alumni-renew", + "rev": "0a3aba37580b268a735808eb28df4607e2cbd25d", + "type": "gitlab" + }, + "original": { + "host": "gitlab.skynet.ie", + "owner": "compsoc1%2Fskynet%2Fwebsite", + "repo": "alumni-renew", + "type": "gitlab" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -829,6 +865,21 @@ "type": "github" } }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1652776076, @@ -966,6 +1017,24 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_9": { + "inputs": { + "systems": "systems_8" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 808097b..47cba4b 100644 --- a/flake.nix +++ b/flake.nix @@ -17,12 +17,12 @@ # email simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; - # account.skynet.ie skynet_ldap_backend.url = "gitlab:compsoc1%2Fskynet%2Fldap/backend?host=gitlab.skynet.ie"; skynet_ldap_frontend.url = "gitlab:compsoc1%2Fskynet%2Fldap/frontend?host=gitlab.skynet.ie"; skynet_website.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2023?host=gitlab.skynet.ie"; skynet_website_2016.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/2016?host=gitlab.skynet.ie"; + skynet_website_renew.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/alumni-renew?host=gitlab.skynet.ie"; skynet_discord_bot.url = "gitlab:compsoc1%2Fskynet/discord-bot?host=gitlab.skynet.ie"; compsoc_public.url = "gitlab:compsoc1%2Fcompsoc/presentations?host=gitlab.skynet.ie"; };