From f911f9b2bf6be7e2514391db8250bbeff603dd4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Wed, 26 Feb 2020 22:21:10 -0500 Subject: Enable pjournal on dragon --- config/web-server.nix | 2 +- machines/dragon.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/web-server.nix b/config/web-server.nix index bd2c35d..751f9c3 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -97,7 +97,7 @@ locations."/".proxyPass = "http://10.0.20.13:8080"; }; "journal.orbekk.com" = template // { - locations."/".proxyPass = "http://${pjournal_loc.address}:${toString pjournal_loc.port}"; + locations."/".proxyPass = "http://localhost:${toString pjournal_loc.port}"; }; }; }; diff --git a/machines/dragon.nix b/machines/dragon.nix index 39e4bc8..42d4cb3 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -19,13 +19,13 @@ in ../config/munin-master.nix ../config/vpn-server.nix ../config/terraria.nix - # ../config/pjournal.nix + ../config/pjournal.nix ]; - # services.pjournal = { - # enable = true; - # port = (import ../data/aliases.nix).services.pjournal.port; - # }; + services.pjournal = { + enable = true; + port = (import ../data/aliases.nix).services.pjournal.port; + }; environment.systemPackages = with pkgs; [ ipmitool ]; -- cgit v1.2.3