Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2a61c058c61b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 542e38491626
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 1, 2019

  1. nixos/nextcloud: update recommended nginx settings 

    This updates the configuration to the recommendations in
https://docs.nextcloud.com/server/15/admin_manual/installation/nginx.html
    @bachp
    bachp committed Mar 1, 2019
    Copy the full SHA
    7f86209 View commit details

  2. nixos/nextcloud: use PHP 7.3 instead of 7.1 by default

    @bachp
    bachp committed Mar 1, 2019
    Copy the full SHA
    8f1b163 View commit details

  3. nixos/nextcloud: move phpPackage and phpOptions into pool 

    This allows to have a php configuration for nextcloud that is independent
of the global configuration.
    @bachp
    bachp committed Mar 1, 2019
    Copy the full SHA
    f0c0b8d View commit details

  4. nixos/nextcloud: don't make phpPackages configurable 

    It needs to match the version in phpfm which is hard coded.
So there is no point in being able to change it.
    @bachp
    bachp committed Mar 1, 2019
    Copy the full SHA
    390b610 View commit details

Commits on Mar 2, 2019

  1. Merge pull request #56496 from bachp/nextcloud-nginx-recommended 

    nixos/nextcloud: Update recommended nginx settings
    @fpletz
    fpletz authored Mar 2, 2019
    Copy the full SHA
    542e384 View commit details
Showing with 17 additions and 22 deletions.
  1. +17 −22 nixos/modules/services/web-apps/nextcloud.nix
39 changes: 17 additions & 22 deletions nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -5,14 +5,18 @@ with lib;
let
cfg = config.services.nextcloud;

phpPackage = pkgs.php73;
phpPackages = pkgs.php73Packages;

toKeyValue = generators.toKeyValue {
mkKeyValue = generators.mkKeyValueDefault {} " = ";
};

phpOptionsExtensions = ''
${optionalString cfg.caching.apcu "extension=${cfg.phpPackages.apcu}/lib/php/extensions/apcu.so"}
${optionalString cfg.caching.redis "extension=${cfg.phpPackages.redis}/lib/php/extensions/redis.so"}
${optionalString cfg.caching.memcached "extension=${cfg.phpPackages.memcached}/lib/php/extensions/memcached.so"}
${optionalString cfg.caching.apcu "extension=${phpPackages.apcu}/lib/php/extensions/apcu.so"}
${optionalString cfg.caching.redis "extension=${phpPackages.redis}/lib/php/extensions/redis.so"}
${optionalString cfg.caching.memcached "extension=${phpPackages.memcached}/lib/php/extensions/memcached.so"}
extension=${phpPackages.imagick}/lib/php/extensions/imagick.so
zend_extension = opcache.so
opcache.enable = 1
'';
@@ -94,18 +98,6 @@ in {
'';
};

phpPackages = mkOption {
type = types.attrs;
default = pkgs.php71Packages;
defaultText = "pkgs.php71Packages";
description = ''
Overridable attribute of the PHP packages set to use. If any caching
module is enabled, it will be taken from here. Therefore it should
match the version of PHP given to
<literal>services.phpfpm.phpPackage</literal>.
'';
};

phpOptions = mkOption {
type = types.attrsOf types.str;
default = {
@@ -373,14 +365,14 @@ in {
};

services.phpfpm = {
phpOptions = phpOptionsExtensions;
phpPackage = pkgs.php71;
pools.nextcloud = let
phpAdminValues = (toKeyValue
(foldr (a: b: a // b) {}
(mapAttrsToList (k: v: { "php_admin_value[${k}]" = v; })
phpOptions)));
in {
phpOptions = phpOptionsExtensions;
phpPackage = phpPackage;
listen = "/run/phpfpm/nextcloud";
extraConfig = ''
listen.owner = nginx
@@ -421,7 +413,7 @@ in {
};
"/" = {
priority = 200;
extraConfig = "rewrite ^ /index.php$uri;";
extraConfig = "rewrite ^ /index.php$request_uri;";
};
"~ ^/store-apps" = {
priority = 201;
@@ -458,22 +450,23 @@ in {
fastcgi_read_timeout 120s;
'';
};
"~ ^/(?:updater|ocs-provider)(?:$|/)".extraConfig = ''
"~ ^/(?:updater|ocs-provider|ocm-provider)(?:$|\/)".extraConfig = ''
try_files $uri/ =404;
index index.php;
'';
"~ \\.(?:css|js|woff|svg|gif)$".extraConfig = ''
try_files $uri /index.php$uri$is_args$args;
"~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = ''
try_files $uri /index.php$request_uri;
add_header Cache-Control "public, max-age=15778463";
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header Referrer-Policy no-referrer;
access_log off;
'';
"~ \\.(?:png|html|ttf|ico|jpg|jpeg)$".extraConfig = ''
try_files $uri /index.php$uri$is_args$args;
try_files $uri /index.php$request_uri;
access_log off;
'';
};
@@ -483,10 +476,12 @@ in {
add_header X-Robots-Tag none;
add_header X-Download-Options noopen;
add_header X-Permitted-Cross-Domain-Policies none;
add_header Referrer-Policy no-referrer;
error_page 403 /core/templates/403.php;
error_page 404 /core/templates/404.php;
client_max_body_size ${cfg.maxUploadSize};
fastcgi_buffers 64 4K;
fastcgi_hide_header X-Powered-By;
gzip on;
gzip_vary on;
gzip_comp_level 4;