summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Ørbekk <kj@orbekk.com>2020-02-26 22:21:10 -0500
committerKjetil Ørbekk <kj@orbekk.com>2020-02-26 22:21:10 -0500
commitf911f9b2bf6be7e2514391db8250bbeff603dd4c (patch)
treeb7834e43e9b11359c60eaa0cc511814fc8918acb
parent2d7f5ca12c7fef56e914dcd17c9f974b77370a18 (diff)
Enable pjournal on dragon
-rw-r--r--config/web-server.nix2
-rw-r--r--machines/dragon.nix10
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 ];