Merge remote-tracking branch 'gum/master'

2 files changed, 21 insertions, 25 deletions

diff --git a/makefu/2configs/nginx/download.binaergewitter.de.nix b/makefu/2configs/nginx/download.binaergewitter.de.nix
deleted file mode 100644
index 6b5687e72..000000000
--- a/makefu/2configs/nginx/download.binaergewitter.de.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  ident = (toString <secrets>) + "/mirrorsync.gum.id_ed25519";
-in {
-  systemd.services.mirrorsync = {
-    startAt = "08:00:00";
-    path = with pkgs; [ rsync openssh ];
-    script = ''rsync -av -e "ssh -i ${ident}" mirrorsync@159.69.132.234:/var/www/html/ /var/www/binaergewitter'';
-  };
-  services.nginx = {
-    enable = lib.mkDefault true;
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    virtualHosts."download.binaergewitter.de" = {
-        serverAliases = [ "dl2.binaergewitter.de" ];
-        root = "/var/www/binaergewitter";
-        extraConfig = ''
-          access_log /var/spool/nginx/logs/binaergewitter.access.log combined;
-          error_log /var/spool/nginx/logs/binaergewitter.error.log error;
-          autoindex on;
-        '';
-    };
-  };
-}
diff --git a/makefu/2configs/nginx/gum.krebsco.de.nix b/makefu/2configs/nginx/gum.krebsco.de.nix
new file mode 100644
index 000000000..3e96e6826
--- /dev/null
+++ b/makefu/2configs/nginx/gum.krebsco.de.nix
@@ -0,0 +1,21 @@
+{ config, lib, pkgs, ... }:
+
+with import <stockholm/lib>;
+let
+in {
+  services.nginx = {
+    enable = mkDefault true;
+    virtualHosts."gum.krebsco.de" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/" =  {
+        # proxyPass = "http://localhost:8000/";
+        # extraConfig = ''
+        #   proxy_set_header   Host $host;
+        #   proxy_set_header   X-Real-IP          $remote_addr;
+        #   proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        # '';
+      };
+    };
+  };
+}