diff options
author | Franck Cuny <franck@fcuny.net> | 2023-05-09 18:47:24 -0700 |
---|---|---|
committer | Franck Cuny <franck@fcuny.net> | 2023-05-09 18:47:24 -0700 |
commit | 7f8b7e24fe67cfdb407f1415d6e7b223d2600f58 (patch) | |
tree | 5d72336b99adee6c7216ec7fa681977c185cdaba /hosts | |
parent | tahoe: move the initrd code (diff) | |
download | world-7f8b7e24fe67cfdb407f1415d6e7b223d2600f58.tar.gz |
profiles/nginx: move common configuration to a profile
Both tahoe and carmel are using nginx, and we can simplify the configuration by moving common parts to the profile and have these hosts import it.
Diffstat (limited to 'hosts')
-rw-r--r-- | hosts/carmel/default.nix | 1 | ||||
-rw-r--r-- | hosts/carmel/services.nix | 6 | ||||
-rw-r--r-- | hosts/tahoe/default.nix | 1 | ||||
-rw-r--r-- | hosts/tahoe/services.nix | 1 |
4 files changed, 2 insertions, 7 deletions
diff --git a/hosts/carmel/default.nix b/hosts/carmel/default.nix index c9915d2..1006f1e 100644 --- a/hosts/carmel/default.nix +++ b/hosts/carmel/default.nix @@ -8,6 +8,7 @@ ./services.nix "${self}/profiles/server.nix" "${self}/profiles/hardware/amd.nix" + "${self}/profiles/nginx.nix" ]; # This value determines the NixOS release from which the default diff --git a/hosts/carmel/services.nix b/hosts/carmel/services.nix index 89f888d..4c17fd8 100644 --- a/hosts/carmel/services.nix +++ b/hosts/carmel/services.nix @@ -74,12 +74,6 @@ }; services.nginx = { - enable = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - virtualHosts."dnsmasq" = { listen = [ { diff --git a/hosts/tahoe/default.nix b/hosts/tahoe/default.nix index 7cb25fd..aacc41a 100644 --- a/hosts/tahoe/default.nix +++ b/hosts/tahoe/default.nix @@ -11,6 +11,7 @@ in "${self}/profiles/btrfs.nix" "${self}/profiles/nas.nix" "${self}/profiles/acme.nix" + "${self}/profiles/nginx.nix" "${self}/profiles/hardware/amd.nix" ]; diff --git a/hosts/tahoe/services.nix b/hosts/tahoe/services.nix index 0227f4c..894f345 100644 --- a/hosts/tahoe/services.nix +++ b/hosts/tahoe/services.nix @@ -45,7 +45,6 @@ in enable = true; stateDir = "/var/lib/gitolite"; }; - nginx = { enable = true; }; transmission = { enable = true; vhostName = "bt.fcuny.xyz"; |