commit 27bc34f1e471991e43df028edc51159b12405120 · pyrox.dev/nixpkgs

+4 -4

nixos/modules/config/networking.nix

···

       223
        
           # Install the proxy environment variables

     

       224
        
           environment.sessionVariables = cfg.proxy.envVars;

     

       225
        
       

     

       226
       -
           # The ‘ip-up’ target is started when we have IP connectivity.  So

     

       227
       -
           # services that depend on IP connectivity (like ntpd) should be

     

       228
       -
           # pulled in by this target.

     

       229
       -
           systemd.targets.ip-up.description = "Services Requiring IP Connectivity";

     

       230
        
       

     

       231
        
           # This is needed when /etc/resolv.conf is being overriden by networkd

     

       232
        
           # and other configurations. If the file is destroyed by an environment

···

       223
        
           # Install the proxy environment variables

     

       224
        
           environment.sessionVariables = cfg.proxy.envVars;

     

       225
        
       

     

       226
       +
           # The ‘ip-up’ target is kept for backwards compatibility.

     

       227
       +
           # New services should use systemd upstream targets:

     

       228
       +
           # See https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/

     

       229
       +
           systemd.targets.ip-up.description = "Services Requiring IP Connectivity (deprecated)";

     

       230
        
       

     

       231
        
           # This is needed when /etc/resolv.conf is being overriden by networkd

     

       232
        
           # and other configurations. If the file is destroyed by an environment

+3 -1

nixos/modules/services/databases/4store-endpoint.nix

