Unverified Commit 4a451cb3 authored by Jonas Heinrich's avatar Jonas Heinrich Committed by GitHub
Browse files

Merge pull request #308291 from Ma27/nc-update-db 

nixos/nextcloud: add nextcloud-update-db.service, nextcloud-cron isn't oneshot
parents fe433eb5 5ef467d6

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

+16 −1
Original line number Diff line number Diff line
@@ -939,6 +939,7 @@ in { 


        in {

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

          wants = [ "nextcloud-update-db.service" ];

          before = [ "phpfpm-nextcloud.service" ];

          after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";

          requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
@@ -997,7 +998,7 @@ in { 
          after = [ "nextcloud-setup.service" ];

          environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";

          serviceConfig = {

            Type = "oneshot";

            Type = "exec";

            User = "nextcloud";

            ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e";

            ExecStart = "${lib.getExe phpPackage} -f ${webroot}/cron.php";
@@ -1013,6 +1014,20 @@ in { 
          };

          startAt = cfg.autoUpdateApps.startAt;

        };

        nextcloud-update-db = {

          after = [ "nextcloud-setup.service" ];

          environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";

          script = ''

            ${occ}/bin/nextcloud-occ db:add-missing-columns

            ${occ}/bin/nextcloud-occ db:add-missing-indices

            ${occ}/bin/nextcloud-occ db:add-missing-primary-keys

          '';

          serviceConfig = {

            Type = "exec";

            User = "nextcloud";

            ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e";

          };

        };

      };



      services.phpfpm = {