diff options
| author | lassulus <lass@aidsballs.de> | 2016-03-23 13:47:33 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-03-23 13:47:33 +0100 |
| commit | 60409cde22616f729b111fcb0a1d0a6362c5ba4d (patch) | |
| tree | 4809db3d9a7c2c05d1a9ffefe523491e23f2e355 /makefu | |
| parent | 18d0cc3048243d15cf6108ccd05d62390ecf5503 (diff) | |
| parent | 90ef4d08a13c24456f98d0aab6b55b8c16c89d0b (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu')
| -rw-r--r-- | makefu/1systems/gum.nix | 7 | ||||
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix index 2ddd2dccc..710421659 100644 --- a/makefu/1systems/gum.nix +++ b/makefu/1systems/gum.nix @@ -41,9 +41,10 @@ in { ]; }; - krebs.nginx.servers.cgit.server-names = [ - "cgit.euer.krebsco.de" - ]; + krebs.nginx.servers.cgit = { + server-names = [ "cgit.euer.krebsco.de" ]; + listen = [ "${external-ip}:80" "${internal-ip}:80" ]; + }; # access users.users = { diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 119f0e5e4..88c187758 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -36,7 +36,11 @@ #../2configs/wordpress.nix ../2configs/nginx/public_html.nix ]; - + krebs.nginx = { + default404 = false; + servers.default.listen = [ "80 default_server" ]; + servers.default.server-names = [ "_" ]; + }; krebs.retiolum.enable = true; # steam hardware.opengl.driSupport32Bit = true; |