commit 1ee008fcb5d2dd4b9254a3168de97f5c45da9dac · pyrox.dev/nixpkgs

+23 -14

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

···

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.nextcloud;

     

       7
       7
        
         fpm = config.services.phpfpm.pools.nextcloud;

     

       8
       8
       -
         datadir = if cfg.datadir == null then "${cfg.home}" else "${cfg.datadir}";

     

       8
       8
       +
       

     

       9
       9
       +
         inherit (cfg) datadir;

     

       9
       10
        
       

     

       10
       11
        
         phpPackage = cfg.phpPackage.buildEnv {

     

       11
       12
        
           extensions = { enabled, all }:

     
···

       87
       88
        
             description = "Storage path of nextcloud.";

     

       88
       89
        
           };

     

       89
       90
        
           datadir = mkOption {

     

       90
       90
       -
             type = types.nullOr types.str;

     

       91
       91
       -
             default = null;

     

       91
       91
       +
             type = types.str;

     

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

     

       92
       93
        
             description = ''

     

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

     

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

     
···

       107
       108
        
               {

     

       108
       109
        
                 maps = pkgs.fetchNextcloudApp {

     

       109
       110
        
                   name = "maps";

     

       110
       110
       -
                   sha256 = "007y80idqg6b6zk6kjxg4vgw0z8fsxs9lajnv49vv1zjy6jx2i1i+useTheLatestVersion";

     

       111
       111
       +
                   sha256 = "007y80idqg6b6zk6kjxg4vgw0z8fsxs9lajnv49vv1zjy6jx2i1i";

     

       111
       112
        
                   url = "https://github.com/nextcloud/maps/releases/download/v0.1.9/maps-0.1.9.tar.gz";

     

       112
       113
        
                   version = "0.1.9";

     

       113
       114
        
                 };

     

       114
       115
        
                 phonetrack = pkgs.fetchNextcloudApp {

     

       115
       116
        
                   name = "phonetrack";

     

       116
       116
       -
                   sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc+breakSha";

     

       117
       117
       +
                   sha256 = "0qf366vbahyl27p9mshfma1as4nvql6w75zy2zk5xwwbp343vsbc";

     

       117
       118
        
                   url = "https://gitlab.com/eneiluj/phonetrack-oc/-/wikis/uploads/931aaaf8dca24bf31a7e169a83c17235/phonetrack-0.6.9.tar.gz";

     

       118
       119
        
                   version = "0.6.9";

     

       119
       120
        
                 };

     
···

       578
       579
        
                 else nextcloud22

     

       579
       580
        
               );

     

       580
       581
        
       

     

       582
       582
       +
             services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;

     

       583
       583
       +
       

     

       581
       584
        
             services.nextcloud.phpPackage =

     

       582
       585
        
               if versionOlder cfg.package.version "21" then pkgs.php74

     

       583
       586
        
               else pkgs.php80;

     
···

       617
       620
        
                   ]

     

       618
       621
        
                 '';

     

       619
       622
        
       

     

       623
       623
       +
                 showAppStoreSetting = cfg.appstoreEnable != null || cfg.extraApps != {};

     

       624
       624
       +
                 renderedAppStoreSetting =

     

       625
       625
       +
                   let

     

       626
       626
       +
                     x = cfg.appstoreEnable;

     

       627
       627
       +
                   in

     

       628
       628
       +
                     if x == null then "false"

     

       629
       629
       +
                     else boolToString x;

     

       630
       630
       +
       

     

       620
       631
        
                 overrideConfig = pkgs.writeText "nextcloud-config.php" ''

     

       621
       632
        
                   <?php

     

       622
       633
        
                   ${optionalString requiresReadSecretFunction ''

     
···

       639
       650
        
                       [ 'path' => '${cfg.home}/apps', 'url' => '/apps', 'writable' => false ],

     

       640
       651
        
                       [ 'path' => '${cfg.home}/store-apps', 'url' => '/store-apps', 'writable' => true ],

     

       641
       652
        
                     ],

     

       642
       642
       -
                     ${if (cfg.appstoreEnable != null)

     

       643
       643
       -
                       then '''appstoreenabled' => ${lib.boolToString cfg.appstoreEnable},''

     

       644
       644
       -
                       else (if (cfg.extraApps != { })

     

       645
       645
       -
                             then '''appstoreenabled' => false,''

     

       646
       646
       -
                             else "")}

     

       653
       653
       +
                     ${optionalString (showAppStoreSetting) "'appstoreenabled' => ${renderedAppStoreSetting},"}

     

       647
       654
        
                     'datadirectory' => '${datadir}/data',

     

       648
       655
        
                     'skeletondirectory' => '${cfg.skeletonDirectory}',

     

       649
       656
        
                     ${optionalString cfg.caching.apcu "'memcache.local' => '\\OC\\Memcache\\APCu',"}

     
