Merge remote-tracking branch 'prism/master'

2 files changed, 29 insertions, 4 deletions

diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix
index 7bc06f833..9585d8599 100644
--- a/makefu/1systems/gum/config.nix
+++ b/makefu/1systems/gum/config.nix
@@ -97,6 +97,24 @@ in {
       # sharing
       <stockholm/makefu/2configs/share/gum.nix>
       <stockholm/makefu/2configs/torrent.nix>
+      { services.sickbeard = {
+        enable = true;
+        package = pkgs.sickgear;
+          user = "sickbeard";
+          group = "download";
+          port = 8280;
+        };
+        services.nginx.virtualHosts."sick.makefu.r" = {
+          locations."/".proxyPass = http://localhost:8280;
+          extraConfig = ''
+            if ( $server_addr = "${external-ip}" ) {
+              return 403;
+            }
+          '';
+        };
+        users.users.sickbeard.extraGroups = [ "nginx" ];
+      }
+      { nixpkgs.config.allowUnfree = true; }
       #<stockholm/makefu/2configs/retroshare.nix>
       ## <stockholm/makefu/2configs/ipfs.nix>
       #<stockholm/makefu/2configs/syncthing.nix>
@@ -111,6 +129,7 @@ in {
       <stockholm/makefu/2configs/iodined.nix>
       <stockholm/makefu/2configs/bitlbee.nix>
       <stockholm/makefu/2configs/wireguard/server.nix>
+      <stockholm/makefu/2configs/wireguard/wiregrill.nix>
 
       # Removed until move: no extra mails
       <stockholm/makefu/2configs/urlwatch>
@@ -153,11 +172,17 @@ in {
 
   makefu.dl-dir = "/var/download";
 
-  services.openssh.hostKeys = [
+  services.openssh.hostKeys = lib.mkForce [
     { bits = 4096; path = (toString <secrets/ssh_host_rsa_key>); type = "rsa"; }
     { path = (toString <secrets/ssh_host_ed25519_key>); type = "ed25519"; } ];
   ###### stable
-  services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ];
+
+  services.nginx.virtualHosts."cgit.euer.krebsco.de" = {
+    forceSSL = true;
+    enableACME = true;
+    locations."/".proxyPass = "http://cgit.gum.r";
+  };
+
   krebs.build.host = config.krebs.hosts.gum;
 
   # Network
diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix
index 857fad7aa..e49b621e7 100644
--- a/makefu/1systems/gum/hardware-config.nix
+++ b/makefu/1systems/gum/hardware-config.nix
@@ -41,7 +41,7 @@ in {
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.loader.grub.devices = [ main-disk ];
-  boot.initrd.kernelModules = [  "dm-raid" "dm_cache" ];
+  boot.initrd.kernelModules = [  "dm-raid" "dm_cache" "dm-thin-pool" ];
   boot.initrd.availableKernelModules = [
     "ata_piix" "vmw_pvscsi" "virtio_pci" "sd_mod" "ahci"
     "xhci_pci" "ehci_pci" "ahci" "sd_mod"
@@ -67,7 +67,7 @@ in {
   fileSystems."/var/www/binaergewitter" = {
     device = "/dev/nixos/binaergewitter";
     fsType = "ext4";
-    options = [ "nofail" "x-systemd.automount" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
+    options = [ "nofail" ];
   };
   fileSystems."/var/lib/borgbackup" = {
     device = "/dev/nixos/backup";