forked from c3d2/nix-config
Move generic MPD satellite config to /mpd.nix
This commit is contained in:
parent
7e5fa1bdfd
commit
3d149702ed
|
@ -14,6 +14,7 @@ in {
|
||||||
../../lib/admins.nix
|
../../lib/admins.nix
|
||||||
../../common.nix
|
../../common.nix
|
||||||
../../users.nix
|
../../users.nix
|
||||||
|
../../mpd.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
|
@ -55,6 +56,7 @@ in {
|
||||||
home-manager
|
home-manager
|
||||||
mumble
|
mumble
|
||||||
ncpamixer
|
ncpamixer
|
||||||
|
ffmpeg
|
||||||
];
|
];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
@ -76,7 +78,6 @@ in {
|
||||||
4713 # PulseAudio
|
4713 # PulseAudio
|
||||||
631 # cups
|
631 # cups
|
||||||
80 443 # Web/ympd
|
80 443 # Web/ympd
|
||||||
6600 # mpd
|
|
||||||
5000 # shairport
|
5000 # shairport
|
||||||
];
|
];
|
||||||
networking.firewall.allowedUDPPorts = [
|
networking.firewall.allowedUDPPorts = [
|
||||||
|
@ -184,15 +185,9 @@ in {
|
||||||
|
|
||||||
# vater hoerte, dass menschen im space gern mpd fuer das abspielen von musik erwarten wuerden
|
# vater hoerte, dass menschen im space gern mpd fuer das abspielen von musik erwarten wuerden
|
||||||
#### https://nixos.org/nixos/options.html#services.mpd.enable
|
#### https://nixos.org/nixos/options.html#services.mpd.enable
|
||||||
services.mpd = {
|
# See ../../mpd.nix
|
||||||
enable=true;
|
services.mpd.extraConfig =
|
||||||
dbFile = null;
|
''
|
||||||
network.listenAddress = "any";
|
|
||||||
musicDirectory = "/mnt/storage/Music";
|
|
||||||
#### musicDirectory = "nfs://storage.hq.c3d2.de:/mnt/zroot/storage/rpool/Music";
|
|
||||||
extraConfig = ''
|
|
||||||
#### music_directory "nfs://storage.hq.c3d2.de:/mnt/zroot/storage/rpool/Music"
|
|
||||||
####
|
|
||||||
audio_output {
|
audio_output {
|
||||||
type "pulse"
|
type "pulse"
|
||||||
name "/proc"
|
name "/proc"
|
||||||
|
@ -203,25 +198,7 @@ in {
|
||||||
name "SDK"
|
name "SDK"
|
||||||
server "dacbert.hq.c3d2.de"
|
server "dacbert.hq.c3d2.de"
|
||||||
}
|
}
|
||||||
|
'';
|
||||||
#### mpd startet bei der option nicht mehr
|
|
||||||
database {
|
|
||||||
plugin "proxy"
|
|
||||||
#### vater was here!
|
|
||||||
#### jail (auf storage)
|
|
||||||
#### externe erstellung der datenbank von mpd in der naehe der ablage der daten
|
|
||||||
host "172.22.99.98"
|
|
||||||
}
|
|
||||||
|
|
||||||
#### ausschalten der automatischen aktualisierung der datenbank von mpd
|
|
||||||
#### angeblich gibt es 2019-02-13 probleme, die zum absturz vom dienst mpd fuehren
|
|
||||||
#### wenn das problem behoben ist, dann kann die option wieder entfernt werden
|
|
||||||
auto_update "no"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# mpd likes to crash a lot while indexing, so...
|
|
||||||
systemd.services.mpd.serviceConfig.Restart="on-failure";
|
|
||||||
|
|
||||||
services.caddy = {
|
services.caddy = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -240,14 +217,11 @@ in {
|
||||||
|
|
||||||
|
|
||||||
fileSystems."/mnt/storage" = {
|
fileSystems."/mnt/storage" = {
|
||||||
device = "storage.hq.c3d2.de:/mnt/zroot/storage/rpool";
|
#device = "storage-ng.hq.c3d2.de:/mnt/zroot/storage/rpool";
|
||||||
fsType = "nfs";
|
#device = "storage-ng.hq.c3d2.de:/c3d2/rpool";
|
||||||
};
|
device = "172.22.99.13:6789,172.22.99.15:6789,172.22.99.16:6789:/c3d2/rpool";
|
||||||
|
fsType = "ceph";
|
||||||
#### nur zum spielen mit dem bereitstellen von einer per nfs angebundenen datei als datenbank fuer mpd
|
options = [ "rw" "relatime" "name=public" "secret=AQDgER1chJcMORAAK1ysRTN59B5x/MyniwVXFQ==" "acl" "wsize=16777216" "_netdev" ];
|
||||||
fileSystems."/mnt/service-data/mpd_index" = {
|
|
||||||
device = "storage.hq.c3d2.de:/mnt/zroot/iocage/jails/mpd_index/root/var/mpd/.mpd";
|
|
||||||
fsType = "nfs";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# MPD music playing daemon with webinterface
|
# MPD music playing daemon with webinterface
|
||||||
|
@ -265,5 +239,4 @@ in {
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,5 +11,7 @@
|
||||||
screen
|
screen
|
||||||
tmux
|
tmux
|
||||||
pulsemixer
|
pulsemixer
|
||||||
|
ncpamixer
|
||||||
|
python35.withPackages(ps: with ps; [ youtube-dl ])
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
4
mpd.nix
4
mpd.nix
|
@ -12,7 +12,7 @@ let
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
database {
|
database {
|
||||||
plugin "proxy"
|
plugin "proxy"
|
||||||
host "172.22.99.20"
|
host "storage-ng.hq.c3d2.de"
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
@ -24,5 +24,5 @@ in
|
||||||
});
|
});
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts =
|
networking.firewall.allowedTCPPorts =
|
||||||
[ config.mpd.network.port ];
|
[ config.services.mpd.network.port ];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user