movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

nextcloud: deprecate nginx, use chgrp, mkDefault for nginx, fix tests

Browse source
This commit is contained in:
DavHau 2020-08-03 14:04:46 +07:00
parent b90a70d53f
commit ca916e8cb3
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/services/web-apps/nextcloud.nix
View file

@ -45,6 +45,12 @@ let
inherit (config.system) stateVersion; inherit (config.system) stateVersion;
in { in {
imports = [
( mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ]
"The nextcloud module dropped support for other webservers than nginx.")
];
options.services.nextcloud = { options.services.nextcloud = {
enable = mkEnableOption "nextcloud"; enable = mkEnableOption "nextcloud";
hostName = mkOption { hostName = mkOption {
@ -465,7 +471,7 @@ in {
if [ ! -e $dir ]; then if [ ! -e $dir ]; then
install -o nextcloud -g nextcloud -d $dir install -o nextcloud -g nextcloud -d $dir
elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then
chown -R nextcloud:nextcloud $dir chgrp -R nextcloud $dir
fi fi
done done
@ -524,8 +530,8 @@ in {
users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ]; users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ];
environment.systemPackages = [ occ ]; environment.systemPackages = [ occ ];
services.nginx.enable = true; services.nginx.enable = mkDefault true;
services.nginx.virtualHosts.${cfg.hostName} = { services.nginx.virtualHosts.${cfg.hostName} = {
root = cfg.package; root = cfg.package;
locations = { locations = {

1
nixos/tests/nextcloud/basic.nix
View file

@ -33,7 +33,6 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
nginx.enable = true;
hostName = "nextcloud"; hostName = "nextcloud";
config = { config = {
# Don't inherit adminuser since "root" is supposed to be the default # Don't inherit adminuser since "root" is supposed to be the default

1
nixos/tests/nextcloud/with-mysql-and-memcached.nix
View file

@ -17,7 +17,6 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
hostName = "nextcloud"; hostName = "nextcloud";
nginx.enable = true;
https = true; https = true;
caching = { caching = {
apcu = true; apcu = true;

1
nixos/tests/nextcloud/with-postgresql-and-redis.nix
View file

@ -17,7 +17,6 @@ in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
hostName = "nextcloud"; hostName = "nextcloud";
nginx.enable = true;
caching = { caching = {
apcu = false; apcu = false;
redis = true; redis = true;