jawz/NixOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collabora disabled (broken)

Browse Source
This commit is contained in:
Danilo Reyes 2024-07-06 14:52:51 -06:00
parent cf1143a3fc
commit c2542bd98b
2 changed files with 44 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/miniserver/configuration.nix
View File

@ -40,7 +40,7 @@
adguardhome.enable = false; adguardhome.enable = false;
audiobookshelf.enable = true; audiobookshelf.enable = true;
bazarr.enable = false; bazarr.enable = false;
collabora.enable = true; collabora.enable = false;
flame.enable = true; flame.enable = true;
flameSecret.enable = true; flameSecret.enable = true;
go-vod.enable = false; go-vod.enable = false;
@ -117,9 +117,7 @@
openFirewall = true; openFirewall = true;
settings = { settings = {
inotify = "yes"; inotify = "yes";
media_dir = [ media_dir = [ "/mnt/pool/" ];
"/mnt/pool/"
];
}; };
}; };
}; };

86
modules/servers/nextcloud.nix
View File

@ -3,7 +3,7 @@ let
inherit (config.my) localhost; inherit (config.my) localhost;
collaboraPort = 9980; collaboraPort = 9980;
url = "cloud.${config.my.domain}"; url = "cloud.${config.my.domain}";
urlSecret = "cloud.${config.my.domainSecret}"; urlSecret = "collabora.${config.my.domainSecret}";
collaboraProxy = "http://${localhost}:${toString collaboraPort}"; collaboraProxy = "http://${localhost}:${toString collaboraPort}";
commonProxyConfig = '' commonProxyConfig = ''
proxy_set_header Host $host; proxy_set_header Host $host;
@ -75,9 +75,9 @@ in {
enableImagemagick = true; enableImagemagick = true;
maxUploadSize = "16G"; maxUploadSize = "16G";
hostName = url; hostName = url;
extraApps = { # extraApps = {
inherit (config.services.nextcloud.package.packages.apps) calendar; # inherit (config.services.nextcloud.package.packages.apps) calendar;
}; # };
config = { config = {
adminpassFile = config.sops.secrets.nextcloud-adminpass.path; adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
dbtype = "pgsql"; dbtype = "pgsql";
@ -114,10 +114,9 @@ in {
trusted_domains = [ "cloud.rotehaare.art" "danilo-reyes.com" ]; trusted_domains = [ "cloud.rotehaare.art" "danilo-reyes.com" ];
overwrite_protocol = "https"; overwrite_protocol = "https";
default_phone_region = "MX"; default_phone_region = "MX";
"allow_local_remote_servers" = true; allow_local_remote_servers = true;
mail_smtpmode = "sendmail"; mail_smtpmode = "sendmail";
mail_sendmailmode = "pipe"; mail_sendmailmode = "pipe";
"installed" = true;
"memories.exiftool" = "memories.exiftool" =
"/etc/profiles/per-user/nextcloud/bin/exiftool"; "/etc/profiles/per-user/nextcloud/bin/exiftool";
enabledPreviewProviders = [ enabledPreviewProviders = [
@ -130,8 +129,8 @@ in {
"OC\\Preview\\Movie" "OC\\Preview\\Movie"
]; ];
}; };
phpExtraExtensions = all: [ all.pdlib all.bz2 ]; # phpExtraExtensions = all: [ all.pdlib all.bz2 ];
# phpExtraExtensions = all: [ ]; phpExtraExtensions = all: [ ];
}; };
nginx = { nginx = {
enable = true; enable = true;
@ -147,39 +146,38 @@ in {
{ }; { };
}; };
}; };
"collabora.${config.my.domainSecret}" = ${urlSecret} = lib.mkIf config.my.servers.collabora.enable {
lib.mkIf config.my.servers.collabora.enable { forceSSL = true;
forceSSL = true; enableACME = true;
enableACME = true; http2 = true;
http2 = true; locations = {
locations = { # static files
# static files "^~ /loleaflet" = {
"^~ /loleaflet" = { proxyPass = collaboraProxy;
proxyPass = collaboraProxy; extraConfig = commonProxyConfig;
extraConfig = commonProxyConfig; };
}; # WOPI discovery URL
# WOPI discovery URL "^~ /hosting/discovery" = {
"^~ /hosting/discovery" = { proxyPass = collaboraProxy;
proxyPass = collaboraProxy; extraConfig = commonProxyConfig;
extraConfig = commonProxyConfig; };
}; # Capabilities
# Capabilities "^~ /hosting/capabilities" = {
"^~ /hosting/capabilities" = { proxyPass = collaboraProxy;
proxyPass = collaboraProxy; extraConfig = commonProxyConfig;
extraConfig = commonProxyConfig; };
}; # download, presentation, image upload and websocket
# download, presentation, image upload and websocket "~ ^/lool" = {
"~ ^/lool" = { proxyPass = collaboraProxy;
proxyPass = collaboraProxy; extraConfig = commonWebsocketConfig;
extraConfig = commonWebsocketConfig; };
}; # Admin Console websocket
# Admin Console websocket "^~ /lool/adminws" = {
"^~ /lool/adminws" = { proxyPass = collaboraProxy;
proxyPass = collaboraProxy; extraConfig = commonWebsocketConfig;
extraConfig = commonWebsocketConfig;
};
}; };
}; };
};
}; };
}; };
}; };
@ -203,14 +201,14 @@ in {
imageFile = pkgs.dockerTools.pullImage { imageFile = pkgs.dockerTools.pullImage {
imageName = "collabora/code"; imageName = "collabora/code";
imageDigest = imageDigest =
"sha256:1747d1b58ac595df63fb651c4533983bbb556b0a5427f9a14dc4d9e75bda6aff"; "sha256:1344721df441b7b59f6372a62cd46fa75c8bf02082edc64dfe9dade8c734085d";
sha256 = "sha256-sIGLGsHMYqkboMlRnSN6eiy+iyKYj+wKvt48Hxirp00="; sha256 = "sha256-pRhcSYdbMNNn3HQ8yTj+qetH4Ns7IPWOOQcmeLSNbIU=";
}; };
ports = [ "9980:9980" ]; ports = [ "9980:9980" ];
environment = { environment = {
TZ = "America/Mexico_City"; TZ = "America/Mexico_City";
domain = urlSecret; domain = "cloud.servidos.lat";
aliasgroup1 = "${url}:443"; aliasgroup1 = "cloud.servidos.lat:443";
aliasgroup2 = "cloud.rotehaare.art:443"; aliasgroup2 = "cloud.rotehaare.art:443";
dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru"; dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
extra_params = '' extra_params = ''
@ -218,7 +216,7 @@ in {
--o:ssl.termination=true --o:ssl.termination=true
''; '';
}; };
extraOptions = [ "--cap-add=MKNOD" ]; extraOptions = [ "--cap-add" "MKNOD" ];
}; };
}; };
systemd = lib.mkIf config.my.servers.nextcloud.enableCron { systemd = lib.mkIf config.my.servers.nextcloud.enableCron {