From 5924bab20b8bc5470b8e22b02c6655183150f86b Mon Sep 17 00:00:00 2001 From: Tor Hedin Brønner Date: Mon, 14 Oct 2019 11:36:35 +0200 Subject: nixos/plymouth: do not order `plymouth-quit` after `display-manager` GDM now specifies ordering between `plymouth-quit` and `display-manager`: 9be5321097c16 This causes an ordering cycle between GDM and plymouth-quit which can result in systemd breaking GDM: ``` plymouth-quit.service: Job display-manager.service/start deleted to break ordering cycle starting with plymouth-quit.service/start ``` Not sure how often this triggers, as I've run my system with plymouth and 9be5321097c16 without any issues. But I did catch a VM doing this. NOTE: I also tried to remove the ordering in GDM to see if plymouth managed to live longer, but it didn't seem to help. So I opted to stick as close to upstream (upstream GDM specifies ordering, but plymouth does not). --- nixos/modules/system/boot/plymouth.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index fd43ea1620c4..adca3c3f66e7 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -88,10 +88,7 @@ in systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ]; systemd.services.plymouth-halt.wantedBy = [ "halt.target" ]; systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ]; - systemd.services.plymouth-quit = { - wantedBy = [ "multi-user.target" ]; - after = [ "display-manager.service" ]; - }; + systemd.services.plymouth-quit.wantedBy = [ "multi-user.target" ]; systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ]; systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ]; systemd.services.plymouth-read-write.wantedBy = [ "sysinit.target" ]; -- cgit 1.4.1 From 60aedadc59030477a9340af69866c728ac05d924 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 15 Oct 2019 18:18:20 -0400 Subject: nixos/gnome3: fix gnome-flashback This session would fail to start because we didn't have it in systemd.packages (as we've switched to systemd gnome-session). Haven't tested custom sessions. --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 20385c884b5e..125fffa8251f 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -176,6 +176,10 @@ in wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; } ++ cfg.flashback.customSessions); + systemd.packages = with pkgs.gnome3; [ + gnome-flashback + ]; + security.pam.services.gnome-screensaver = { enableGnomeKeyring = true; }; -- cgit 1.4.1 From 0dbbeabdaba6b6ac57c2450c68afd8cf06e9e3f8 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 15 Oct 2019 20:56:09 -0400 Subject: nixos/gnome3: copy flashback gschema overrides --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 125fffa8251f..9a402c74c052 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -30,6 +30,10 @@ let cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + ${optionalString flashbackEnabled '' + cp -f ${pkgs.gnome3.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + ''} + chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF [org.gnome.desktop.background] -- cgit 1.4.1 From 201cca9a04bbd2d80237e7eeb824d55909bb11be Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 18 Oct 2019 08:00:56 +0200 Subject: Revert "nixos/gitlab: properly clear out initializers" This reverts commit 2ee14c34ed1912ee31f1d4cc117b0ab25a3b20b1. This caused the initializers directory to be cleaned out while gitlab was running in some instances. We clean out the directory on the preStart stage already, so ensuring existance and permissions should suffice. --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 20b87af23a5a..34be9d69a46c 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -649,7 +649,7 @@ in { "d ${cfg.statePath} 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/builds 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/config 0750 ${cfg.user} ${cfg.group} -" - "D ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" + "d ${cfg.statePath}/config/initializers 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/db 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/log 0750 ${cfg.user} ${cfg.group} -" "d ${cfg.statePath}/repositories 2770 ${cfg.user} ${cfg.group} -" -- cgit 1.4.1 From 5e593038d1cf9ff151c01179c7722b765fa37765 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 18 Oct 2019 11:55:20 +0200 Subject: nixos/networkmanager: use tmpfiles to setup state directories --- .../modules/services/networking/networkmanager.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 3f1d0727d9bc..45dc36e32402 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -24,9 +24,6 @@ let enableIwd = cfg.wifi.backend == "iwd"; - # /var/lib/misc is for dnsmasq.leases. - stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc"; - configFile = pkgs.writeText "NetworkManager.conf" '' [main] plugins=keyfile @@ -472,17 +469,24 @@ in { systemd.packages = cfg.packages; + systemd.tmpfiles.rules = [ + "d /etc/NetworkManager/system-connections 0700 root root -" + "d /etc/ipsec.d 0700 root root -" + + "d /var/lib/dhclient 0755 root root -" + "d /var/lib/misc 0755 root root -" # for dnsmasq.leases + ]; + systemd.services.NetworkManager = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile ]; - preStart = '' - mkdir -m 700 -p /etc/NetworkManager/system-connections - mkdir -m 700 -p /etc/ipsec.d - mkdir -m 755 -p ${stateDirs} - ''; - aliases = [ "dbus-org.freedesktop.NetworkManager.service" ]; + + serviceConfig = { + StateDirectory = "NetworkManager"; + StateDirectoryMode = 755; # not sure if this really needs to be 755 + }; }; systemd.services.NetworkManager-wait-online = { -- cgit 1.4.1 From 32c7f772f75bdbd848147aea640686fcb01c0ca5 Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 25 Sep 2019 17:49:36 +0000 Subject: nixos/rabbitmq: use a literalExample for example configItems --- nixos/modules/services/amqp/rabbitmq.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 38d109234946..697732426ccf 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -80,10 +80,12 @@ in { configItems = mkOption { default = {}; type = types.attrsOf types.str; - example = { - "auth_backends.1.authn" = "rabbit_auth_backend_ldap"; - "auth_backends.1.authz" = "rabbit_auth_backend_internal"; - }; + example = literalExample '' + { + "auth_backends.1.authn" = "rabbit_auth_backend_ldap"; + "auth_backends.1.authz" = "rabbit_auth_backend_internal"; + } + ''; description = '' Configuration options in RabbitMQ's new config file format, which is a simple key-value format that can not express nested -- cgit 1.4.1 From 4623f0a2c641673af19f6cfcdc8627ecf4727db1 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 18 Oct 2019 11:46:55 -0700 Subject: nixos/make-iso9660-image: Fix storeContents documentation `packages` was renamed to `storeContents` in 668c146e33291e933ccfb19fd39fab9cd2b7900d, but this comment describing its purpose was not updated to match. --- nixos/lib/make-iso9660-image.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos') diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 8cd19b6e1874..2c3026875c0e 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -10,9 +10,9 @@ contents , # In addition to `contents', the closure of the store paths listed - # in `packages' are also placed in the Nix store of the CD. This is - # a list of attribute sets {object, symlink} where `object' if a - # store path whose closure will be copied, and `symlink' is a + # in `storeContents' are also placed in the Nix store of the CD. + # This is a list of attribute sets {object, symlink} where `object' + # if a store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the CD. storeContents ? [] -- cgit 1.4.1 From ac65940537f364cc95508d055955a7c030e31b55 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 18 Oct 2019 11:54:54 -0700 Subject: nixos/make-iso9660-image: Fix doc typo --- nixos/lib/make-iso9660-image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 2c3026875c0e..0f3f2b5b5234 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -12,7 +12,7 @@ , # In addition to `contents', the closure of the store paths listed # in `storeContents' are also placed in the Nix store of the CD. # This is a list of attribute sets {object, symlink} where `object' - # if a store path whose closure will be copied, and `symlink' is a + # is a store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the CD. storeContents ? [] -- cgit 1.4.1 From a37b9636f75a9850a792f639113b546410137b37 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 17 Oct 2019 12:00:00 +0000 Subject: networkmanager-fortisslvpn: create the local state directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise connecting simply fails: VPN connection: failed to connect: 'La création du fichier « /tmp/lib/NetworkManager-fortisslvpn/0507e3ef-f0e0-4153-af64-b3d9a025877c.config.XSB19Z » a échoué : No such file or directory' --- nixos/modules/services/networking/networkmanager.nix | 1 + pkgs/tools/networking/network-manager/fortisslvpn/default.nix | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 45dc36e32402..05a78d1c4486 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -472,6 +472,7 @@ in { systemd.tmpfiles.rules = [ "d /etc/NetworkManager/system-connections 0700 root root -" "d /etc/ipsec.d 0700 root root -" + "d /var/lib/NetworkManager-fortisslvpn 0700 root root -" "d /var/lib/dhclient 0755 root root -" "d /var/lib/misc 0755 root root -" # for dnsmasq.leases diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix index dbf175d20c95..53d6ab2fbcf5 100644 --- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix @@ -32,10 +32,14 @@ in stdenv.mkDerivation { configureFlags = [ "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" - "--localstatedir=/tmp" + "--localstatedir=/var" "--enable-absolute-paths" ]; + # the installer only create an empty directory in localstatedir, so + # we can drop it + installFlags = [ "localstatedir=." ]; + passthru = { updateScript = gnome3.updateScript { packageName = pname; -- cgit 1.4.1 From 42f567b30def552337bf17a6d30410c16c2b47cc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 19 Oct 2019 19:57:49 -0400 Subject: Revert "nixos/gnome3: fix gnome-flashback" This reverts commit 60aedadc59030477a9340af69866c728ac05d924. Using tests from #71212 I am now unable to reproduce there being issues with starting the default metacity flashback session without this. --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nixos') diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 9a402c74c052..5ad31e5b9d00 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -180,10 +180,6 @@ in wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; } ++ cfg.flashback.customSessions); - systemd.packages = with pkgs.gnome3; [ - gnome-flashback - ]; - security.pam.services.gnome-screensaver = { enableGnomeKeyring = true; }; -- cgit 1.4.1