Merge remote-tracking branch 'gum/master'

1 files changed, 60 insertions, 2 deletions

diff --git a/makefu/1systems/fileleech.nix b/makefu/1systems/fileleech.nix
index 1eac141dc..4f92c2b90 100644
--- a/makefu/1systems/fileleech.nix
+++ b/makefu/1systems/fileleech.nix
@@ -25,15 +25,19 @@ in {
       ../.
       ../2configs/tinc/retiolum.nix
       ../2configs/disable_v6.nix
-      ../2configs/torrent.nix
+      # ../2configs/torrent.nix
       ../2configs/fs/sda-crypto-root.nix
 
-      ../2configs/elchos/irc-token.nix
+      #../2configs/elchos/irc-token.nix
       ../2configs/elchos/log.nix
       ../2configs/elchos/search.nix
       ../2configs/elchos/stats.nix
+      ../2configs/stats-srv.nix
 
     ];
+  systemd.services.grafana.serviceConfig.LimitNOFILE=10032;
+  systemd.services.graphiteApi.serviceConfig.LimitNOFILE=10032;
+  systemd.services.carbonCache.serviceConfig.LimitNOFILE=10032;
   makefu.server.primary-itf = "enp8s0f0";
   krebs = {
       enable = true;
@@ -44,6 +48,8 @@ in {
   # docker run -d -v /var/lib/pyload:/opt/pyload/pyload-config -v /media/crypt0/pyload:/opt/pyload/Downloads --name pyload --restart=always -p 8112:8000 -P docker-pyload
 
   virtualisation.docker.enable = true; # for pyload
+  networking.firewall.allowPing = true;
+  networking.firewall.logRefusedConnections = false;
   networking.firewall.allowedTCPPorts =  [
     51412 # torrent
     8112  # rutorrent-web
@@ -51,15 +57,39 @@ in {
     8080  # sabnzbd
     9090  # sabnzbd-ssl
     655   # tinc
+    21    # ftp
   ];
+  services.nginx.virtualHosts._download = {
+    default = true;
+    root = "/media/cryptX";
+    extraConfig = ''
+      autoindex on;
+    '';
+    basicAuth = import <secrets/kibana-auth.nix>;
+  };
   networking.firewall.allowedUDPPorts = [
     655 # tinc
     51412 # torrent
   ];
 
+  services.vsftpd.enable = true;
+  services.vsftpd.localUsers = true;
+  services.vsftpd.userlist = [ "download" ];
+  services.vsftpd.userlistEnable = true;
+  # services.vsftpd.chrootlocalUser = true;
+
   services.sabnzbd.enable = true;
   systemd.services.sabnzbd.environment.SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
 
+  services.openssh.extraConfig = let banner = pkgs.writeText "openssh-banner" ''
+    Services:
+      ssh://download@fileleech - ssh via filebitch.shack
+      ftp://download@fileleech - access to /media/cryptX
+      http://fileleech:8112 - rutorrent
+      http://fileleech:8113 - pyload
+      https://fileleech:9090 - sabnzb
+  ''; in "Banner ${banner}";
+
   boot.initrd.luks = {
     devices = let
       usbkey = name: device: {
@@ -92,11 +122,39 @@ in {
         }
 
     ;
+  users.users.download = {
+    useDefaultShell = true;
+    #  name = "download";
+    home = "/media/cryptX/";
+    #  createHome = true;
+    openssh.authorizedKeys.keys = [
+      config.krebs.users.makefu.pubkey
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC7betFnMWVeBYRhJ+2f0B5WbDdbpteIVg/BlyimXbx79R7lZ7nUq5GyMLrp7B00frUuA0su8oFFN3ODPJDstgBslBIP7kWPR2zW8NOXorrbFo3J2fKvlO77k6/wD5/M11m5nS01/aVJgAgMGLg2W12G7EMf5Wq75YsQJC/S9p8kMca589djMPRuQETu7fWq0t/Gmwq+2ELLL0csRK87LvybA92JYkAIneRnGzIlCguOXq0Vcq6pGQ1J1PfVEP76Do33X29l2hZc/+vR9ExW6s2g7fs5/5LDX9Wnq7+AEsxiEf4IOeL0hCG4/CGGCN23J+6cDrNKOP94AHO1si0O2lxFsxgNU2vdVWPNgSLottiUFBPPNEZFD++sZyutzH6PIz6D90hB2Q52X6WN9ZUtlDfQ91rHd+S2BhR6f4dAqiRDXlI5MNNDdoTT4S5R0wU/UrNwjiV/xiu/hWZYGQK7YgY4grFRblr378r8FqjLvumPDFMDLVa9eJKq1ad1x/GV5tZpsttzWj4nbixaKlZOg+TN2GHboujLx3bANz1Jqfvfto8UOeKTtA8pkb8E1PJPpBMOZcA7oHaqJrp6Vuf/SkmglHnQvGbi60OK3s61nuRmIcBiTXd+4qeAJpq1QyEDj3X/+hV0Gwz8rCo6JGkF1ETW37ZYvqU9rxNXjS+/Pfktw== jules@kvasir-2015-02-13"
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDINUD+p2yrc9KoTbCiuYhdfLlRu/eNX6BftToSMLs8O9qWQORjgXbDn8M9iUWXCHzdUZ9sm6Rz8TMdEV0jZq/nB01zYnW4NhMrt+NGtrmGqDa+eYrRZ4G7Rx8AYzM/ZSwERKX10txAVugV44xswRxWvFbCedujjXyWsxelf1ngb+Hiy9/CPuWNYEhTZs/YuvNkupCui2BuKuoSivJAkLhGk5YqwwcllCr39YXa/tFJWsgoQNcB9hwpzfhFm6Cc7m5DhmTWSVhQHEWyaas8Lukmd4v+mRY+KZpuhbomCHWzkxqzdBun8SXiiAKlgem9rtBIgeTEfz9OtOfF3/6VfqE7 toerb@mittagspause ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB0IP143FAHBHWjEEKGOnM8SSTIgNF1MJxGCMKaJvTHf momo@k2.local"
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1ZJSpBb7Cxo+c2r2JJIcbYOTm/sJxOv2NFRoDfjxGS9CCwzRbzrwJcv2d23j35mu97x3+fUvo8DyMFLvLvume2PFCijqhMDzZZvjYXZdvXA+hnh53nqZf+Pjq8Xc3tSWBHQxUokaBmZbd4LlKHh8NgKVrP2zve6OPZMzo/Es93v37KEmT8d/PfVMrQEMPZzFrCVdq2RbpdQ1nhx09zRFW7OJOazgotafjx6IYXbVq2VDnjffXInsE9ZxDzYq1cNKIH0c2BLpTd3mv76iD9i+nD6W6s48+usFQnVLt2TY1uKkfMr7043E6jBxx5kNHBe5Xxr6Zs0SkR8kKOEhMO//4ucviUYKZJn8wk2SLkAyMYVBexx8jrTdlI4xgQ7RLpSIDTCm9dfbZY/YhZDJ21lsWduQqu7DFWMe05gg4NZDjf2kwYQOzATyqISGA7ttSEPT1iymr/ffAOgLBLSqWQAteUbI2U5cnflWZGwm33JF/Pyb4S3k3/f2mIBKiRx2lsGv6mx1w0SaYRtJxDWqGYMHuFiNYbq9r/bZfLqV3Fy9kRODFJTfJh8mcTnC4zabpiQ7fnqbh1qHu0WrrBSgFW0PR2WWCJ0e5Btj1yRgXp0+d5OuxxlVInRs+l2HogdxjonMhAHrTCzJtI8UJTKXKN0FBPRDRcepeExhvNqcOUz4Kvw== me@andreaskist.de"
+			"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCo2z8zsI+YF3ho0hvYzzCZi05mNyjk4iFK08+nNFCdXSG07jmRROWzTcC2ysTKZ56XD2al2abLxy4FZfmDcu9b2zJoPnIiXv/Jw0TKeZ71OyN3bILtv+6Xj1FTJ+kAUMXBfEew7UCgZZ8u8RQsFmlhqB9XqCBXmzP7I2EM1wWSzwEAgG/k6C+Ir054JjAj+fLr/wBduD1GAe8bXXF3Ojiky8OMs2oJaoGV96mrVAtVN+ftfWSvHCK31Y/KgCoPDE4LdoTir1IRfx2pZUMPkyzRW/etXT0PKD96I+/3d1xNPzNNjFpd6GqADC3xnfY3WslNgjL7gqwsC9SlEyuT1Xkd lotho@mercurius"
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClaVl9Fwp4wdGLeTZdfy5MpJf+hM6fpL1k6UmtYXWgVYU7tgmStdlpLlbyMQspoFRtT7/76n4kPwCmM0c82xNXaJJMuWa98pwMp+bAwSSdOGAP/vjfzL/TUAX+Xtrw6ehF7r1O+zqw/E/bWt6UezKj08wDLWjByzdDQwslJV6lrGek4mmYRdgmHHeZ1oG89ePEZJZOM6jcZqv0AfIj0NID3ir9Z0kz9uSSXb1279Qt4953mfjs5xwhtc1B7vrxJ3qtTZUsBoAkUkLeulUEIjkfn60wvDGu/66GP5ZClXyk2gck/ZNmtFYrQoqx9EtF1KK02cC17A0nfRySQy5BnfWn root@filebitch"
+    ];
+  };
   makefu.snapraid = {
     enable = true;
     disks = map toMapper [ 0 1 2 3 4 5 6 ];
     parity = toMapper 7;
   };
+  networking.nameservers = [ "8.8.8.8" ];
+  #networking.interfaces.enp6s0f0.ip4 = [{
+  #    address = "151.217.173.20";
+  #    prefixLength = 22;
+  #}];
+  #networking.defaultGateway = "151.217.172.1";
+  networking.interfaces.enp8s0f1.ip4 = [{
+      address = "192.168.126.1";
+      prefixLength = 24;
+  }];
+  #interfaces.enp6s0f1.ip4 = [{
+  #  address = external-ip;
+  #  prefixLength = 22;
+  #}];
 
   boot.loader.grub.device = rootDisk;