···

       729
       736
        
                   fi

     

       730
       737
        
       

     

       731
       738
        
                   ln -sf ${cfg.package}/apps ${cfg.home}/

     

       732
       732
       -
                   rm -rf ${cfg.home}/nix-apps

     

       733
       739
        
       

     

       734
       734
       -
                   #Install extra apps

     

       735
       735
       -
                   ln -sfT ${pkgs.linkFarm "nix-apps" (lib.mapAttrsToList (name: target: {name=name; path=target;}) cfg.extraApps)} ${cfg.home}/nix-apps

     

       740
       740
       +
                   # Install extra apps

     

       741
       741
       +
                   ln -sfT \

     

       742
       742
       +
                     ${pkgs.linkFarm "nix-apps"

     

       743
       743
       +
                       (mapAttrsToList (name: path: { inherit name path; }) cfg.extraApps)} \

     

       744
       744
       +
                     ${cfg.home}/nix-apps

     

       736
       745
        
       

     

       737
       746
        
                   # create nextcloud directories.

     

       738
       747
        
                   # if the directories exist already with wrong permissions, we fix that

     
···

       757
       766
        
       

     

       758
       767
        
                   ${optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) ''

     

       759
       768
        
                       # Try to enable apps (don't fail when one of them cannot be enabled , eg. due to incompatible version)

     

       760
       760
       -
                       ${occ}/bin/nextcloud-occ app:enable ${builtins.concatStringsSep " " ( lib.mapAttrsToList (name: target: "${name}") cfg.extraApps)}

     

       769
       769
       +
                       ${occ}/bin/nextcloud-occ app:enable ${concatStringsSep " " (attrNames cfg.extraApps)}

     

       761
       770
        
                   ''}

     

       762
       771
        
       

     

       763
       772
        
                   ${occSetTrustedDomainsCmd}

nixos/tests/nextcloud/basic.nix

···

       33
       33
        
           in {

     

       34
       34
        
             networking.firewall.allowedTCPPorts = [ 80 ];

     

       35
       35
        
       

     

       36
       36
       +
             systemd.tmpfiles.rules = [

     

       37
       37
       +
               "d /var/lib/nextcloud-data 0750 nextcloud nginx - -"

     

       38
       38
       +
             ];

     

       39
       39
       +
       

     

       36
       40
        
             services.nextcloud = {

     

       37
       41
        
               enable = true;

     

       42
       42
       +
               datadir = "/var/lib/nextcloud-data";

     

       38
       43
        
               hostName = "nextcloud";

     

       39
       44
        
               config = {

     

       40
       45
        
                 # Don't inherit adminuser since "root" is supposed to be the default

     
···

       98
       103
        
               "${withRcloneEnv} ${copySharedFile}"

     

       99
       104
        
           )

     

       100
       105
        
           client.wait_for_unit("multi-user.target")

     

       106
       106
       +
           nextcloud.succeed("test -f /var/lib/nextcloud-data/data/root/files/test-shared-file")

     

       101
       107
        
           client.succeed(

     

       102
       108
        
               "${withRcloneEnv} ${diffSharedFile}"

     

       103
       109
        
           )

+1 -2

pkgs/build-support/fetchnextcloudapp/default.nix

···

       10
       10
        
         inherit version patches;

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
       -
           url = url;

     

       14
       14
       -
           sha256 = sha256;

     

       13
       13
       +
           inherit url sha256;

     

       15
       14
        
         };

     

       16
       15
        
       

     

       17
       16
        
         nativeBuildInputs = [