about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authormarkuskowa <markus.kowalewski@gmail.com>2019-04-12 20:59:13 +0200
committerGitHub <noreply@github.com>2019-04-12 20:59:13 +0200
commit7d363d46ba845abf5a5a2efc90b898abdeeb9d9a (patch)
tree5169aa9b82a01be0260c371d4567e1a5bd893a4a /nixos
parent7edf2db0fddc64e53e06c95fc0f1efcfe3f714f9 (diff)
parent31884f788ed315147417757bccf709b2f1ac424f (diff)
downloadnixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.tar
nixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.tar.gz
nixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.tar.bz2
nixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.tar.lz
nixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.tar.xz
nixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.tar.zst
nixlib-7d363d46ba845abf5a5a2efc90b898abdeeb9d9a.zip
Merge pull request #59362 from matthiasbeyer/ympd-port-int
ympd service: Allow webPort to be int
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/audio/ympd.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix
index d34c1c9d83cc..919b76622510 100644
--- a/nixos/modules/services/audio/ympd.nix
+++ b/nixos/modules/services/audio/ympd.nix
@@ -15,7 +15,7 @@ in {
       enable = mkEnableOption "ympd, the MPD Web GUI";
 
       webPort = mkOption {
-        type = types.string;
+        type = types.either types.str types.port; # string for backwards compat
         default = "8080";
         description = "The port where ympd's web interface will be available.";
         example = "ssl://8080:/path/to/ssl-private-key.pem";
@@ -49,7 +49,7 @@ in {
     systemd.services.ympd = {
       description = "Standalone MPD Web GUI written in C";
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${cfg.webPort} --user nobody";
+      serviceConfig.ExecStart = "${pkgs.ympd}/bin/ympd --host ${cfg.mpd.host} --port ${toString cfg.mpd.port} --webport ${toString cfg.webPort} --user nobody";
     };
 
   };