From dbd2999dc204d339dcc9cccee19af65a91a89d9e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 24 Dec 2016 23:40:38 +0100
Subject: m 1 gum: enable ipv6 (for nginx), krebs.nginx -> services.nginx

---
 makefu/1systems/gum.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index e8a368fa..e7761a64 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -15,6 +15,7 @@ in {
       ../2configs/git/cgit-retiolum.nix
       # ../2configs/mattermost-docker.nix
       ../2configs/nginx/euer.test.nix
+      ../2configs/nginx/public_html.nix
       ../2configs/nginx/update.connector.one.nix
       ../2configs/deployment/mycube.connector.one.nix
 
@@ -31,7 +32,9 @@ in {
   ];
   services.smartd.devices = [ { device = "/dev/sda";} ];
 
+
   ###### stable
+  services.nginx.virtualHosts.cgit.serverAliases = [ "cgit.euer.krebsco.de" ];
   krebs.build.host = config.krebs.hosts.gum;
   krebs.tinc.retiolum = {
     extraConfig = ''
@@ -48,10 +51,6 @@ in {
 
   makefu.taskserver.enable = true;
 
-  krebs.nginx.servers.cgit = {
-    server-names = [ "cgit.euer.krebsco.de" ];
-    listen = [ "${external-ip}:80" "${internal-ip}:80" ];
-  };
 
   # access
   users.users = {
@@ -76,9 +75,8 @@ in {
   services.udev.extraRules = ''
     SUBSYSTEM=="net", ATTR{address}=="c8:0a:a9:c8:ee:dd", NAME="et0"
   '';
-  boot.kernelParams = [ "ipv6.disable=1" ];
+  boot.kernelParams = [ ];
   networking = {
-    enableIPv6 = false;
     firewall = {
         allowPing = true;
         logRefusedConnections = false;
-- 
cgit v1.2.3