diff --git a/machines/oracles/configuration.nix b/machines/oracles/configuration.nix index 08616ff..6a01af0 100644 --- a/machines/oracles/configuration.nix +++ b/machines/oracles/configuration.nix @@ -90,91 +90,91 @@ home-manager.users.nathan = import ./home.nix; # Setup minecraft container - containers.minecraft = let - b2AccountID = "00284106ead1ac40000000002"; - b2KeyFile = "${config.sops.secrets."friendpack-backblaze".path}"; - b2Bucket = "ForwardProgressServerBackup"; - in { - config = { pkgs, lib, ... }@attrs: - let - # OpenJDK 17 - javaPackage = pkgs.jdk; - in { - imports = [ inputs.quilt-server.nixosModules.default ]; - ### - ## Container stuff - ### - # Let nix know this is a container - boot.isContainer = true; - # Set system state version - system.stateVersion = "22.05"; - # Setup networking - networking.useDHCP = false; - # Allow minecraft out - networking.firewall.allowedTCPPorts = [ 25565 ]; + # containers.minecraft = let + # b2AccountID = "00284106ead1ac40000000002"; + # b2KeyFile = "${config.sops.secrets."friendpack-backblaze".path}"; + # b2Bucket = "ForwardProgressServerBackup"; + # in { + # config = { pkgs, lib, ... }@attrs: + # let + # # OpenJDK 17 + # javaPackage = pkgs.jdk; + # in { + # imports = [ inputs.quilt-server.nixosModules.default ]; + # ### + # ## Container stuff + # ### + # # Let nix know this is a container + # boot.isContainer = true; + # # Set system state version + # system.stateVersion = "22.05"; + # # Setup networking + # networking.useDHCP = false; + # # Allow minecraft out + # networking.firewall.allowedTCPPorts = [ 25565 ]; - ### - ## User - ### - users = { - mutableUsers = false; - # Enable us to not use a password, this is a container - allowNoPasswordLogin = true; - }; + # ### + # ## User + # ### + # users = { + # mutableUsers = false; + # # Enable us to not use a password, this is a container + # allowNoPasswordLogin = true; + # }; - ### - ## Configure module - ### - forward-progress = { - services = { - minecraft = { - enable = true; - minecraft-version = "1.18.2"; - quilt-version = "0.17.1-beta.6"; - ram = 6144; - properties = { - motd = "Nathan's Private Modded Minecraft"; - white-list = true; - enforce-whitelist = true; - }; - packwiz-url = "https://pack.forward-progress.net/0.3/pack.toml"; - acceptEula = true; - }; - backup = { - enable = true; - backblaze = { - enable = true; - accountId = b2AccountID; - keyFile = b2KeyFile; - bucket = b2Bucket; - }; - }; - }; - }; - }; - autoStart = true; - bindMounts = { - "/var/minecraft" = { - hostPath = "/var/minecraft"; - isReadOnly = false; - }; - "/run/secrets/friendpack-backblaze" = { - hostPath = "/run/secrets/friendpack-backblaze"; - }; - }; - forwardPorts = [ - { - containerPort = 25565; - hostPort = 25565; - protocol = "tcp"; - } - { - containerPort = 25565; - hostPort = 25565; - protocol = "udp"; - } - ]; - }; + # ### + # ## Configure module + # ### + # forward-progress = { + # services = { + # minecraft = { + # enable = true; + # minecraft-version = "1.18.2"; + # quilt-version = "0.17.1-beta.6"; + # ram = 6144; + # properties = { + # motd = "Nathan's Private Modded Minecraft"; + # white-list = true; + # enforce-whitelist = true; + # }; + # packwiz-url = "https://pack.forward-progress.net/0.3/pack.toml"; + # acceptEula = true; + # }; + # backup = { + # enable = true; + # backblaze = { + # enable = true; + # accountId = b2AccountID; + # keyFile = b2KeyFile; + # bucket = b2Bucket; + # }; + # }; + # }; + # }; + # }; + # autoStart = true; + # bindMounts = { + # "/var/minecraft" = { + # hostPath = "/var/minecraft"; + # isReadOnly = false; + # }; + # "/run/secrets/friendpack-backblaze" = { + # hostPath = "/run/secrets/friendpack-backblaze"; + # }; + # }; + # forwardPorts = [ + # { + # containerPort = 25565; + # hostPort = 25565; + # protocol = "tcp"; + # } + # { + # containerPort = 25565; + # hostPort = 25565; + # protocol = "udp"; + # } + # ]; + # } # Setup vhost for pack website services.nginx.virtualHosts."pack.forward-progress.net" = {