From 41c433183427bb878be36c9609d9b0354ae7f425 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 25 Sep 2019 15:11:14 +0200 Subject: [PATCH] ma gum: move sickbeard to 2configs, update shares, disable events-publisher --- makefu/1systems/gum/config.nix | 32 +++++++--------------- makefu/1systems/gum/hardware-config.nix | 5 ++++ makefu/2configs/sickbeard/default.nix | 20 ++++++++++++++ makefu/2configs/sickbeard/sickgear.nix | 35 +++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 makefu/2configs/sickbeard/default.nix create mode 100644 makefu/2configs/sickbeard/sickgear.nix diff --git a/makefu/1systems/gum/config.nix b/makefu/1systems/gum/config.nix index 15e9965e2..3b084d35a 100644 --- a/makefu/1systems/gum/config.nix +++ b/makefu/1systems/gum/config.nix @@ -81,7 +81,7 @@ in { # ci # - + # @@ -90,30 +90,12 @@ in { # services # - { - krebs.exim.enable = mkForce false; - } + { krebs.exim.enable = mkForce false; } # sharing - { 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; } # @@ -121,7 +103,6 @@ in { # # - ## network @@ -154,6 +135,8 @@ in { + + @@ -162,6 +145,11 @@ in { # sharing + { krebs.airdcpp.dcpp.shares = { + download.path = config.makefu.dl-dir + "/finished"; + sorted.path = config.makefu.dl-dir + "/sorted"; + }; + } ## Temporary: diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix index e49b621e7..2d7efe9cf 100644 --- a/makefu/1systems/gum/hardware-config.nix +++ b/makefu/1systems/gum/hardware-config.nix @@ -69,6 +69,11 @@ in { fsType = "ext4"; options = [ "nofail" ]; }; + fileSystems."/var/www/o.euer.krebsco.de" = { + device = "/dev/nixos/nextcloud"; + fsType = "ext4"; + options = [ "nofail" ]; + }; fileSystems."/var/lib/borgbackup" = { device = "/dev/nixos/backup"; fsType = "ext4"; diff --git a/makefu/2configs/sickbeard/default.nix b/makefu/2configs/sickbeard/default.nix new file mode 100644 index 000000000..629558b89 --- /dev/null +++ b/makefu/2configs/sickbeard/default.nix @@ -0,0 +1,20 @@ +{ }: +{ services.sickbeard = let + pkg = pkgs.callPackage ./sickgear.nix {}; +in { + enable = true; + package = pkg; + 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" ]; + } diff --git a/makefu/2configs/sickbeard/sickgear.nix b/makefu/2configs/sickbeard/sickgear.nix new file mode 100644 index 000000000..1b7a57e8b --- /dev/null +++ b/makefu/2configs/sickbeard/sickgear.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python2, makeWrapper }: + +let + pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); +in stdenv.mkDerivation rec { + pname = "sickgear"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "SickGear"; + repo = "SickGear"; + rev = "release_${version}"; + sha256 = "1zg95szvfbmwinx1z5nlbmyck7ximvyna0x71yflmadkgf88nv0k"; + }; + + dontBuild = true; + doCheck = false; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ pythonEnv ]; + + installPhase = '' + mkdir -p $out/bin + cp -R {autoProcessTV,gui,lib,sickbeard,sickgear.py,SickBeard.py} $out/ + + makeWrapper $out/SickBeard.py $out/bin/sickgear + ''; + + meta = with stdenv.lib; { + description = "The most reliable stable TV fork of the great Sick-Beard to fully automate TV enjoyment with innovation"; + license = licenses.gpl3; + homepage = "https://github.com/SickGear/SickGear"; + maintainers = with stdenv.lib.maintainers; [ rembo10 ]; + }; +}