aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--hosts/by-name/server2/configuration.nix8
-rw-r--r--modules/by-name/ne/nextcloud/module.nix3
2 files changed, 9 insertions, 2 deletions
diff --git a/hosts/by-name/server2/configuration.nix b/hosts/by-name/server2/configuration.nix
index 5b85e69..8cdd45d 100644
--- a/hosts/by-name/server2/configuration.nix
+++ b/hosts/by-name/server2/configuration.nix
@@ -1,4 +1,8 @@
-{lib, ...}: {
+{
+ lib,
+ pkgs,
+ ...
+}: {
imports = [
./networking.nix # network configuration that just works
./hardware.nix
@@ -59,9 +63,11 @@
};
nextcloud = {
enable = true;
+ package = pkgs.nextcloud33;
hostname = "nextcloud.vhack.eu";
adminpassFile = ./secrets/nextcloud/adminpassFile.age;
};
+
nginx = {
enable = true;
redirects = {
diff --git a/modules/by-name/ne/nextcloud/module.nix b/modules/by-name/ne/nextcloud/module.nix
index 3e1ef3e..f91ddae 100644
--- a/modules/by-name/ne/nextcloud/module.nix
+++ b/modules/by-name/ne/nextcloud/module.nix
@@ -43,6 +43,8 @@ in {
services = {
nextcloud = {
enable = true;
+ inherit (cfg) package;
+
extraApps = {
inherit (cfg.package.packages.apps) calendar contacts tasks;
};
@@ -59,7 +61,6 @@ in {
hostName = cfg.hostname;
https = true;
maxUploadSize = "5G";
- package = cfg.package;
settings = {
default_phone_region = "DE";
};