Compare commits
6 Commits
2fda92f712
...
nextcloud_
| Author | SHA1 | Date | |
|---|---|---|---|
| 669b355d99 | |||
| 03846d5e7f | |||
|
add299c242
|
|||
| e8f929a35a | |||
| 42f2c91b8e | |||
| 7bee418e79 |
@@ -49,10 +49,6 @@ in
|
|||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://10.0.0.10";
|
proxyPass = "http://10.0.0.10";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size 10G;
|
|
||||||
client_body_timeout 3600s;
|
|
||||||
send_timeout 3600s;
|
|
||||||
fastcgi_buffers 64 4K;
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -165,10 +165,7 @@ in
|
|||||||
proxyPass = "http://10.0.0.13";
|
proxyPass = "http://10.0.0.13";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
|
client_max_body_size 10G;
|
||||||
client_body_timeout 3600s;
|
|
||||||
send_timeout 3600s;
|
|
||||||
fastcgi_buffers 64 4K;
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -31,10 +31,6 @@ with lib;
|
|||||||
lokiHost = "10.0.0.14";
|
lokiHost = "10.0.0.14";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.postgresqlBackup = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud32;
|
package = pkgs.nextcloud32;
|
||||||
@@ -52,11 +48,39 @@ with lib;
|
|||||||
extraAppsEnable = true;
|
extraAppsEnable = true;
|
||||||
extraApps = {
|
extraApps = {
|
||||||
inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
|
inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
|
||||||
deck = pkgs.fetchNextcloudApp {
|
|
||||||
sha256 = "sha256-epjwIANb6vTNx9KqaG6jZc14YPoFMBTCj+/c9JHcWkA=";
|
deckWithDrag = pkgs.php.buildComposerProject (finalAttrs: {
|
||||||
url = "https://link.storjshare.io/raw/jvrl62dakd6htpyxohjkiiqiw5ma/mal/deck32.tar.gz";
|
pname = "deck";
|
||||||
license = "agpl3Plus";
|
version = "1.0.0";
|
||||||
};
|
src = pkgs.fetchzip {
|
||||||
|
url = "https://github.com/nextcloud/deck/archive/refs/heads/stable32.zip";
|
||||||
|
hash = "sha256-eMHjfki+axEtlhV6518mlAzPhZxAZqEX7HiRsJf1vxo=";
|
||||||
|
};
|
||||||
|
composerNoDev = true;
|
||||||
|
vendorHash = pkgs.lib.fakeHash;
|
||||||
|
postInstall = ''
|
||||||
|
cp -r $out/share/php/deck/* $out/
|
||||||
|
rm -r $out/share
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
|
||||||
|
#deckWithDrag = pkgs.fetchNextcloudApp {
|
||||||
|
# appName = "deck";
|
||||||
|
# appVersion = "1.16.2";
|
||||||
|
# license = "agpl3Plus";
|
||||||
|
# teams = [ pkgs.lib.teams.nextcloud ];
|
||||||
|
# url = "https://github.com/nextcloud-releases/deck/releases/download/v1.16.2/deck-v1.16.2.tar.gz";
|
||||||
|
# hash = "sha256-rFymTIr7pOuMES3DMIOS7cvq+CEIekLZYLqz58TOP04=";
|
||||||
|
# description = "";
|
||||||
|
# homepage = "https://github.com/nextcloud/deck";
|
||||||
|
# unpack = true;
|
||||||
|
# patches = [
|
||||||
|
# (pkgs.fetchpatch {
|
||||||
|
# url = "https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761.patch";
|
||||||
|
# sha256 = "sha256-agwFMwXO8WLL0+pdeKF/pA59V9ah9t590sCl1msQonA=";
|
||||||
|
# })
|
||||||
|
# ];
|
||||||
|
#};
|
||||||
};
|
};
|
||||||
settings = {
|
settings = {
|
||||||
trusted_domains = ["10.0.0.13"];
|
trusted_domains = ["10.0.0.13"];
|
||||||
|
|||||||
@@ -45,10 +45,6 @@ with lib;
|
|||||||
proxyPass = "http://10.100.0.101";
|
proxyPass = "http://10.100.0.101";
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
|
|
||||||
client_body_timeout 3600s;
|
|
||||||
send_timeout 3600s;
|
|
||||||
fastcgi_buffers 64 4K;
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
57
outputs.nix
57
outputs.nix
@@ -74,6 +74,63 @@ in (utils.lib.eachSystem (builtins.filter filter_system utils.lib.defaultSystems
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#deckWithDrag = pkgs.buildNpmPackage {
|
||||||
|
# name = "deckWithDrag";
|
||||||
|
# version = "1.16.2";
|
||||||
|
# src = pkgs.fetchFromGitHub {
|
||||||
|
# owner = "nextcloud";
|
||||||
|
# repo = "deck";
|
||||||
|
# rev = "v1.16.2";
|
||||||
|
# hash = "sha256-NBkCdMjIY2r+AgCLBt4YnD4sUW7GTKxT5vHAmpk4wno=";
|
||||||
|
# leaveDotGit = true;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# makeCacheWritable = true;
|
||||||
|
# npmDepsHash = "sha256-VaKfpYFtrTUvGbKORPvex1FvLz4vR7zfHAf+fdf/6OE=";
|
||||||
|
|
||||||
|
# buildInputs = with pkgs; [
|
||||||
|
# gnumake krankerl php84Packages.composer php nodejs_24
|
||||||
|
# ];
|
||||||
|
|
||||||
|
# patches = [
|
||||||
|
# (pkgs.fetchpatch {
|
||||||
|
# url = "https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761.patch";
|
||||||
|
# sha256 = "sha256-agwFMwXO8WLL0+pdeKF/pA59V9ah9t590sCl1msQonA=";
|
||||||
|
# })
|
||||||
|
# ];
|
||||||
|
|
||||||
|
# buildPhase = ''
|
||||||
|
# ${pkgs.krankerl}/bin/krankerl package
|
||||||
|
# '';
|
||||||
|
#};
|
||||||
|
|
||||||
|
deckWithDrag = pkgs.stdenv.mkDerivation {
|
||||||
|
name = "deckWithDrag";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "nextcloud";
|
||||||
|
repo = "deck";
|
||||||
|
rev = "v1.16.2";
|
||||||
|
hash = "sha256-NBkCdMjIY2r+AgCLBt4YnD4sUW7GTKxT5vHAmpk4wno=";
|
||||||
|
leaveDotGit = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
gnumake krankerl php84Packages.composer php nodejs_24
|
||||||
|
];
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
(pkgs.fetchpatch {
|
||||||
|
url = "https://git.dynamicdiscord.de/ahtlon/deck/commit/77cbcf42ca80dd32e450839f02faca2e5fed3761.patch";
|
||||||
|
sha256 = "sha256-agwFMwXO8WLL0+pdeKF/pA59V9ah9t590sCl1msQonA=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
make release
|
||||||
|
#${pkgs.krankerl}/bin/krankerl package
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
run-vm = pkgs.writeShellScriptBin "run-vm" (builtins.readFile ./scripts/run-vm.sh);
|
run-vm = pkgs.writeShellScriptBin "run-vm" (builtins.readFile ./scripts/run-vm.sh);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user