Merge branch '21.11'

This commit is contained in:
makefu 2021-12-10 09:41:03 +01:00
commit c572184de0
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 15 additions and 13 deletions

View File

@ -94,7 +94,7 @@ in {
<stockholm/makefu/2configs/virtualisation/docker.nix> <stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/bluetooth-mpd.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/photoprism.nix>
# <stockholm/makefu/2configs/home/metube.nix> # <stockholm/makefu/2configs/home/metube.nix>
<stockholm/makefu/2configs/home/ham> <stockholm/makefu/2configs/home/ham>

View File

@ -12,15 +12,15 @@
omitPasswordAuth = false; omitPasswordAuth = false;
users.sensor = { users.sensor = {
hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg=="; hashedPassword = "$6$2DXU7W1bvqXPqxkF$vtdz5KTd/T09hmoc9LjgEGFjvpwQbQth6vlVcr5hJNLgcBHv4U03YCKC8TKXbmQAa8xiJ76xJIg25kcL+KI3tg==";
acl = [ "topic readwrite #" ]; acl = [ "readwrite #" ];
}; };
users.hass = { users.hass = {
hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA=="; hashedPassword = "$6$SHuYGrE5kPSUc/hu$EomZ0KBy+vkxLt/6eJkrSBjYblCCeMjhDfUd2mwqXYJ4XsP8hGmZ59mMlmBCd3AvlFYQxb4DT/j3TYlrqo7cDA==";
acl = [ "topic readwrite #" ]; acl = [ "readwrite #" ];
}; };
users.stats = { users.stats = {
hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA=="; hashedPassword = "$6$j4H7KXD/YZgvgNmL$8e9sUKRXowDqJLOVgzCdDrvDE3+4dGgU6AngfAeN/rleGOgaMhee2Mbg2KS5TC1TOW3tYbk9NhjLYtjBgfRkoA==";
acl = [ "topic read #" ]; acl = [ "read #" ];
}; };
settings = { settings = {
allow_anonymous = false; allow_anonymous = false;

View File

@ -1,19 +1,21 @@
{ config, ... }: { config, ... }:
let let
internal-ip = "192.168.111.11"; internal-ip = "192.168.111.11";
port = 4040; port = 4533;
in in
{ {
# networking.firewall.allowedTCPPorts = [ 4040 ]; services.navidrome.enable = true;
services.airsonic = { services.navidrome.settings = {
enable = true; MusicFolder = "/media/cryptX/music";
listenAddress = "0.0.0.0"; Address = "0.0.0.0";
inherit port;
}; };
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 = [ serverAliases = [
"airsonic.lan" "navidrome.lan"
"music" "music.lan" "music" "music.lan"
"musik" "musik.lan" "musik" "musik.lan"
]; ];