diff options
| author | Kjetil Ørbekk <kj@orbekk.com> | 2018-03-28 14:57:20 -0400 |
|---|---|---|
| committer | Kjetil Ørbekk <kj@orbekk.com> | 2018-03-28 14:57:20 -0400 |
| commit | 6d4b55a57fb7fc479d9b554f5a7e9c9f7cb0ec36 (patch) | |
| tree | 15ea952bec917ec89899d2ffce5284e976390abf | |
| parent | 73a63278c192be1d1bc02d531a250d7e32671f15 (diff) | |
add mpd service
| -rw-r--r-- | config/web-server.nix | 11 | ||||
| -rw-r--r-- | data/aliases.nix | 2 | ||||
| -rw-r--r-- | data/dns/db.orbekk.shared.zone | 2 | ||||
| -rw-r--r-- | machines/dragon.nix | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/config/web-server.nix b/config/web-server.nix index 2e0d56f..4d5f5f1 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, ... }: + let mpd_loc = (import ../data/aliases.nix).services.mpd; + mpdweb_loc = (import ../data/aliases.nix).services.mpdweb; + in { imports = [ ./orbekk-pkgs.nix ]; @@ -47,6 +50,9 @@ alias = "/var/www/munin/"; extraConfig = "autoindex on;"; }; + locations."/mpd" = { + proxyPass = "http://${mpd_loc.address}:${toString mpd_loc.port}/"; + }; #locations."/systemd" = { # proxyPass = "http://10.0.20.15:11105/"; #}; @@ -64,6 +70,11 @@ proxyPass = "http://10.0.20.15:11102"; }; }; + "ympd.orbekk.com" = template // { + locations."/" = { + proxyPass = "http://${mpdweb_loc.address}:${toString mpdweb_loc.port}/"; + }; + }; "git.orbekk.com" = template // { locations."/".proxyPass = "http://10.0.20.2:11103"; }; diff --git a/data/aliases.nix b/data/aliases.nix index 37a291c..28e1ded 100644 --- a/data/aliases.nix +++ b/data/aliases.nix @@ -14,5 +14,7 @@ rec { linoquotes = { address = ip.raigh; port = 11106; }; stats = { home = "/var/lib/stats"; }; wireguard = { port = 11107; }; + mpd = { address = ip.dragon; port = 11108; }; + mpdweb = { address = ip.dragon; port = 11109; }; }; } diff --git a/data/dns/db.orbekk.shared.zone b/data/dns/db.orbekk.shared.zone index 781c936..c5e7f2f 100644 --- a/data/dns/db.orbekk.shared.zone +++ b/data/dns/db.orbekk.shared.zone @@ -19,12 +19,12 @@ smtp IN CNAME semeai dynamic IN CNAME orbekk.duckdns.org. home IN CNAME orbekk.duckdns.org. -minecraft IN CNAME orbekk.duckdns.org. terraria IN CNAME orbekk.duckdns.org. git IN CNAME dragon hydra IN CNAME dragon kj IN CNAME dragon +ympd IN CNAME dragon raigh IN AAAA 2001:67c:29f4:1008:216:3eff:fe33:4512 diff --git a/machines/dragon.nix b/machines/dragon.nix index 9518298..48a6846 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -1,6 +1,7 @@ { config, lib, pkgs, ... }: { imports = [ + ../config/mpd.nix ../config/borg-backup.nix ../config/common.nix ../config/users.nix |