diff --git a/hosts/nom/secrets/host.pub b/hosts/nom/secrets/host.pub index 3019155..97a005f 100644 --- a/hosts/nom/secrets/host.pub +++ b/hosts/nom/secrets/host.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOdYhY/DnXpizajoeLefH6gsc/RX9x3Y6T3C1a+0sb0 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH64l5nh2ryG+1I2sXvfr7m8kTLP5N3CmnK12MHHKSfr diff --git a/hosts/sentinel/default.nix b/hosts/sentinel/default.nix index 0c62b50..4db9c22 100644 --- a/hosts/sentinel/default.nix +++ b/hosts/sentinel/default.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + pkgs, + ... +}: { imports = [ ../../modules/optional/hardware/hetzner-cloud.nix @@ -16,9 +20,23 @@ users.groups.acme.members = ["nginx"]; wireguard.proxy-sentinel.firewallRuleForAll.allowedTCPPorts = [80 443]; + services.nginx.enable = true; services.nginx.recommendedSetup = true; + services.nginx.virtualHosts.${config.repo.secrets.global.domains.me} = { + forceSSL = true; + useACMEWildcardHost = true; + locations."/".root = pkgs.runCommand "index.html" {} '' + mkdir -p $out + cat > $out/index.html < + Not empty soon TM. Until then please go here: oddlama + + EOF + ''; + }; + meta.promtail = { enable = true; proxy = "sentinel"; diff --git a/modules/acme-wildcard.nix b/modules/acme-wildcard.nix index 9652470..318bf28 100644 --- a/modules/acme-wildcard.nix +++ b/modules/acme-wildcard.nix @@ -6,6 +6,7 @@ inherit (lib) assertMsg + elem filter genAttrs hasInfix @@ -37,9 +38,12 @@ in { # If no such domain is found then an assertion is triggered. domain = submod.config._module.args.name; matchingCerts = - filter - (x: !hasInfix "." (removeSuffix ".${x}" domain)) - config.security.acme.wildcardDomains; + if elem domain config.security.acme.wildcardDomains + then [domain] + else + filter + (x: !hasInfix "." (removeSuffix ".${x}" domain)) + config.security.acme.wildcardDomains; in mkIf submod.config.useACMEWildcardHost { useACMEHost = assert assertMsg (matchingCerts != []) "No wildcard certificate was defined that matches ${domain}"; diff --git a/secrets/rekeyed/nom/1f37a986a31d7e4d88df8b59d91fcd91-initrd_host_ed25519_key.age b/secrets/rekeyed/nom/1f37a986a31d7e4d88df8b59d91fcd91-initrd_host_ed25519_key.age deleted file mode 100644 index 6ca7d9f..0000000 --- a/secrets/rekeyed/nom/1f37a986a31d7e4d88df8b59d91fcd91-initrd_host_ed25519_key.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 grkLKQ wT/F1RZNRPv/nEpRO2K6uaaUgblmQ+Snl0l0oaQ8biQ -l2Spr1bBxZ780TqPyzLu8e+Bu/V7wHGVEOnht6obgm4 --> a-grease ajoj }}yuQ_]d ]\g' -WsHmUGNgl8O1jJaoW2mHzJtxngWIQWUngA0y/Q ---- yG/0WUD+R7eWZv+DNiH24Y8GW3FvYgHDftlFi8ngpdA -o)8!X?r%JنRq9_]jr;C?,vLF5Dx&.1/vN;H47\V>6L9! >:*U5b[h/nSo - '(i҈y5D.]IcJFY_-Z !L0V^3O)3Q.