Merge pull request #308291 from Ma27/nc-update-db
nixos/nextcloud: add nextcloud-update-db.service, nextcloud-cron isn't oneshot
This commit is contained in:
commit
4a451cb3ce
|
@ -939,6 +939,7 @@ in {
|
||||||
|
|
||||||
in {
|
in {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
wants = [ "nextcloud-update-db.service" ];
|
||||||
before = [ "phpfpm-nextcloud.service" ];
|
before = [ "phpfpm-nextcloud.service" ];
|
||||||
after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
|
after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
|
||||||
requires = 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" ];
|
after = [ "nextcloud-setup.service" ];
|
||||||
environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";
|
environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "oneshot";
|
Type = "exec";
|
||||||
User = "nextcloud";
|
User = "nextcloud";
|
||||||
ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e";
|
ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e";
|
||||||
ExecStart = "${lib.getExe phpPackage} -f ${webroot}/cron.php";
|
ExecStart = "${lib.getExe phpPackage} -f ${webroot}/cron.php";
|
||||||
|
@ -1013,6 +1014,20 @@ in {
|
||||||
};
|
};
|
||||||
startAt = cfg.autoUpdateApps.startAt;
|
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 = {
|
services.phpfpm = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user