commit 9241cee3c4cc58d77f588a00f5ef6d69c989fd0d · pyrox.dev/nixpkgs

+35 -8

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

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         cfg = config.services.nextcloud.notify_push;

     

       5
       5
       +
         cfgN = config.services.nextcloud;

     

       5
       6
        
       in

     

       6
       7
        
       {

     

       7
       8
        
         options.services.nextcloud.notify_push = {

     
···

       24
       25
        
             type = lib.types.enum [ "error" "warn" "info" "debug" "trace" ];

     

       25
       26
        
             default = "error";

     

       26
       27
        
             description = lib.mdDoc "Log level";

     

       28
       28
       +
           };

     

       29
       29
       +
       

     

       30
       30
       +
           bendDomainToLocalhost = lib.mkOption {

     

       31
       31
       +
             type = lib.types.bool;

     

       32
       32
       +
             default = false;

     

       33
       33
       +
             description = lib.mdDoc ''

     

       34
       34
       +
               Wether to add an entry to `/etc/hosts` for the configured nextcloud domain to point to `localhost` and add `localhost `to nextcloud's `trusted_proxies` config option.

     

       35
       35
       +
       

     

       36
       36
       +
               This is useful when nextcloud's domain is not a static IP address and when the reverse proxy cannot be bypassed because the backend connection is done via unix socket.

     

       37
       37
       +
             '';

     

       27
       38
        
           };

     

       28
       39
        
         } // (

     

       29
       40
        
           lib.genAttrs [

     
···

       44
       55
        
       

     

       45
       56
        
         config = lib.mkIf cfg.enable {

     

       46
       57
        
           systemd.services.nextcloud-notify_push = let

     

       47
       47
       -
             nextcloudUrl = "http${lib.optionalString config.services.nextcloud.https "s"}://${config.services.nextcloud.hostName}";

     

       58
       58
       +
             nextcloudUrl = "http${lib.optionalString cfgN.https "s"}://${cfgN.hostName}";

     

       48
       59
        
           in {

     

       49
       60
        
             description = "Push daemon for Nextcloud clients";

     

       50
       61
        
             documentation = [ "https://github.com/nextcloud/notify_push" ];

     

       51
       51
       -
             after = [ "phpfpm-nextcloud.service" ];

     

       62
       62
       +
             after = [

     

       63
       63
       +
               "phpfpm-nextcloud.service"

     

       64
       64
       +
               "redis-nextcloud.service"

     

       65
       65
       +
             ];

     

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

     

       53
       67
        
             environment = {

     

       54
       68
        
               NEXTCLOUD_URL = nextcloudUrl;

     
···

       57
       71
        
               LOG = cfg.logLevel;

     

       58
       72
        
             };

     

       59
       73
        
             postStart = ''

     

       60
       60
       -
               ${config.services.nextcloud.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push

     

       74
       74
       +
               ${cfgN.occ}/bin/nextcloud-occ notify_push:setup ${nextcloudUrl}/push

     

       61
       75
        
             '';

     

       62
       76
        
             script = let

     

       63
       77
        
               dbType = if cfg.dbtype == "pgsql" then "postgresql" else cfg.dbtype;

     
···

       76
       90
        
               export DATABASE_PASSWORD="$(<"${cfg.dbpassFile}")"

     

       77
       91
        
             '' + ''

     

       78
       92
        
               export DATABASE_URL="${dbUrl}"

     

       79
       79
       -
               ${cfg.package}/bin/notify_push '${config.services.nextcloud.datadir}/config/config.php'

     

       93
       93
       +
               ${cfg.package}/bin/notify_push '${cfgN.datadir}/config/config.php'

     

       80
       94
        
             '';

     

       81
       95
        
             serviceConfig = {

     

       82
       96
        
               User = "nextcloud";

     
···

       87
       101
        
             };

     

       88
       102
        
           };

     

       89
       103
        
       

     

       90
       90
       -
           services.nginx.virtualHosts.${config.services.nextcloud.hostName}.locations."^~ /push/" = {

     

       91
       91
       -
             proxyPass = "http://unix:${cfg.socketPath}";

     

       92
       92
       -
             proxyWebsockets = true;

     

       93
       93
       -
             recommendedProxySettings = true;

     

       104
       104
       +
           networking.hosts = lib.mkIf cfg.bendDomainToLocalhost {

     

       105
       105
       +
             "127.0.0.1" = [ cfgN.hostName ];

     

       106
       106
       +
             "::1" = [ cfgN.hostName ];

     

       94
       107
        
           };

     

       108
       108
       +
       

     

       109
       109
       +
           services = lib.mkMerge [

     

       110
       110
       +
             {

     

       111
       111
       +
               nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {

     

       112
       112
       +
                 proxyPass = "http://unix:${cfg.socketPath}";

     

       113
       113
       +
                 proxyWebsockets = true;

     

       114
       114
       +
                 recommendedProxySettings = true;

     

       115
       115
       +
               };

     

       116
       116
       +
             }

     

       117
       117
       +
       

     

       118
       118
       +
             (lib.mkIf cfg.bendDomainToLocalhost {

     

       119
       119
       +
               nextcloud.extraOptions.trusted_proxies = [ "127.0.0.1" "::1" ];

     

       120
       120
       +
             })

     

       121
       121
       +
           ];

     

       95
       122
        
         };

     

       96
       123
        
       }

+32

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

···

       551
       551
        
             default = true;

     

       552
       552
        
           };

     

       553
       553
        
       

     

       554
       554
       +
           configureRedis = lib.mkOption {

     

       555
       555
       +
             type = lib.types.bool;

     

       556
       556
       +
             default = config.services.nextcloud.notify_push.enable;

     

       557
       557
       +
             defaultText = literalExpression "config.services.nextcloud.notify_push.enable";

     

       558
       558
       +
             description = lib.mdDoc ''

     

       559
       559
       +
               Wether to configure nextcloud to use the recommended redis settings for small instances.

     

       560
       560
       +
       

     

       561
       561
       +
               ::: {.note}

     

       562
       562
       +
               The `notify_push` app requires redis to be configured. If this option is turned off, this must be configured manually.

     

       563
       563
       +
               :::

     

       564
       564
       +
             '';

     

       565
       565
       +
           };

     

       566
       566
       +
       

     

       554
       567
        
           caching = {

     

       555
       568
        
             apcu = mkOption {

     

       556
       569
        
               type = types.bool;

     
···

       1042
       1055
        
                 name = cfg.config.dbuser;

     

       1043
       1056
        
                 ensurePermissions = { "DATABASE ${cfg.config.dbname}" = "ALL PRIVILEGES"; };

     

       1044
       1057
        
               }];

     

       1058
       1058
       +
             };

     

       1059
       1059
       +
       

     

       1060
       1060
       +
             services.redis.servers.nextcloud = lib.mkIf cfg.configureRedis {

     

       1061
       1061
       +
               enable = true;

     

       1062
       1062
       +
               user = "nextcloud";

     

       1063
       1063
       +
             };

     

       1064
       1064
       +
       

     

       1065
       1065
       +
             services.nextcloud = lib.mkIf cfg.configureRedis {

     

       1066
       1066
       +
               caching.redis = true;

     

       1067
       1067
       +
               extraOptions = {

     

       1068
       1068
       +
                 memcache = {

     

       1069
       1069
       +
                   distributed = ''\OC\Memcache\Redis'';

     

       1070
       1070
       +
                   locking = ''\OC\Memcache\Redis'';

     

       1071
       1071
       +
                 };

     

       1072
       1072
       +
                 redis = {

     

       1073
       1073
       +
                   host = config.services.redis.servers.nextcloud.unixSocket;

     

       1074
       1074
       +
                   port = 0;

     

       1075
       1075
       +
                 };

     

       1076
       1076
       +
               };

     

       1045
       1077
        
             };

     

       1046
       1078
        
       

     

       1047
       1079
        
             services.nginx.enable = mkDefault true;