diff --git a/applications/games.nix b/applications/games.nix index 5b48680..4959f25 100644 --- a/applications/games.nix +++ b/applications/games.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + inputs, ... }: with lib; let @@ -9,7 +10,7 @@ with lib; let in { imports = [ ./dns.nix - + ./nginx.nix ./games/minecraft.nix ]; @@ -54,6 +55,18 @@ in { } ]; + skynet_acme.domains = [ + "${cfg.domain.sub}.skynet.ie" + ]; + + services.nginx.virtualHosts = { + "${cfg.domain.sub}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + root = "${inputs.skynet_website_games.defaultPackage.x86_64-linux}"; + }; + }; + # the minecraft servers services.skynet_games_minecraft = { enable = true; diff --git a/flake.lock b/flake.lock index 7a5683b..16fde2b 100644 --- a/flake.lock +++ b/flake.lock @@ -445,6 +445,20 @@ } }, "nixpkgs_15": { + "locked": { + "lastModified": 1695978539, + "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_16": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -589,6 +603,7 @@ "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", "skynet_website_2016": "skynet_website_2016", + "skynet_website_games": "skynet_website_games", "skynet_website_renew": "skynet_website_renew" } }, @@ -739,11 +754,32 @@ "type": "gitlab" } }, - "skynet_website_renew": { + "skynet_website_games": { "inputs": { "nixpkgs": "nixpkgs_15", "utils": "utils_9" }, + "locked": { + "host": "gitlab.skynet.ie", + "lastModified": 1696128104, + "narHash": "sha256-DLl1hcqbKq73WoiN9Q5kKy6VbH79ehAyJJ2llrf5lB8=", + "owner": "compsoc1%2Fskynet%2Fwebsite", + "repo": "games.skynet.ie", + "rev": "0ef6a844989cd3cb6cf86e0f4187af0e8ce2f847", + "type": "gitlab" + }, + "original": { + "host": "gitlab.skynet.ie", + "owner": "compsoc1%2Fskynet%2Fwebsite", + "repo": "games.skynet.ie", + "type": "gitlab" + } + }, + "skynet_website_renew": { + "inputs": { + "nixpkgs": "nixpkgs_16", + "utils": "utils_10" + }, "locked": { "host": "gitlab.skynet.ie", "lastModified": 1696121217, @@ -880,6 +916,21 @@ "type": "github" } }, + "systems_9": { + "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, @@ -895,6 +946,24 @@ "type": "github" } }, + "utils_10": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "utils_2": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index 47cba4b..67769f5 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ 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_website_games.url = "gitlab:compsoc1%2Fskynet%2Fwebsite/games.skynet.ie?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"; };