Merge branch 'master' into test

2019-11-25 14:27:21 +01:00
parent 8f3d1b38db f6029c1e7c
commit b2b79e6a1e
2 changed files with 1 additions and 4 deletions
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -26,7 +26,5 @@
    connectionTrackingModules = [ "sane" ];
  };

-  # Disable IPv6
-  networking.enableIPv6 = false;
 }

--- a/modules/webstack.nix
+++ b/modules/webstack.nix
@@ -7,13 +7,12 @@
    php
    postgresql_11
    libressl
-    gnumake
-    php73Packages.composer
    miniflux
  ];

  services.nginx = {
    enable = true;
+    resolver.ipv6 = false;
    recommendedTlsSettings = true;
    recommendedGzipSettings = true;
    recommendedProxySettings = true;