diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-13 15:53:10 -0800 |
| commit | 9579c9ec7f53be31efba3803bd86661b59b0bb81 (patch) | |
| tree | e9e9ec19c0989f18d96ec0b8c6faf3780eb3dfb1 /nixos/modules/services | |
| parent | 83aeb00a78ebca04bd6a42721284cad87da9fabe (diff) | |
| parent | cb21b77ff1b9ed006d1180ad7c94b2ee7ed3c096 (diff) | |
| download | nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.gz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.bz2 nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.lz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.xz nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.tar.zst nixlib-9579c9ec7f53be31efba3803bd86661b59b0bb81.zip | |
Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/mail/opensmtpd.nix | 20 | ||||
| -rw-r--r-- | nixos/modules/services/networking/networkmanager.nix | 5 |
2 files changed, 4 insertions, 21 deletions
diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix index a1cfd84365a2..a3e50b422920 100644 --- a/nixos/modules/services/mail/opensmtpd.nix +++ b/nixos/modules/services/mail/opensmtpd.nix @@ -46,17 +46,6 @@ in { is left empty, the OpenSMTPD server will not start. ''; }; - - procPackages = mkOption { - type = types.listOf types.path; - default = []; - description = '' - Packages to search for filters, tables, queues, and schedulers. - - Add OpenSMTPD-extras here if you want to use the filters, etc. from - that package. - ''; - }; }; }; @@ -83,19 +72,12 @@ in { }; }; - systemd.services.opensmtpd = let - procEnv = pkgs.buildEnv { - name = "opensmtpd-procs"; - paths = [ opensmtpd ] ++ cfg.procPackages; - pathsToLink = [ "/libexec/opensmtpd" ]; - }; - in { + systemd.services.opensmtpd = { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; preStart = "mkdir -p /var/spool"; serviceConfig.ExecStart = "${opensmtpd}/sbin/smtpd -d -f ${conf} ${args}"; - environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd"; }; environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} '' diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 7df194fa419b..19ff73ad1b87 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -72,10 +72,11 @@ let ${coreutils}/bin/rm -f $tmp $tmp.ns ''; + # pre-up and pre-down hooks were added in NM 0.9.10, but we still use 0.9.0 dispatcherTypesSubdirMap = { "basic" = ""; - "pre-up" = "pre-up.d/"; - "pre-down" = "pre-down.d/"; + /*"pre-up" = "pre-up.d/"; + "pre-down" = "pre-down.d/";*/ }; in { |