@@ -21,10 +21,9 @@ let
21 else [{ip = "*"; port = 80;}];
21 else [{ip = "*"; port = 80;}];
23 getListen = cfg:
23 getListen = cfg:
24− let list = (lib.optional (cfg.port != 0) {ip = "*"; port = cfg.port;}) ++ cfg.listen;
24+ if cfg.listen == []
26− then defaultListen cfg
25+ then defaultListen cfg
27− else list;
26+ else cfg.listen;
29 listenToString = l: "${l.ip}:${toString l.port}";
28 listenToString = l: "${l.ip}:${toString l.port}";
@@ -638,7 +637,7 @@ in
638 message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
637 message = "SSL is enabled for httpd, but sslServerCert and/or sslServerKey haven't been specified."; }
641− warnings = map (cfg: ''apache-httpd's port option is deprecated. Use listen = [{/*ip = "*"; */ port = ${toString cfg.port};}]; instead'' ) (lib.filter (cfg: cfg.port != 0) allHosts);
640+ warnings = map (cfg: "apache-httpd's extraSubservices option is deprecated. Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (lib.filter (cfg: cfg.extraSubservices != []) allHosts);
643 users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
642 users.users = optionalAttrs (mainCfg.user == "wwwrun") (singleton
644 { name = "wwwrun";
643 { name = "wwwrun";
@@ -672,7 +671,7 @@ in
673 wantedBy = [ "multi-user.target" ];
672 wantedBy = [ "multi-user.target" ];
674 wants = [ "keys.target" ];
673 wants = [ "keys.target" ];
675− after = [ "network.target" "fs.target" "postgresql.service" "keys.target" ];
674+ after = [ "network.target" "fs.target" "keys.target" ];
678 [ httpd pkgs.coreutils pkgs.gnugrep ]
677 [ httpd pkgs.coreutils pkgs.gnugrep ]