Merge remote-tracking branch 'orange/master'

1 files changed, 0 insertions, 174 deletions

diff --git a/makefu/1systems/fileleech/config.nix b/makefu/1systems/fileleech/config.nix
deleted file mode 100644
index 7e9dea9ec..000000000
--- a/makefu/1systems/fileleech/config.nix
+++ /dev/null
@@ -1,174 +0,0 @@
-{ config, pkgs, lib, ... }:
-let
-  toMapper = id: "/media/crypt${builtins.toString id}";
-  byid = dev: "/dev/disk/by-id/" + dev;
-  keyFile = byid "usb-Intuix_DiskOnKey_09A07360336198F8-0:0";
-  rootDisk = byid "ata-INTEL_SSDSA2M080G2GC_CVPO003402PB080BGN";
-  rootPartition = rootDisk + "-part3";
-
-  dataDisks =  let
-    idpart = dev: byid  dev + "-part1";
-  in [
-    { name = "crypt0"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GDLJEF";}
-    { name = "crypt1"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GGWG8F";}
-    { name = "crypt2"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GH5NAF";}
-    { name = "crypt3"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GJWGDF";}
-    { name = "crypt4"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GKKXHF";}
-    { name = "crypt5"; device = idpart "scsi-1ATA_HUA722020ALA330_B9GKKXVF";}
-    { name = "crypt6"; device = idpart "scsi-1ATA_HUA722020ALA330_YAJJ8WRV";}
-    { name = "crypt7"; device = idpart "scsi-1ATA_HUA722020ALA330_YBKTUS4F";} # parity
-  ];
-
-  disks = [ { name = "luksroot"; device = rootPartition; } ] ++ dataDisks;
-in {
-    imports = [
-      <stockholm/makefu>
-      <stockholm/makefu/2configs/tinc/retiolum.nix>
-      <stockholm/makefu/2configs/disable_v6.nix>
-      <stockholm/makefu/2configs/torrent.nix>
-      <stockholm/makefu/2configs/fs/sda-crypto-root.nix>
-
-      #<stockholm/makefu/2configs/elchos/irc-token.nix>
-      # <stockholm/makefu/2configs/elchos/log.nix>
-      # <stockholm/makefu/2configs/elchos/search.nix>
-      # <stockholm/makefu/2configs/elchos/stats.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;
-      build.host = config.krebs.hosts.fileleech;
-  };
-  # git clone https://github.com/makefu/docker-pyload
-  # docker build .
-  # 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
-    8113  # pyload
-    8080  # sabnzbd
-    9090  # sabnzbd-ssl
-    655   # tinc
-    21    # ftp
-  ];
-  services.nginx.virtualHosts._download = {
-    default = true;
-    root = config.makefu.dl-dir;
-    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";
-
-  # TODO use users.motd and pam.services.sshd.showMotd
-  services.openssh.extraConfig = let banner = pkgs.writeText "openssh-banner" ''
-    Services:
-      ssh://download@fileleech - ssh via filebitch
-      ftp://download@fileleech - access to ${config.makefu.dl-dir}
-      http://fileleech:8112 - rutorrent
-      http://fileleech:8113 - pyload
-      https://fileleech:9090 - sabnzb
-  ''; in "Banner ${banner}";
-
-  boot.initrd.luks = {
-    devices = let
-      usbkey = name: device: {
-        inherit name device keyFile;
-        keyFileSize = 4096;
-        allowDiscards = true;
-      };
-    in builtins.map (x: usbkey x.name x.device) disks;
-  };
-  environment.systemPackages = with pkgs;[ mergerfs ];
-
-  fileSystems = let
-    cryptMount = name:
-      { "/media/${name}" = { device = "/dev/mapper/${name}"; fsType = "xfs"; };};
-  in  cryptMount "crypt0"
-    // cryptMount "crypt1"
-    // cryptMount "crypt2"
-    // cryptMount "crypt3"
-    // cryptMount "crypt4"
-    // cryptMount "crypt5"
-    // cryptMount "crypt6"
-    // cryptMount "crypt7"
-
-    # this entry sometimes creates issues
-    // { "/media/cryptX" = {
-          device = (lib.concatMapStringsSep ":" (d: (toMapper d)) [ 0 1 2 3 4 5 6 ]);
-          fsType = "mergerfs";
-          noCheck = true;
-          options = [ "defaults" "nofail" "allow_other" "nonempty" ]; };
-        }
-
-    ;
-  makefu.dl-dir = "/media/cryptX";
-  users.users.download = {
-    useDefaultShell = true;
-    #  name = "download";
-    #  createHome = true;
-    openssh.authorizedKeys.keys = [
-      config.krebs.users.makefu.pubkey
-      config.krebs.users.lass.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" ];
-  # SPF
-  networking.defaultGateway = "151.217.176.1";
-  networking.interfaces.enp6s0f0.ipv4.addresses = [{
-      address = "151.217.178.63";
-      prefixLength = 22;
-  }];
-
-  # Gigabit
-  networking.interfaces.enp8s0f1.ipv4.addresses = [{
-      address = "192.168.126.1";
-      prefixLength = 24;
-  }];
-
-  #interfaces.enp6s0f1.ip4 = [{
-  #  address = external-ip;
-  #  prefixLength = 22;
-  #}];
-
-  boot.loader.grub.device = rootDisk;
-
-  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "aacraid" "usb_storage" "usbhid" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  # http://blog.hackathon.de/using-unsupported-sfp-modules-with-linux.html
-  boot.extraModprobeConfig = ''
-    options ixgbe allow_unsupported_sfp=1
-  '';
-}