diff options
| author | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-08-11 12:12:13 +0200 |
| commit | 4cb0ff12ba563693b6be7aac3c7cc8c6ce7a003c (patch) | |
| tree | 2eceb32d72c1799938bce57240566ba576c2c3b4 /krebs/2configs | |
| parent | 93606315b99a2540c5859d93eb2377ae32fa6506 (diff) | |
| parent | f556a302f62434e0a47ef23db7e569bdb9c489f6 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/buildbot-stockholm.nix | 2 | ||||
| -rw-r--r-- | krebs/2configs/reaktor2.nix | 4 | ||||
| -rw-r--r-- | krebs/2configs/wiki.nix | 19 |
3 files changed, 22 insertions, 3 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index 43dd9691..43a38a9f 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -5,7 +5,7 @@ services.nginx = { enable = true; virtualHosts.build = { - serverAliases = [ "build.${config.networking.hostName}.r" ]; + serverAliases = [ "build.r" "build.${config.networking.hostName}.r" ]; locations."/".extraConfig = '' proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index f4fa2ca7..72eff176 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -14,7 +14,7 @@ let confirmation=no ''; in { - pattern = "^${name}-([a-z]+)(?::\\s*(.*))?"; + pattern = "^${name}-([a-z]+)(?::?\\s*(.*))?"; activate = "match"; command = 1; arguments = [2]; @@ -76,7 +76,7 @@ let }; } { - pattern = ''^(\S+)\s+([+-][1-9][0-9]*)\s+(\S+)$''; + pattern = ''^([\w-]*):?\s+([+-][1-9][0-9]*)\s+(\S+)$''; activate = "match"; arguments = [1 2 3]; command = { diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix new file mode 100644 index 00000000..2350e711 --- /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}; + ''; + }; + }; +} |