diff options
author | Jeschli <jeschli@gmail.com> | 2020-04-14 20:36:21 +0200 |
---|---|---|
committer | Jeschli <jeschli@gmail.com> | 2020-04-14 20:36:21 +0200 |
commit | e5342b25c149f05db86983f3785ee395c156b435 (patch) | |
tree | e45270c08010c48c27a22643bd9a3a343b880eae /makefu/1systems/gum/config.nix | |
parent | 290b6a542527a0a48c11fc2b00aee2b4d7f7df06 (diff) | |
parent | 843a537bd7fbedd8eb5fd61a1172dd8229440606 (diff) |
Merge branch 'master' of https://cgit.lassul.us/stockholm
Diffstat (limited to 'makefu/1systems/gum/config.nix')
-rw-r--r-- | makefu/1systems/gum/config.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 3b084d35a..8603d7696 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -21,11 +21,12 @@ in { ]; }; } + <stockholm/makefu/2configs/nur.nix> <stockholm/makefu/2configs/support-nixos.nix> <stockholm/makefu/2configs/home-manager> <stockholm/makefu/2configs/home-manager/cli.nix> # <stockholm/makefu/2configs/stats/client.nix> - <stockholm/makefu/2configs/stats/netdata-server.nix> + # <stockholm/makefu/2configs/stats/netdata-server.nix> <stockholm/makefu/2configs/headless.nix> <stockholm/makefu/2configs/smart-monitor.nix> @@ -89,8 +90,8 @@ in { # services # <stockholm/makefu/2configs/sabnzbd.nix> - <stockholm/makefu/2configs/mail/mail.euer.nix> - { krebs.exim.enable = mkForce false; } + # <stockholm/makefu/2configs/mail/mail.euer.nix> + { krebs.exim.enable = mkDefault true; } # sharing <stockholm/makefu/2configs/share/gum.nix> @@ -119,7 +120,7 @@ in { <stockholm/makefu/2configs/urlwatch> # Removed until move: avoid letsencrypt ban ### Web - #<stockholm/makefu/2configs/nginx/share-download.nix> + <stockholm/makefu/2configs/nginx/dl.euer.krebsco.de.nix> #<stockholm/makefu/2configs/nginx/euer.test.nix> <stockholm/makefu/2configs/nginx/euer.mon.nix> <stockholm/makefu/2configs/nginx/euer.wiki.nix> @@ -131,10 +132,14 @@ in { # <stockholm/makefu/2configs/nginx/gold.krebsco.de.nix> # <stockholm/makefu/2configs/nginx/iso.euer.nix> - <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> + # <stockholm/makefu/2configs/deployment/photostore.krebsco.de.nix> <stockholm/makefu/2configs/deployment/graphs.nix> <stockholm/makefu/2configs/deployment/owncloud.nix> + <stockholm/makefu/2configs/deployment/board.euer.krebsco.de.nix> + <stockholm/makefu/2configs/deployment/rss.euer.krebsco.de.nix> <stockholm/makefu/2configs/deployment/boot-euer.nix> + <stockholm/makefu/2configs/deployment/gecloudpad> + <stockholm/makefu/2configs/deployment/docker/archiveteam-warrior.nix> <stockholm/makefu/2configs/shiori.nix> <stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix> @@ -171,7 +176,8 @@ in { services.nginx.virtualHosts."cgit.euer.krebsco.de" = { forceSSL = true; enableACME = true; - locations."/".proxyPass = "http://cgit.gum.r"; + locations."/".proxyPass = "http://localhost/"; + locations."/".extraConfig = ''proxy_set_header Host cgit;''; }; krebs.build.host = config.krebs.hosts.gum; |