···

       
89
       
89
       
 
       
    };

     

       
90
       
90
       
 
       
    datadir = mkOption {

     

       
91
       
91
       
 
       
      type = types.str;

     

       
92
       
92
       
-
       
      defaultText = "config.services.nextcloud.home";

     

       
92
       
92
       
+
       
      default = config.services.nextcloud.home;

     

       
93
       
93
       
+
       
      defaultText = literalExpression "config.services.nextcloud.home";

     

       
93
       
94
       
 
       
      description = ''

     

       
94
       
95
       
 
       
        Data storage path of nextcloud.  Will be <xref linkend="opt-services.nextcloud.home" /> by default.

     

       
95
       
96
       
 
       
        This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database).";

     
···

       
629
       
630
       
 
       
          else nextcloud24

     

       
630
       
631
       
 
       
        );

     

       
631
       
632
       
 
       


     

       
632
       
632
       
-
       
      services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;

     

       
633
       
633
       
-
       


     

       
634
       
633
       
 
       
      services.nextcloud.phpPackage =

     

       
635
       
634
       
 
       
        if versionOlder cfg.package.version "24" then pkgs.php80

     

       
636
       
635
       
 
       
        # FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed:

     
···

       
650
       
649
       
 
       


     

       
651
       
650
       
 
       
    { systemd.timers.nextcloud-cron = {

     

       
652
       
651
       
 
       
        wantedBy = [ "timers.target" ];

     

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

     

       
653
       
653
       
 
       
        timerConfig.OnBootSec = "5m";

     

       
654
       
654
       
 
       
        timerConfig.OnUnitActiveSec = "5m";

     

       
655
       
655
       
 
       
        timerConfig.Unit = "nextcloud-cron.service";

     
···

       
840
       
840
       
 
       
          serviceConfig.User = "nextcloud";

     

       
841
       
841
       
 
       
        };

     

       
842
       
842
       
 
       
        nextcloud-cron = {

     

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

     

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

     

       
844
       
845
       
 
       
          serviceConfig.Type = "oneshot";

     

       
845
       
846
       
 
       
          serviceConfig.User = "nextcloud";

     

       
846
       
847
       
 
       
          serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php";

     

       
847
       
848
       
 
       
        };

     

       
848
       
849
       
 
       
        nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {

     

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

     

       
849
       
851
       
 
       
          serviceConfig.Type = "oneshot";

     

       
850
       
852
       
 
       
          serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";

     

       
851
       
853
       
 
       
          serviceConfig.User = "nextcloud";

     
···

       
914
       
916
       
 
       
            priority = 100;

     

       
915
       
917
       
 
       
            extraConfig = ''

     

       
916
       
918
       
 
       
              allow all;

     

       
917
       
917
       
-
       
              log_not_found off;

     

       
918
       
919
       
 
       
              access_log off;

     

       
919
       
920
       
 
       
            '';

     

       
920
       
921
       
 
       
          };