Unverified Commit e6b07898 authored by networkException's avatar networkException
Browse files

nixos/nextcloud: move systemd service overrides for phpfpm-nextcloud closer to phpfpm config

parent 598ba392

nixos/modules/services/web-apps/nextcloud.nix

+7 −5
Original line number Diff line number Diff line
@@ -929,11 +929,6 @@ in { 
      ];



      systemd.services = {

        # When upgrading the Nextcloud package, Nextcloud can report errors such as

        # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"

        # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround).

        phpfpm-nextcloud.restartTriggers = [ webroot overrideConfig ];



        nextcloud-setup = let

          c = cfg.config;

          occInstallCmd = let
@@ -1068,6 +1063,13 @@ in { 
            ExecCondition = "${phpCli} -f ${webroot}/occ status -e";

          };

        };



        phpfpm-nextcloud = {

          # When upgrading the Nextcloud package, Nextcloud can report errors such as

          # "The files of the app [all apps in /var/lib/nextcloud/apps] were not replaced correctly"

          # Restarting phpfpm on Nextcloud package update fixes these issues (but this is a workaround).

          restartTriggers = [ webroot overrideConfig ];

        };

      };



      services.phpfpm = {