diff options
Diffstat (limited to 'hosts/chaski')
-rw-r--r-- | hosts/chaski/configuration.nix | 9 | ||||
-rw-r--r-- | hosts/chaski/services/uplcg.nix | 12 | ||||
-rw-r--r-- | hosts/chaski/services/woitb.nix | 10 |
3 files changed, 11 insertions, 20 deletions
diff --git a/hosts/chaski/configuration.nix b/hosts/chaski/configuration.nix index 55289dd..ae422cf 100644 --- a/hosts/chaski/configuration.nix +++ b/hosts/chaski/configuration.nix @@ -17,9 +17,12 @@ ./services/gtfs.nix ]; - hexchen.deploy = { - ssh.host = "chaski"; - }; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + + services.nginx.appendHttpConfig = '' + access_log off; + add_header Permissions-Policy "interest-cohort=()"; + ''; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/hosts/chaski/services/uplcg.nix b/hosts/chaski/services/uplcg.nix index fa59528..5605046 100644 --- a/hosts/chaski/services/uplcg.nix +++ b/hosts/chaski/services/uplcg.nix @@ -1,15 +1,8 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: -let - #sources = import ../../../nix/sources.nix; - uplcg-nix = fetchGit { - url = "https://stuebinm.eu/git/uplcg"; - rev = "8c19e63eb67093f960be060f08a873a9d696d226"; - }; -in { imports = [ - "${uplcg-nix.outPath}/module.nix" + "${inputs.uplcg.outPath}/module.nix" ]; services.uplcg = { @@ -18,6 +11,7 @@ in domain = "0.0.0.0"; }; + services.nginx.enable = true; services.nginx.virtualHosts."cards.stuebinm.eu" = { locations."/" = { proxyPass = "http://localhost:9080"; diff --git a/hosts/chaski/services/woitb.nix b/hosts/chaski/services/woitb.nix index a2d64a0..0c50617 100644 --- a/hosts/chaski/services/woitb.nix +++ b/hosts/chaski/services/woitb.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let #sources = ../../nix/sources.nix; @@ -26,13 +26,7 @@ in services.nginx.virtualHosts."track.ilztal.live" = { enableACME = true; forceSSL = true; - locations."/".root = pkgs.copyPathToStore /home/stuebinm/Dokumente/utils/tracktrain; + locations."/".root = inputs.tracktrain; }; - networking.firewall.allowedTCPPorts = [ 80 443 ]; - - services.nginx.appendHttpConfig = '' - access_log off; - add_header Permissions-Policy "interest-cohort=()"; - ''; } |