···

       61
        
           services.avahi.enable = true;

     

       62
        
       

     

       63
        
           systemd.services."4store-endpoint" = {

     

       64
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       0
        
       
     

       65
        
             script = ''

     

       66
        
               ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'

     

       67
        
             '';

···

       61
        
           services.avahi.enable = true;

     

       62
        
       

     

       63
        
           systemd.services."4store-endpoint" = {

     

       64
       +
             after = [ "network.target" ];

     

       65
       +
             wantedBy = [ "multi-user.target" ];

     

       66
       +
       

     

       67
        
             script = ''

     

       68
        
               ${run} '${pkgs.rdf4store}/bin/4s-httpd -D ${cfg.options} ${if cfg.listenAddress!=null then "-H ${cfg.listenAddress}" else "" } -p ${toString cfg.port} ${cfg.database}'

     

       69
        
             '';

+2 -1

nixos/modules/services/databases/4store.nix

···

       53
        
           services.avahi.enable = true;

     

       54
        
       

     

       55
        
           systemd.services."4store" = {

     

       56
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       57
        
       

     

       58
        
             preStart = ''

     

       59
        
               mkdir -p ${stateDir}/

···

       53
        
           services.avahi.enable = true;

     

       54
        
       

     

       55
        
           systemd.services."4store" = {

     

       56
       +
             after = [ "network.target" ];

     

       57
       +
             wantedBy = [ "multi-user.target" ];

     

       58
        
       

     

       59
        
             preStart = ''

     

       60
        
               mkdir -p ${stateDir}/

+2 -1

nixos/modules/services/databases/virtuoso.nix

···

       62
        
             };

     

       63
        
       

     

       64
        
           systemd.services.virtuoso = {

     

       65
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       66
        
       

     

       67
        
             preStart = ''

     

       68
        
               mkdir -p ${stateDir}

···

       62
        
             };

     

       63
        
       

     

       64
        
           systemd.services.virtuoso = {

     

       65
       +
             after = [ "network.target" ];

     

       66
       +
             wantedBy = [ "multi-user.target" ];

     

       67
        
       

     

       68
        
             preStart = ''

     

       69
        
               mkdir -p ${stateDir}

+2 -1

nixos/modules/services/mail/freepops.nix

···

       74
        
         config = mkIf cfg.enable {

     

       75
        
           systemd.services.freepopsd = {

     

       76
        
             description = "Freepopsd (webmail over POP3)";

     

       77
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       78
        
             script = ''

     

       79
        
               ${pkgs.freepops}/bin/freepopsd \

     

       80
        
                 -p ${toString cfg.port} \

···

       74
        
         config = mkIf cfg.enable {

     

       75
        
           systemd.services.freepopsd = {

     

       76
        
             description = "Freepopsd (webmail over POP3)";

     

       77
       +
             after = [ "network.target" ];

     

       78
       +
             wantedBy = [ "multi-user.target" ];

     

       79
        
             script = ''

     

       80
        
               ${pkgs.freepops}/bin/freepopsd \

     

       81
        
                 -p ${toString cfg.port} \

+4 -3

nixos/modules/services/monitoring/ups.nix

···

       182
        
       

     

       183
        
           systemd.services.upsmon = {

     

       184
        
             description = "Uninterruptible Power Supplies (Monitor)";

     

       185
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       186
        
             serviceConfig.Type = "forking";

     

       187
        
             script = "${pkgs.nut}/sbin/upsmon";

     

       188
        
             environment.NUT_CONFPATH = "/etc/nut/";

     
···

       191
        
       

     

       192
        
           systemd.services.upsd = {

     

       193
        
             description = "Uninterruptible Power Supplies (Daemon)";

     

       0
        
       
     

       194
        
             wantedBy = [ "multi-user.target" ];

     

       195
       -
             after = [ "network-interfaces.target" "upsmon.service" ];

     

       196
        
             serviceConfig.Type = "forking";

     

       197
        
             # TODO: replace 'root' by another username.

     

       198
        
             script = "${pkgs.nut}/sbin/upsd -u root";

     
···

       202
        
       

     

       203
        
           systemd.services.upsdrv = {

     

       204
        
             description = "Uninterruptible Power Supplies (Register all UPS)";

     

       205
       -
             wantedBy = [ "multi-user.target" ];

     

       206
        
             after = [ "upsd.service" ];

     

       0
        
       
     

       207
        
             # TODO: replace 'root' by another username.

     

       208
        
             script = ''${pkgs.nut}/bin/upsdrvctl -u root start'';

     

       209
        
             serviceConfig = {

···

       182
        
       

     

       183
        
           systemd.services.upsmon = {

     

       184
        
             description = "Uninterruptible Power Supplies (Monitor)";

     

       185
       +
             after = [ "network.target" ];

     

       186
       +
             wantedBy = [ "multi-user.target" ];

     

       187
        
             serviceConfig.Type = "forking";

     

       188
        
             script = "${pkgs.nut}/sbin/upsmon";

     

       189
        
             environment.NUT_CONFPATH = "/etc/nut/";

     
···

       192
        
       

     

       193
        
           systemd.services.upsd = {

     

       194
        
             description = "Uninterruptible Power Supplies (Daemon)";

     

       195
       +
             after = [ "network.target" "upsmon.service" ];

     

       196
        
             wantedBy = [ "multi-user.target" ];

     

       0
        
       
     

       197
        
             serviceConfig.Type = "forking";

     

       198
        
             # TODO: replace 'root' by another username.

     

       199
        
             script = "${pkgs.nut}/sbin/upsd -u root";

     
···

       203
        
       

     

       204
        
           systemd.services.upsdrv = {

     

       205
        
             description = "Uninterruptible Power Supplies (Register all UPS)";

     

       0
        
       
     

       206
        
             after = [ "upsd.service" ];

     

       207
       +
             wantedBy = [ "multi-user.target" ];

     

       208
        
             # TODO: replace 'root' by another username.

     

       209
        
             script = ''${pkgs.nut}/bin/upsdrvctl -u root start'';

     

       210
        
             serviceConfig = {

+2 -2

nixos/modules/services/network-filesystems/drbd.nix

···

       53
        
             };

     

       54
        
       

     

       55
        
           systemd.services.drbd = {

     

       56
       -
             after = [ "systemd-udev.settle.service" ];

     

       57
        
             wants = [ "systemd-udev.settle.service" ];

     

       58
       -
             wantedBy = [ "ip-up.target" ];

     

       59
        
             script = ''

     

       60
        
               ${pkgs.drbd}/sbin/drbdadm up all

     

       61
        
             '';

···

       53
        
             };

     

       54
        
       

     

       55
        
           systemd.services.drbd = {

     

       56
       +
             after = [ "systemd-udev.settle.service" "network.target" ];

     

       57
        
             wants = [ "systemd-udev.settle.service" ];

     

       58
       +
             wantedBy = [ "multi-user.target" ];

     

       59
        
             script = ''

     

       60
        
               ${pkgs.drbd}/sbin/drbdadm up all

     

       61
        
             '';

+2 -1

nixos/modules/services/networking/amuled.nix

···

       59
        
       

     

       60
        
           systemd.services.amuled = {

     

       61
        
             description = "AMule daemon";

     

       62
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       63
        
       

     

       64
        
             preStart = ''

     

       65
        
               mkdir -p ${cfg.dataDir}

···

       59
        
       

     

       60
        
           systemd.services.amuled = {

     

       61
        
             description = "AMule daemon";

     

       62
       +
             wantedBy = [ "multi-user.target" ];

     

       63
       +
             after = [ "network.target" ];

     

       64
        
       

     

       65
        
             preStart = ''

     

       66
        
               mkdir -p ${cfg.dataDir}

-7

nixos/modules/services/networking/dhcpcd.nix

···

       61
        
             ${cfg.extraConfig}

     

       62
        
           '';

     

       63
        
       

     

       64
       -
         # Hook for emitting ip-up/ip-down events.

     

       65
        
         exitHook = pkgs.writeText "dhcpcd.exit-hook"

     

       66
        
           ''

     

       67
        
             if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then

     
···

       73
        
                 # applies to openntpd.

     

       74
        
                 ${config.systemd.package}/bin/systemctl try-restart ntpd.service

     

       75
        
                 ${config.systemd.package}/bin/systemctl try-restart openntpd.service

     

       76
       -
       

     

       77
       -
                 ${config.systemd.package}/bin/systemctl start ip-up.target

     

       78
        
             fi

     

       79
       -
       

     

       80
       -
             #if [ "$reason" = EXPIRE -o "$reason" = RELEASE -o "$reason" = NOCARRIER ] ; then

     

       81
       -
             #    ${config.systemd.package}/bin/systemctl start ip-down.target

     

       82
       -
             #fi

     

       83
        
       

     

       84
        
             ${cfg.runHook}

     

       85
        
           '';

···

       61
        
             ${cfg.extraConfig}

     

       62
        
           '';

     

       63
        
       

     

       0
        
       
     

       64
        
         exitHook = pkgs.writeText "dhcpcd.exit-hook"

     

       65
        
           ''

     

       66
        
             if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then

     
···

       72
        
                 # applies to openntpd.

     

       73
        
                 ${config.systemd.package}/bin/systemctl try-restart ntpd.service

     

       74
        
                 ${config.systemd.package}/bin/systemctl try-restart openntpd.service

     

       0
        
       
     

       0
        
       
     

       75
        
             fi

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       76
        
       

     

       77
        
             ${cfg.runHook}

     

       78
        
           '';

+2 -1

nixos/modules/services/networking/git-daemon.nix

···

       116
        
             };

     

       117
        
       

     

       118
        
           systemd.services."git-daemon" = {

     

       119
       -
             wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       120
        
             script = "${pkgs.git}/bin/git daemon --reuseaddr "

     

       121
        
               + (optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ")

     

       122
        
               + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ")

···

       116
        
             };

     

       117
        
       

     

       118
        
           systemd.services."git-daemon" = {

     

       119
       +
             after = [ "network.target" ];

     

       120
       +
             wantedBy = [ "multi-user.target" ];

     

       121
        
             script = "${pkgs.git}/bin/git daemon --reuseaddr "

     

       122
        
               + (optionalString (cfg.basePath != "") "--base-path=${cfg.basePath} ")

     

       123
        
               + (optionalString (cfg.listenAddress != "") "--listen=${cfg.listenAddress} ")

+4 -2

nixos/modules/services/networking/iodine.nix

···

       106
        
             createIodineClientService = name: cfg:

     

       107
        
             {

     

       108
        
               description = "iodine client - ${name}";

     

       109
       -
               wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       110
        
               serviceConfig = {

     

       111
        
                 RestartSec = "30s";

     

       112
        
                 Restart = "always";

     
···

       121
        
           ) // {

     

       122
        
             iodined = mkIf (cfg.server.enable) {

     

       123
        
               description = "iodine, ip over dns server daemon";

     

       124
       -
               wantedBy = [ "ip-up.target" ];

     

       0
        
       
     

       125
        
               serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}";

     

       126
        
             };

     

       127
        
           };

···

       106
        
             createIodineClientService = name: cfg:

     

       107
        
             {

     

       108
        
               description = "iodine client - ${name}";

     

       109
       +
               after = [ "network.target" ];

     

       110
       +
               wantedBy = [ "multi-user.target" ];

     

       111
        
               serviceConfig = {

     

       112
        
                 RestartSec = "30s";

     

       113
        
                 Restart = "always";

     
···

       122
        
           ) // {

     

       123
        
             iodined = mkIf (cfg.server.enable) {

     

       124
        
               description = "iodine, ip over dns server daemon";

     

       125
       +
               after = [ "network.target" ];

     

       126
       +
               wantedBy = [ "multi-user.target" ];

     

       127
        
               serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}";

     

       128
        
             };

     

       129
        
           };

-1

nixos/modules/services/networking/networkmanager.nix

···

       55
        
         ipUpScript = writeScript "01nixos-ip-up" ''

     

       56
        
           #!/bin/sh

     

       57
        
           if test "$2" = "up"; then

     

       58
       -
             ${config.systemd.package}/bin/systemctl start ip-up.target

     

       59
        
             ${config.systemd.package}/bin/systemctl start network-online.target

     

       60
        
           fi

     

       61
        
         '';

···

       55
        
         ipUpScript = writeScript "01nixos-ip-up" ''

     

       56
        
           #!/bin/sh

     

       57
        
           if test "$2" = "up"; then

     

       0
        
       
     

       58
        
             ${config.systemd.package}/bin/systemctl start network-online.target

     

       59
        
           fi

     

       60
        
         '';

+1 -2

nixos/modules/system/boot/networkd.nix

···

       677
        
           };

     

       678
        
       

     

       679
        
           systemd.services.systemd-networkd-wait-online = {

     

       680
       -
             before = [ "ip-up.target" ];

     

       681
       -
             wantedBy = [ "network-online.target" "ip-up.target" ];

     

       682
        
           };

     

       683
        
       

     

       684
        
           systemd.services."systemd-network-wait-online@" = {

···

       677
        
           };

     

       678
        
       

     

       679
        
           systemd.services.systemd-networkd-wait-online = {

     

       680
       +
             wantedBy = [ "network-online.target" ];

     

       0
        
       
     

       681
        
           };

     

       682
        
       

     

       683
        
           systemd.services."systemd-network-wait-online@" = {

+1 -1

nixos/modules/tasks/network-interfaces-scripted.nix

···

       142
        
                           # (Flushing this interface may have removed it.)

     

       143
        
                           ${config.systemd.package}/bin/systemctl try-restart --no-block network-setup.service

     

       144
        
                         fi

     

       145
       -
                         ${config.systemd.package}/bin/systemctl start ip-up.target

     

       146
        
                       '';

     

       147
        
                   preStop = flip concatMapStrings (ips) (ip:

     

       148
        
                       let

···

       142
        
                           # (Flushing this interface may have removed it.)

     

       143
        
                           ${config.systemd.package}/bin/systemctl try-restart --no-block network-setup.service

     

       144
        
                         fi

     

       145
       +
                         ${config.systemd.package}/bin/systemctl start network-online.target

     

       146
        
                       '';

     

       147
        
                   preStop = flip concatMapStrings (ips) (ip:

     

       148
        
                       let

+2 -1

nixos/modules/virtualisation/azure-agent.nix

···

       178
        
       

     

       179
        
           systemd.services.waagent = {

     

       180
        
             wantedBy = [ "multi-user.target" ];

     

       181
       -
             after = [ "ip-up.target" "sshd.service" ];

     

       0
        
       
     

       182
        
       

     

       183
        
             path = [ pkgs.e2fsprogs ];

     

       184
        
             description = "Windows Azure Agent Service";

···

       178
        
       

     

       179
        
           systemd.services.waagent = {

     

       180
        
             wantedBy = [ "multi-user.target" ];

     

       181
       +
             after = [ "network-online.target" "sshd.service" ];

     

       182
       +
             wants = [ "network-online.target" ];

     

       183
        
       

     

       184
        
             path = [ pkgs.e2fsprogs ];

     

       185
        
             description = "Windows Azure Agent Service";

+2 -2

nixos/modules/virtualisation/brightbox-image.nix

···

       116
        
       

     

       117
        
             wantedBy = [ "multi-user.target" "sshd.service" ];

     

       118
        
             before = [ "sshd.service" ];

     

       119
       -
             wants = [ "ip-up.target" ];

     

       120
       -
             after = [ "ip-up.target" ];

     

       121
        
       

     

       122
        
             path = [ pkgs.wget pkgs.iproute ];

     

       123

···

       116
        
       

     

       117
        
             wantedBy = [ "multi-user.target" "sshd.service" ];

     

       118
        
             before = [ "sshd.service" ];

     

       119
       +
             wants = [ "network-online.target" ];

     

       120
       +
             after = [ "network-online.target" ];

     

       121
        
       

     

       122
        
             path = [ pkgs.wget pkgs.iproute ];

     

       123

+2 -2

nixos/modules/virtualisation/google-compute-image.nix

···

       134
        
       

     

       135
        
             wantedBy = [ "sshd.service" ];

     

       136
        
             before = [ "sshd.service" ];

     

       137
       -
             after = [ "network-online.target" "ip-up.target" ];

     

       138
       -
             wants = [ "network-online.target" "ip-up.target" ];

     

       139
        
       

     

       140
        
             script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'";

     

       141
        
                          mktemp = "mktemp --tmpdir=/run"; in

···

       134
        
       

     

       135
        
             wantedBy = [ "sshd.service" ];

     

       136
        
             before = [ "sshd.service" ];

     

       137
       +
             after = [ "network-online.target" ];

     

       138
       +
             wants = [ "network-online.target" ];

     

       139
        
       

     

       140
        
             script = let wget = "${pkgs.wget}/bin/wget --retry-connrefused -t 15 --waitretry=10 --header='Metadata-Flavor: Google'";

     

       141
        
                          mktemp = "mktemp --tmpdir=/run"; in