Merge branch 'master' of prism.r:stockholm

3 files changed, 27 insertions, 0 deletions

diff --git a/makefu/2configs/nginx/download.binaergewitter.de.nix b/makefu/2configs/nginx/download.binaergewitter.de.nix
new file mode 100644
index 000000000..6b5687e72
--- /dev/null
+++ b/makefu/2configs/nginx/download.binaergewitter.de.nix
@@ -0,0 +1,25 @@
+{ 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/euer.blog.nix b/makefu/2configs/nginx/euer.blog.nix
index 65d36d9b6..14d1285db 100644
--- a/makefu/2configs/nginx/euer.blog.nix
+++ b/makefu/2configs/nginx/euer.blog.nix
@@ -39,4 +39,5 @@ in {
       };
     };
   };
+  state = [ base-dir ];
 }
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 99533b25c..280622259 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -21,6 +21,7 @@ let
   tw-pass-file = "${sec}/tw-pass.ini";
 
 in {
+  state = [ base-dir ];
   services.phpfpm = {
     # phpfpm does not have an enable option
     poolConfigs  = {