diff options
| author | makefu <github@syntax-fehler.de> | 2021-12-10 09:41:03 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2021-12-10 09:41:03 +0100 |
| commit | c572184de0ba741e7b97939d9ee65d7b6e4b590e (patch) | |
| tree | 6607df31c18f13bcb62762f16d737b0b387542cc /makefu | |
| parent | 42f9caa6f7c4fbc1b508b9e077be926ed12876c6 (diff) | |
| parent | ca36cf99ac38b35b748ad7d191ef58bfe05ebdeb (diff) | |
Merge branch '21.11'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/omo/config.nix | 2 | ||||
| -rw-r--r-- | makefu/2configs/home/ham/mqtt.nix | 6 | ||||
| -rw-r--r-- | makefu/2configs/home/music.nix (renamed from makefu/2configs/home/airsonic.nix) | 20 |
3 files changed, 15 insertions, 13 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix index 0b4aaacb3..3a216ea76 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/ham/mqtt.nix b/makefu/2configs/home/ham/mqtt.nix index c90afff4a..5e668e7a0 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; diff --git a/makefu/2configs/home/airsonic.nix b/makefu/2configs/home/music.nix index c6112be26..59f6d9170 100644 --- a/makefu/2configs/home/airsonic.nix +++ b/makefu/2configs/home/music.nix @@ -1,19 +1,21 @@ { config, ... }: let internal-ip = "192.168.111.11"; - port = 4040; + port = 4533; in { - # networking.firewall.allowedTCPPorts = [ 4040 ]; - services.airsonic = { - enable = true; - listenAddress = "0.0.0.0"; - inherit port; + services.navidrome.enable = true; + services.navidrome.settings = { + MusicFolder = "/media/cryptX/music"; + Address = "0.0.0.0"; }; - state = [ config.services.airsonic.home ]; - services.nginx.virtualHosts."airsonic" = { + + state = [ "/var/lib/navidrome" ]; + # networking.firewall.allowedTCPPorts = [ 4040 ]; + # state = [ config.services.airsonic.home ]; + services.nginx.virtualHosts."navidrome" = { serverAliases = [ - "airsonic.lan" + "navidrome.lan" "music" "music.lan" "musik" "musik.lan" ]; |