summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-03-23 13:47:33 +0100
committerlassulus <lass@aidsballs.de>2016-03-23 13:47:33 +0100
commit60409cde22616f729b111fcb0a1d0a6362c5ba4d (patch)
tree4809db3d9a7c2c05d1a9ffefe523491e23f2e355
parent18d0cc3048243d15cf6108ccd05d62390ecf5503 (diff)
parent90ef4d08a13c24456f98d0aab6b55b8c16c89d0b (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--krebs/3modules/makefu/default.nix19
-rw-r--r--makefu/1systems/gum.nix7
-rw-r--r--makefu/1systems/pornocauster.nix6
3 files changed, 16 insertions, 16 deletions
diff --git a/krebs/3modules/makefu/default.nix b/krebs/3modules/makefu/default.nix
index 095cf329b..b04280848 100644
--- a/krebs/3modules/makefu/default.nix
+++ b/krebs/3modules/makefu/default.nix
@@ -89,19 +89,14 @@ with config.krebs.lib;
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
- MIICCgKCAgEAwW+RjRcp3uarkfXZ+FcCYY2GFcfI595GDpLRuiS/YQAB3JZEirHi
- HFhDJN80fZ9qHqtq9Af462xSx+cIb282TxAqCM1Z9buipOcYTYo0m8xIqkT10dB3
- mR87B+Ed1H6G3J6isdwEb9ZMegyGIIeyR53FJQYMZXjxdJbAmGMDKqjZSk1D5mo+
- n5Vx3lGzTuDy84VyphfO2ypG48RHCxHUAx4Yt3o84LKoiy/y5E66jaowCOjZ6SqG
- R0cymuhoBhMIk2xAXk0Qn7MZ1AOm9N7Wru7FXyoLc7B3+Gb0/8jXOJciysTG7+Gr
- Txza6fJvq2FaH8iBnfezSELmicIYhc8Ynlq4xElcHhQEmRTQavVe/LDhJ0i6xJSi
- aOu0njnK+9xK+MyDkB7n8dO1Iwnn7aG4n3CjVBB4BDO08lrovD3zdpDX0xhWgPRo
- ReOJ3heRO/HsVpzxKlqraKWoHuOXXcREfU9cj3F6CRd0ECOhqtFMEr6TnuSc8GaE
- KCKxY1oN45NbEFOCv2XKd2wEZFH37LFO6xxzSRr1DbVuKRYIPjtOiFKpwN1TIT8v
- XGzTT4TJpBGnq0jfhFwhVjfCjLuGj29MCkvg0nqObQ07qYrjdQI4W1GnGOuyXkvQ
- teyxjUXYbp0doTGxKvQaTWp+JapeEaJPN2MDOhrRFjPrzgo3aW9+97UCAwEAAQ==
+ MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG
+ RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA
+ kscW4nDqYtw4rtjOVPfnNiWXbcWD8eiYR0kcSWmSvfOpVvdhTETqduTx5HRHyEFD
+ JRQYR/tJSvVWXmM670PENAPNJFJ4VSJR60s5A+bFT7J/uw7HzJXX28LygJz73Dj2
+ 2a4ev0WcZQngLq072h/91R/TOpg+ogUDVhXkQtKyFj7im0287JTL4bXGofZBhzaf
+ +h9dFGs1QLoNyhG/cgt9fog7boSXTelAiQIDAQAB
-----END RSA PUBLIC KEY-----
- '';
+ '';
};
};
ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
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;