From 023a9749fced678f6108991170df510a518fdcec Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 10 Dec 2021 08:48:36 +0100
Subject: ma music: cleanup, use navidrome

---
 makefu/1systems/omo/config.nix    |  2 +-
 makefu/2configs/home/airsonic.nix | 29 -----------------------------
 makefu/2configs/home/music.nix    | 31 +++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 30 deletions(-)
 delete mode 100644 makefu/2configs/home/airsonic.nix
 create mode 100644 makefu/2configs/home/music.nix

(limited to 'makefu')

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 0b4aaacb..3a216ea7 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -94,7 +94,7 @@ in {
       <stockholm/makefu/2configs/virtualisation/docker.nix>
       <stockholm/makefu/2configs/bluetooth-mpd.nix>
 
-      <stockholm/makefu/2configs/home/airsonic.nix>
+      <stockholm/makefu/2configs/home/music.nix>
       <stockholm/makefu/2configs/home/photoprism.nix>
       # <stockholm/makefu/2configs/home/metube.nix>
       <stockholm/makefu/2configs/home/ham>
diff --git a/makefu/2configs/home/airsonic.nix b/makefu/2configs/home/airsonic.nix
deleted file mode 100644
index c6112be2..00000000
--- a/makefu/2configs/home/airsonic.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ config, ... }:
-let
-  internal-ip = "192.168.111.11";
-  port = 4040;
-in
-{
-  # networking.firewall.allowedTCPPorts = [ 4040 ];
-  services.airsonic = {
-    enable = true;
-    listenAddress = "0.0.0.0";
-    inherit port;
-  };
-  state = [ config.services.airsonic.home ];
-  services.nginx.virtualHosts."airsonic" = {
-    serverAliases = [
-              "airsonic.lan"
-      "music"  "music.lan"
-      "musik" "musik.lan"
-    ];
-
-    locations."/".proxyPass = "http://localhost:${toString port}";
-    locations."/".proxyWebsockets = true;
-    extraConfig = ''
-      if ( $server_addr != "${internal-ip}" ) {
-        return 403;
-      }
-    '';
-  };
-}
diff --git a/makefu/2configs/home/music.nix b/makefu/2configs/home/music.nix
new file mode 100644
index 00000000..59f6d917
--- /dev/null
+++ b/makefu/2configs/home/music.nix
@@ -0,0 +1,31 @@
+{ config, ... }:
+let
+  internal-ip = "192.168.111.11";
+  port = 4533;
+in
+{
+  services.navidrome.enable = true;
+  services.navidrome.settings = {
+    MusicFolder = "/media/cryptX/music";
+    Address = "0.0.0.0";
+  };
+
+  state = [ "/var/lib/navidrome" ];
+  # networking.firewall.allowedTCPPorts = [ 4040 ];
+  # state = [ config.services.airsonic.home ];
+  services.nginx.virtualHosts."navidrome" = {
+    serverAliases = [
+              "navidrome.lan"
+      "music"  "music.lan"
+      "musik" "musik.lan"
+    ];
+
+    locations."/".proxyPass = "http://localhost:${toString port}";
+    locations."/".proxyWebsockets = true;
+    extraConfig = ''
+      if ( $server_addr != "${internal-ip}" ) {
+        return 403;
+      }
+    '';
+  };
+}
-- 
cgit v1.2.3


From ca36cf99ac38b35b748ad7d191ef58bfe05ebdeb Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 10 Dec 2021 08:48:58 +0100
Subject: ma home/mqtt: fix acl

---
 makefu/2configs/home/ham/mqtt.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'makefu')

diff --git a/makefu/2configs/home/ham/mqtt.nix b/makefu/2configs/home/ham/mqtt.nix
index c90afff4..5e668e7a 100644
--- a/makefu/2configs/home/ham/mqtt.nix
+++ b/makefu/2configs/home/ham/mqtt.nix
@@ -12,15 +12,15 @@
         omitPasswordAuth = false;
         users.sensor = {
           hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
-          acl = [ "topic readwrite #" ];
+          acl = [ "readwrite #" ];
         };
         users.hass = {
           hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA==";
-          acl = [ "topic readwrite #" ];
+          acl = [ "readwrite #" ];
         };
         users.stats = {
           hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA==";
-          acl = [ "topic read #" ];
+          acl = [ "read #" ];
         };
         settings = {
           allow_anonymous = false;
-- 
cgit v1.2.3