diff --git a/hosts/nixos/lapetus/services/5d-diplomacy/default.nix b/hosts/nixos/lapetus/services/5d-diplomacy/default.nix index ef66130..917abbf 100644 --- a/hosts/nixos/lapetus/services/5d-diplomacy/default.nix +++ b/hosts/nixos/lapetus/services/5d-diplomacy/default.nix @@ -1,5 +1,11 @@ { config, ... }: { + # Regenerate by going to the 5d-diplomacy directory and running: + # nix run github:aksiksi/compose2nix -- \ + # -project 5d-diplomacy \ + # -runtime docker \ + # -write_nix_setup=false \ + # -build imports = [ ./generated.nix ]; satellite.cloudflared.at.dip.port = config.satellite.ports."5d-diplomacy"; diff --git a/hosts/nixos/lapetus/services/5d-diplomacy/generated.nix b/hosts/nixos/lapetus/services/5d-diplomacy/generated.nix index fc35bd4..94c5b45 100644 --- a/hosts/nixos/lapetus/services/5d-diplomacy/generated.nix +++ b/hosts/nixos/lapetus/services/5d-diplomacy/generated.nix @@ -5,7 +5,7 @@ # Containers virtualisation.oci-containers.containers."5d-diplomacy-backend" = { - image = "compose2nix-5d-diplomacy-backend"; + image = "compose2nix/5d-diplomacy-backend"; environment = { "ConnectionStrings__Database" = "Server=mssql;Database=diplomacy;User=SA;Password=Passw0rd@;Encrypt=True;TrustServerCertificate=True"; }; @@ -34,7 +34,7 @@ wantedBy = [ "docker-compose-5d-diplomacy-root.target" ]; }; virtualisation.oci-containers.containers."5d-diplomacy-frontend" = { - image = "compose2nix-5d-diplomacy-frontend"; + image = "compose2nix/5d-diplomacy-frontend"; log-driver = "journald"; extraOptions = [ "--network-alias=frontend" @@ -109,7 +109,7 @@ TimeoutSec = 300; }; script = '' - docker build -t compose2nix-5d-diplomacy-backend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:server + docker build -t compose2nix/5d-diplomacy-backend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:server ''; partOf = [ "docker-compose-5d-diplomacy-root.target" ]; wantedBy = [ "docker-compose-5d-diplomacy-root.target" ]; @@ -125,7 +125,7 @@ TimeoutSec = 300; }; script = '' - docker build -t compose2nix-5d-diplomacy-frontend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:client + docker build -t compose2nix/5d-diplomacy-frontend https://github.com/Oliveriver/5d-diplomacy-with-multiverse-time-travel.git#main:client ''; partOf = [ "docker-compose-5d-diplomacy-root.target" ]; wantedBy = [ "docker-compose-5d-diplomacy-root.target" ]; diff --git a/hosts/nixos/lapetus/services/commafeed.nix b/hosts/nixos/lapetus/services/commafeed.nix index 85a9e19..296ac3d 100644 --- a/hosts/nixos/lapetus/services/commafeed.nix +++ b/hosts/nixos/lapetus/services/commafeed.nix @@ -14,8 +14,14 @@ in volumes = [ "${dataDir}:/commafeed/data" ]; # server:docker # the JVM is way too hungry - entrypoint = builtins.toJSON - [ "java" "-Xmx64m" "-jar" "commafeed.jar" "server" "config.yml" ]; + entrypoint = builtins.toJSON [ + "java" + "-Xmx64m" + "-jar" + "commafeed.jar" + "server" + "config.yml" + ]; # https://github.com/Athou/commafeed/blob/master/commafeed-server/config.yml.example environment = {