diff options
author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-08-02 22:39:02 +0200 |
---|---|---|
committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2024-08-02 23:13:29 +0200 |
commit | 30e649a6d43c4ef2473a1820930cbe7d43e28432 (patch) | |
tree | f34df66d41344a9289628d9c8f9e002614f97c16 /system | |
parent | build(flake): Update (diff) | |
download | nixos-server-30e649a6d43c4ef2473a1820930cbe7d43e28432.tar.gz nixos-server-30e649a6d43c4ef2473a1820930cbe7d43e28432.zip |
refactor(nixos/{nginx, nix-sync}): Migrate from `system/services`
Nix-sync was sort-of mixed into the nginx configuration, thus separating it completely seemed reasonable.
Diffstat (limited to '')
-rw-r--r-- | modules/nixos/vhack/nginx/redirects.nix (renamed from system/services/nginx/redirects.nix) | 0 | ||||
-rw-r--r-- | modules/nixos/vhack/nix-sync/hosts.nix (renamed from system/services/nginx/hosts.nix) | 0 | ||||
-rw-r--r-- | modules/nixos/vhack/nix-sync/module.nix (renamed from system/services/nix-sync/default.nix) | 0 | ||||
-rw-r--r-- | system/services/default.nix | 2 | ||||
-rw-r--r-- | system/services/nginx/default.nix | 79 |
5 files changed, 0 insertions, 81 deletions
diff --git a/system/services/nginx/redirects.nix b/modules/nixos/vhack/nginx/redirects.nix index a021e72..a021e72 100644 --- a/system/services/nginx/redirects.nix +++ b/modules/nixos/vhack/nginx/redirects.nix diff --git a/system/services/nginx/hosts.nix b/modules/nixos/vhack/nix-sync/hosts.nix index 98dbbf1..98dbbf1 100644 --- a/system/services/nginx/hosts.nix +++ b/modules/nixos/vhack/nix-sync/hosts.nix diff --git a/system/services/nix-sync/default.nix b/modules/nixos/vhack/nix-sync/module.nix index a3ab0af..a3ab0af 100644 --- a/system/services/nix-sync/default.nix +++ b/modules/nixos/vhack/nix-sync/module.nix diff --git a/system/services/default.nix b/system/services/default.nix index 8b8151a..3155272 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -10,9 +10,7 @@ ./minecraft ./miniflux ./murmur - ./nginx ./nix - ./nix-sync ./openssh ./restic ./rust-motd diff --git a/system/services/nginx/default.nix b/system/services/nginx/default.nix deleted file mode 100644 index b804754..0000000 --- a/system/services/nginx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{lib, ...}: let - domains = import ./hosts.nix {}; - importedRedirects = import ./redirects.nix {}; - mkRedirect = { - key, - value, - }: { - name = key; - value = { - forceSSL = true; - enableACME = true; - locations."/".return = "301 ${value}"; - }; - }; - mkVirtHost = { - domain, - root ? "", - url, - extraSettings ? {}, - }: { - name = "${domain}"; - value = - lib.recursiveUpdate { - forceSSL = true; - enableACME = true; - root = "/etc/nginx/websites/${domain}/${root}"; - } - extraSettings; - }; - - mkNixSyncRepository = { - domain, - root ? "", - url, - extraSettings ? {}, - }: { - name = "${domain}"; - value = { - path = "/etc/nginx/websites/${domain}/${root}"; - uri = "${url}"; - inherit extraSettings; - }; - }; - - virtHosts = builtins.listToAttrs (builtins.map mkVirtHost domains); - nixSyncRepositories = builtins.listToAttrs (builtins.map mkNixSyncRepository domains); - redirects = builtins.listToAttrs (builtins.map mkRedirect importedRedirects); -in { - security.acme = { - acceptTerms = true; - defaults = { - email = "admin@vhack.eu"; - webroot = "/var/lib/acme/acme-challenge"; - }; - }; - - networking.firewall = { - allowedTCPPorts = [80 443]; - }; - services.nginx = { - enable = true; - # The merge here is fine, as no domain should be specified twice - virtualHosts = - { - "gallery.s-schoeffel.de" = { - forceSSL = true; - enableACME = true; - root = "/srv/gallery.s-schoeffel.de"; - }; - } - // virtHosts - // redirects; - }; - - services.nix-sync = { - enable = true; - repositories = nixSyncRepositories; - }; -} |