From 6400546512156229427d8a9ffaacf25d999e1a0a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 10 Nov 2024 19:02:51 +0000 Subject: [PATCH] nixos: space-age time --- ops/nixos/nausicaa/default.nix | 2 +- ops/nixos/rexxar/default.nix | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ops/nixos/nausicaa/default.nix b/ops/nixos/nausicaa/default.nix index 2f67057185..3e0dbbd903 100644 --- a/ops/nixos/nausicaa/default.nix +++ b/ops/nixos/nausicaa/default.nix @@ -219,7 +219,7 @@ in { #!/bin/sh exec ${depot.nix.pkgs.javaws-env}/bin/javaws-env "$@" '') - factorio-experimental + factorio-space-age-experimental (depot.nix.pkgs.secretsync.configure { workingDir = "/home/lukegb/depot"; gitlabAccessToken = secrets.deployer.gitlabAccessToken; diff --git a/ops/nixos/rexxar/default.nix b/ops/nixos/rexxar/default.nix index c406c52ac5..10ad6e7acf 100644 --- a/ops/nixos/rexxar/default.nix +++ b/ops/nixos/rexxar/default.nix @@ -387,11 +387,12 @@ services.factorio = { inherit (depot.ops.secrets.factorio) username token; enable = true; - saveName = "lukegb20240512-spaceexploration"; + saveName = "lukegb20241107-spaceage"; game-name = "Briefcase Full of Bees"; - mods = depot.nix.pkgs.factorio-mods._all; + #mods = depot.nix.pkgs.factorio-mods._all; #mods-dat = ./mod-settings.dat; admins = ["lukegb"]; + package = pkgs.factorio-headless-experimental; extraSettings = { auto_pause = true; only_admins_can_pause_the_game = false; @@ -504,6 +505,12 @@ reverse_proxy unix//run/seaweedfs-filer/s3.sock ''; }; + virtualHosts."http://objdump.zxcvbnm.ninja" = { + serverAliases = [ "http://*.objdump.zxcvbnm.ninja" ]; + extraConfig = '' + reverse_proxy unix//run/seaweedfs-filer/s3.sock + ''; + }; }; systemd.services.caddy.serviceConfig = { SupplementaryGroups = lib.mkAfter [ "acme" ];