From eb837a18a5bb0c77cb68681822d62b82734ec38a Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 5 Mar 2020 13:55:08 +0800
Subject: [PATCH] syncthing: use nextcloud for fotos and music on smartphone
 now

---
 configs/pepe/syncthing.nix      |  4 ---
 configs/sputnik/nginx.nix       | 50 ++++++++++++++++-----------------
 configs/sterni/syncthing.nix    |  8 ------
 configs/workhorse/nextcloud.nix | 10 ++++---
 configs/workout/syncthing.nix   |  4 ---
 system/all/syncthing.nix        | 12 --------
 6 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/configs/pepe/syncthing.nix b/configs/pepe/syncthing.nix
index 80ced56..db34dd0 100644
--- a/configs/pepe/syncthing.nix
+++ b/configs/pepe/syncthing.nix
@@ -50,10 +50,6 @@
           enable = true;
           path = "/home/palo/pepe-schasch";
         };
-        smartphone-fotos = {
-          enable = true;
-          path = "/home/palo/smartphone-fotos";
-        };
         workout-pepe = {
           enable = true;
           path = "/home/palo/pepe-workout";
diff --git a/configs/sputnik/nginx.nix b/configs/sputnik/nginx.nix
index b06ebec..de5ae9e 100644
--- a/configs/sputnik/nginx.nix
+++ b/configs/sputnik/nginx.nix
@@ -158,31 +158,31 @@
         };
       };
 
-      "nextcloud.gaykraft.com" = {
-        listen = [
-          {
-            addr = "0.0.0.0";
-            port = 4443;
-            ssl = true;
-          }
-          {
-            addr = "0.0.0.0";
-            port = 80;
-            ssl = false;
-          }
-        ];
-        forceSSL = true;
-        enableACME = true;
-        locations."/" = {
-          proxyPass = "http://nextcloud.workhorse.private";
-          extraConfig = ''
-            sub_filter "http://nextcloud.gaykraft.com" "https://nextcloud.gaykraft.com";
-            sub_filter "nextcloud.workhorse.private" "nextcloud.gaykraft.com";
-            # used for view/edit office file via Office Online Server
-            client_max_body_size 0;
-          '';
-        };
-      };
+      #"nextcloud.gaykraft.com" = {
+      #  listen = [
+      #    {
+      #      addr = "0.0.0.0";
+      #      port = 4443;
+      #      ssl = true;
+      #    }
+      #    {
+      #      addr = "0.0.0.0";
+      #      port = 80;
+      #      ssl = false;
+      #    }
+      #  ];
+      #  forceSSL = true;
+      #  enableACME = true;
+      #  locations."/" = {
+      #    proxyPass = "http://nextcloud.workhorse.private";
+      #    extraConfig = ''
+      #      sub_filter "http://nextcloud.gaykraft.com" "https://nextcloud.gaykraft.com";
+      #      sub_filter "nextcloud.workhorse.private" "nextcloud.gaykraft.com";
+      #      # used for view/edit office file via Office Online Server
+      #      client_max_body_size 0;
+      #    '';
+      #  };
+      #};
 
       "seafile.gaykraft.com" = {
         listen = [
diff --git a/configs/sterni/syncthing.nix b/configs/sterni/syncthing.nix
index fbed27a..c275594 100644
--- a/configs/sterni/syncthing.nix
+++ b/configs/sterni/syncthing.nix
@@ -38,14 +38,6 @@
           enable = true;
           path = "/home/palo/samples";
         };
-        smartphone-fotos = {
-          enable = true;
-          path = "/home/palo/smartphone-fotos";
-        };
-        smartphone-music = {
-          enable = true;
-          path = "/home/palo/smartphone-music";
-        };
 
         # no need to be encrypted
         # -----------------------
diff --git a/configs/workhorse/nextcloud.nix b/configs/workhorse/nextcloud.nix
index 9a76637..23b2af1 100644
--- a/configs/workhorse/nextcloud.nix
+++ b/configs/workhorse/nextcloud.nix
@@ -31,12 +31,12 @@
         autoUpdateApps.enable = true;
         config.adminpassFile = toString <secrets/nextcloud/rootpassword>;
         nginx.enable = true;
-        hostName = "nextcloud.workhorse.private";
+        hostName = "nextcloud.ingolf-wagner.de";
         logLevel = 2;
         config.overwriteProtocol = "https";
         config.extraTrustedDomains = [
           "nextcloud.ingolf-wagner.de"
-          "nextcloud.gaykraft.com"
+          #"nextcloud.gaykraft.com"
           "192.168.100.11"
         ];
       };
@@ -59,8 +59,10 @@
     recommendedProxySettings = true;
     virtualHosts = {
       "nextcloud.workhorse.private" = {
-        serverAliases =
-          [ "nextcloud.ingolf-wagner.de" "nextcloud.gaykraft.com" ];
+        serverAliases = [
+          "nextcloud.ingolf-wagner.de"
+          # "nextcloud.gaykraft.com"
+        ];
         locations."/" = {
           proxyPass = "http://192.168.100.11";
           extraConfig = ''
diff --git a/configs/workout/syncthing.nix b/configs/workout/syncthing.nix
index b01988a..7e3b237 100644
--- a/configs/workout/syncthing.nix
+++ b/configs/workout/syncthing.nix
@@ -62,10 +62,6 @@
           enable = true;
           path = "/home/palo/samples";
         };
-        smartphone-fotos = {
-          enable = true;
-          path = "/home/palo/smartphone-fotos";
-        };
         video-material = {
           enable = true;
           path = "/home/palo/video-material";
diff --git a/system/all/syncthing.nix b/system/all/syncthing.nix
index 943507b..552ca53 100644
--- a/system/all/syncthing.nix
+++ b/system/all/syncthing.nix
@@ -137,18 +137,6 @@ with lib; {
           watch = false;
           devices = [ "workhorse" "porani" ];
         };
-        smartphone-music = {
-          enable = lib.mkDefault false;
-          id = "0vjze-xvs8n";
-          watch = false;
-          devices = [ "sterni" "smartphone" ];
-        };
-        smartphone-fotos = {
-          enable = lib.mkDefault false;
-          id = "e5823_jtbr-photos";
-          watch = false;
-          devices = [ "sterni" "workout" "pepe" "smartphone" ];
-        };
         video-material = {
           enable = lib.mkDefault false;
           id = "wgkun-fec5h";