From 69e15b7ba5e7594b7418216b0f8c0aa48acd90e0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:14:09 +0200 Subject: bind service: network-interfaces.target -> network.target --- nixos/modules/services/networking/bind.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 08afafceff24..1b56d132cc18 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -146,7 +146,7 @@ in systemd.services.bind = { description = "BIND name server job"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' -- cgit 1.4.1 From ae716674514dde31b452f0462e62e059780d5e05 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:14:41 +0200 Subject: cjdns service: network-interfaces.target -> network.target --- nixos/modules/services/networking/cjdns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 0495b32c6fa8..e878a4896fdd 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -209,8 +209,8 @@ in systemd.services.cjdns = { description = "encrypted networking for everybody"; - wantedBy = [ "network.target" ]; - after = [ "networkSetup.service" "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; preStart = if cfg.confFile != "" then "" else '' [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys -- cgit 1.4.1 From 652e0b4b8a2d4c5b7511f103d8049846602c2206 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:17:04 +0200 Subject: oidentd service: network-interfaces.target -> network.target --- nixos/modules/services/networking/oidentd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index 651bb8e967cf..ba7acd879546 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -25,7 +25,7 @@ with lib; config = mkIf config.services.oidentd.enable { systemd.services.oidentd = { - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "forking"; script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" + -- cgit 1.4.1 From 67d9369e5d65a67f35abde5adaccba706f0052c8 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:17:43 +0200 Subject: radicale service: network-interfaces.target -> network{,-online}.target --- nixos/modules/services/networking/radicale.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index d5e2e3041b49..4f7ed30b2a85 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -50,7 +50,7 @@ in systemd.services.radicale = { description = "A Simple Calendar and Contact Server"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -f"; serviceConfig.User = "radicale"; -- cgit 1.4.1 From 795defaae0664fe8315f0baed19c8c7a9cabe8d0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:18:39 +0200 Subject: tcpcrypt service: remove use of network-interfaces.target --- nixos/modules/services/networking/tcpcrypt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index 267653abce03..2f304165eb4b 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -39,7 +39,7 @@ in description = "tcpcrypt"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ]; -- cgit 1.4.1 From 768b333dc1d5d90a38ebe7c4fb576b1345379c40 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:18:51 +0200 Subject: tinc service: remove use of network-interfaces.target --- nixos/modules/services/networking/tinc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 8da0f817ae2a..d4fa6ad4540b 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -149,8 +149,8 @@ in ("tinc.${network}") ({ description = "Tinc Daemon - ${network}"; - wantedBy = [ "network.target" ]; - after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; path = [ data.package ]; restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ] ++ mapAttrsToList (host: _ : config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts; -- cgit 1.4.1 From cda9af6eb8728e52908063a42f6ef889a9edcc19 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:19:14 +0200 Subject: wpa-supplicant service: remove use of network-interfaces.target --- nixos/modules/services/networking/wpa_supplicant.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index de99ce4f0260..a344d7855463 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -128,9 +128,9 @@ in { in { description = "WPA Supplicant"; - after = [ "network-interfaces.target" ] ++ lib.concatMap deviceUnit ifaces; + after = [ "network.target" ] ++ lib.concatMap deviceUnit ifaces; requires = lib.concatMap deviceUnit ifaces; - wantedBy = [ "network.target" ]; + wantedBy = [ "network-online.target" ]; path = [ pkgs.wpa_supplicant ]; -- cgit 1.4.1 From c7ed675fe337a1ea83b75ad22e78357f7c2765f1 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:19:24 +0200 Subject: xinetd service: remove use of network-interfaces.target --- nixos/modules/services/networking/xinetd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 08680b517808..d27f04a180f3 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -141,7 +141,7 @@ in config = mkIf cfg.enable { systemd.services.xinetd = { description = "xinetd server"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.xinetd ]; script = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; -- cgit 1.4.1 From 5a2a3510b936db3cb758ed0e62a90fb82949c654 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 10 Sep 2016 20:19:35 +0200 Subject: zerobin service: remove use of network-interfaces.target --- nixos/modules/services/networking/zerobin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 1c524602f8e9..3e7e01c97fbb 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -86,7 +86,7 @@ in systemd.services.zerobin = { enable = true; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}"; serviceConfig.PrivateTmp="yes"; -- cgit 1.4.1 From bc7710468d2152cd1c3a02827b1fe90c8c23d04d Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 8 Sep 2016 22:17:58 +0200 Subject: networking.dhcpcd: use upstream targets --- nixos/modules/services/networking/dhcpcd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 4b0e90886510..87c0aa50a1ff 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -158,8 +158,8 @@ in { description = "DHCP Client"; wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; wants = [ "network.target" ]; - before = [ "network.target" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by -- cgit 1.4.1 From 3ada966bd579b63b2259b97018520e94cf9a4489 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Thu, 8 Sep 2016 22:19:43 +0200 Subject: treewide: minor format / style / documentation fixes --- nixos/modules/services/networking/bind.nix | 3 ++- nixos/modules/services/networking/cjdns.nix | 2 +- nixos/modules/services/networking/zerobin.nix | 4 ++-- nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 1b56d132cc18..41d7128ec31e 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -145,7 +145,7 @@ in }; systemd.services.bind = { - description = "BIND name server job"; + description = "BIND Domain Name Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -155,6 +155,7 @@ in ''; script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + unitConfig.Documentation = "man:named(8)"; }; }; } diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index e878a4896fdd..cb00139c5f1c 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -208,7 +208,7 @@ in # networking.firewall.allowedUDPPorts = ... systemd.services.cjdns = { - description = "encrypted networking for everybody"; + description = "cjdns: routing engine designed for security, scalability, speed and ease of use"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 3e7e01c97fbb..274bbca53fa3 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -93,8 +93,8 @@ in serviceConfig.User = cfg.user; serviceConfig.Group = cfg.group; preStart = '' - mkdir -p ${cfg.dataDir} - chown ${cfg.user} ${cfg.dataDir} + mkdir -p ${cfg.dataDir} + chown ${cfg.user} ${cfg.dataDir} ''; }; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 937b2698ce9b..495c1abb0521 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -244,7 +244,6 @@ in chown ${serverInfo.serverConfig.user} ${config.wordpressUploads} # we should use systemd dependencies here - #waitForUnit("network-interfaces.target"); if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'." # Wait until MySQL is up -- cgit 1.4.1 From 9819cdc71a796fa89825baf463f96cf51672de18 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 12 Sep 2016 16:29:15 +0200 Subject: wicd: get closer to upstream service definition taken from http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/view/head:/other/wicd.service --- nixos/modules/services/networking/wicd.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix index 9e5a437b4856..03c6bd28aaba 100644 --- a/nixos/modules/services/networking/wicd.nix +++ b/nixos/modules/services/networking/wicd.nix @@ -26,7 +26,9 @@ with lib; environment.systemPackages = [pkgs.wicd]; systemd.services.wicd = { - after = [ "network-interfaces.target" ]; + after = [ "network-pre.target" ]; + before = [ "network.target" ]; + wants = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = "${pkgs.wicd}/sbin/wicd -f"; }; -- cgit 1.4.1 From fbf0abf4af3c5c5cc2366488f8867bf858cff741 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 12 Sep 2016 16:30:15 +0200 Subject: softether: improve service dependencies --- nixos/modules/services/networking/softether.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 5e49efc3aa3a..16530078b978 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -63,7 +63,6 @@ in ]; systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; - wantedBy = [ "network-interfaces.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; @@ -84,8 +83,9 @@ in (mkIf (cfg.vpnserver.enable) { systemd.services.vpnserver = { description = "SoftEther VPN Server"; - after = [ "softether-init.service" ]; - wantedBy = [ "network-interfaces.target" ]; + after = [ "softether-init.service" "network.target" ]; + wants = [ "softether-init.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkg}/bin/vpnserver start"; @@ -104,8 +104,9 @@ in (mkIf (cfg.vpnbridge.enable) { systemd.services.vpnbridge = { description = "SoftEther VPN Bridge"; - after = [ "softether-init.service" ]; - wantedBy = [ "network-interfaces.target" ]; + after = [ "softether-init.service" "network.target" ]; + wants = [ "softether-init.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkg}/bin/vpnbridge start"; @@ -124,8 +125,9 @@ in (mkIf (cfg.vpnclient.enable) { systemd.services.vpnclient = { description = "SoftEther VPN Client"; - after = [ "softether-init.service" ]; - wantedBy = [ "network-interfaces.target" ]; + after = [ "softether-init.service" "network.target" ]; + wants = [ "softether-init.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkg}/bin/vpnclient start"; -- cgit 1.4.1 From 97416eaeef46f235040c4dfa275da5667fdf2618 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 12 Sep 2016 16:38:18 +0200 Subject: gpve service: network-interfaces.target -> network.target --- nixos/modules/services/networking/gvpe.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 27b64b5bb95f..3ef3548e0a08 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -105,7 +105,7 @@ in config = mkIf cfg.enable { systemd.services.gvpe = { description = "GNU Virtual Private Ethernet node"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' -- cgit 1.4.1 From d43b2b9c85a42025ef8f4d77b120d40cfac9645e Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 12 Sep 2016 16:38:49 +0200 Subject: openvpn service: network-interfaces.target -> network.target --- nixos/modules/services/networking/openvpn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 82173a841a3f..af3efa0464a6 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -56,7 +56,7 @@ let description = "OpenVPN instance ‘${name}’"; wantedBy = optional cfg.autoStart "multi-user.target"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; -- cgit 1.4.1 From 60430b140c0a09736c5dbc3b1d73d57a9994ef0f Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Mon, 12 Sep 2016 16:39:11 +0200 Subject: lshd service: remove use of network-interfaces.target --- nixos/modules/services/networking/ssh/lshd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 661a6a524631..eca599afb33b 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -120,7 +120,7 @@ in systemd.services.lshd = { description = "GNU lshd SSH2 daemon"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; -- cgit 1.4.1 From 8524df12590f09966e783edfe4cc8aed1cbe33c3 Mon Sep 17 00:00:00 2001 From: Alexander Ried Date: Fri, 9 Sep 2016 01:22:44 +0200 Subject: networking.nat: replace network-interfaces.target We can replace this safely with network-pre because iptables does not care whether the interfaces exist or not. --- nixos/modules/services/networking/nat.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos/modules/services/networking') diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 9d163e60d5ea..23f1b2476ebe 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -171,7 +171,7 @@ in systemd.services = mkIf (!config.networking.firewall.enable) { nat = { description = "Network Address Translation"; wantedBy = [ "network.target" ]; - after = [ "network-interfaces.target" "systemd-modules-load.service" ]; + after = [ "network-pre.target" "systemd-modules-load.service" ]; path = [ pkgs.iptables ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; -- cgit 1.4.1