summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2019-09-25 15:11:14 +0200
committermakefu <github@syntax-fehler.de>2019-09-25 15:11:14 +0200
commit41c433183427bb878be36c9609d9b0354ae7f425 (patch)
tree4a2ca052cb7d2c2cb13412bf7f1f50335da50792
parent1c7e1827569d4f51bd331a3784ae7a3fba069377 (diff)
ma gum: move sickbeard to 2configs, update shares, disable events-publisher
-rw-r--r--makefu/1systems/gum/config.nix32
-rw-r--r--makefu/1systems/gum/hardware-config.nix5
-rw-r--r--makefu/2configs/sickbeard/default.nix20
-rw-r--r--makefu/2configs/sickbeard/sickgear.nix35
4 files changed, 70 insertions, 22 deletions
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
# <stockholm/makefu/2configs/exim-retiolum.nix>
<stockholm/makefu/2configs/git/cgit-retiolum.nix>
- <stockholm/makefu/2configs/shack/events-publisher>
+ # <stockholm/makefu/2configs/shack/events-publisher>
<stockholm/makefu/2configs/shack/gitlab-runner>
<stockholm/makefu/2configs/remote-build/slave.nix>
<stockholm/makefu/2configs/remote-build/aarch64-community.nix>
@@ -90,30 +90,12 @@ in {
# services
# <stockholm/makefu/2configs/sabnzbd.nix>
<stockholm/makefu/2configs/mail/mail.euer.nix>
- {
- krebs.exim.enable = mkForce false;
- }
+ { krebs.exim.enable = mkForce false; }
# 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" ];
- }
+ <stockholm/makefu/2configs/sickbeard>
{ nixpkgs.config.allowUnfree = true; }
#<stockholm/makefu/2configs/retroshare.nix>
@@ -121,7 +103,6 @@ in {
#<stockholm/makefu/2configs/syncthing.nix>
# <stockholm/makefu/2configs/opentracker.nix>
- <stockholm/makefu/2configs/shiori.nix>
## network
<stockholm/makefu/2configs/vpn/openvpn-server.nix>
@@ -154,6 +135,8 @@ in {
<stockholm/makefu/2configs/deployment/graphs.nix>
<stockholm/makefu/2configs/deployment/owncloud.nix>
<stockholm/makefu/2configs/deployment/boot-euer.nix>
+ <stockholm/makefu/2configs/shiori.nix>
+
<stockholm/makefu/2configs/bgt/download.binaergewitter.de.nix>
<stockholm/makefu/2configs/bgt/hidden_service.nix>
<stockholm/makefu/2configs/bgt/backup.nix>
@@ -162,6 +145,11 @@ in {
# sharing
<stockholm/makefu/2configs/dcpp/airdcpp.nix>
+ { krebs.airdcpp.dcpp.shares = {
+ download.path = config.makefu.dl-dir + "/finished";
+ sorted.path = config.makefu.dl-dir + "/sorted";
+ };
+ }
<stockholm/makefu/2configs/dcpp/hub.nix>
## 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 ];
+ };
+}