diff options
| author | lassulus <lassulus@lassul.us> | 2020-08-10 18:48:45 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-08-10 18:48:45 +0200 |
| commit | 87d1e0eb868445623ead814c81be934ccac14124 (patch) | |
| tree | b770856cc862e358b448562a7964ab57162358d6 | |
| parent | 3fd0a5d586cfecf90eb4344b59cb0331c4717595 (diff) | |
hotdog: enable gollum as wiki.r service
| -rw-r--r-- | krebs/1systems/hotdog/config.nix | 1 | ||||
| -rw-r--r-- | krebs/2configs/wiki.nix | 19 | ||||
| -rw-r--r-- | krebs/3modules/krebs/default.nix | 2 |
3 files changed, 22 insertions, 0 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix index 60ec625f2..bb84b1873 100644 --- a/krebs/1systems/hotdog/config.nix +++ b/krebs/1systems/hotdog/config.nix @@ -14,6 +14,7 @@ <stockholm/krebs/2configs/ircd.nix> <stockholm/krebs/2configs/nscd-fix.nix> <stockholm/krebs/2configs/reaktor2.nix> + <stockholm/krebs/2configs/wiki.nix> ]; krebs.build.host = config.krebs.hosts.hotdog; diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix new file mode 100644 index 000000000..2350e711e --- /dev/null +++ b/krebs/2configs/wiki.nix @@ -0,0 +1,19 @@ +{ config, ... }: + +{ + services.gollum = { + enable = true; + }; + networking.firewall.allowedTCPPorts = [ 80 ]; + services.nginx = { + enable = true; + virtualHosts.wiki = { + serverAliases = [ "wiki.r" "wiki.${config.networking.hostName}.r" ]; + locations."/".extraConfig = '' + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_pass http://127.0.0.1:${toString config.services.gollum.port}; + ''; + }; + }; +} diff --git a/krebs/3modules/krebs/default.nix b/krebs/3modules/krebs/default.nix index de09b4251..5e3ddcb2d 100644 --- a/krebs/3modules/krebs/default.nix +++ b/krebs/3modules/krebs/default.nix @@ -74,6 +74,8 @@ in { "build.hotdog.r" "cgit.hotdog.r" "irc.r" + "wiki.r" + "wiki.hotdog.r" ]; tinc.pubkey = '' -----BEGIN RSA PUBLIC KEY----- |