From 8b358f2557add1b1f1f9fb286132796536098574 Mon Sep 17 00:00:00 2001 From: Vivian Roest Date: Sun, 31 Jul 2022 11:01:36 +0200 Subject: [PATCH] use fqdn for hosts --- flake.nix | 6 +++--- nixos/hosts/olympus/nginx/configuration.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 789c1899..a25bcd74 100644 --- a/flake.nix +++ b/flake.nix @@ -46,15 +46,15 @@ ] else [ ./nixos/common/generic-vm.nix ]); - mkConfig = { hostname, ... }@host: { - "${hostname}" = lib.nixosSystem { + mkConfig = { hostname, location, ... }@host: { + "${hostname}.${location}" = lib.nixosSystem { inherit system specialArgs; modules = resolveImports host; }; }; mkColmenaHost = { ip, hostname, tags, location, ... }@host: { - "${hostname}" = { + "${hostname}.${location}" = { imports = resolveImports host; networking = { hostName = hostname; diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix index a9ccc831..714cff14 100644 --- a/nixos/hosts/olympus/nginx/configuration.nix +++ b/nixos/hosts/olympus/nginx/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, nodes, ... }: let proxy = url: { enableACME = true;