updated collabora docker
This commit is contained in:
parent
cf64ff1616
commit
87cca163b0
@ -187,6 +187,11 @@ in
|
|||||||
http2 = true;
|
http2 = true;
|
||||||
locations = {
|
locations = {
|
||||||
# static files
|
# static files
|
||||||
|
"^~ /browser" = {
|
||||||
|
proxyPass = cfgC.local;
|
||||||
|
extraConfig = commonProxyConfig;
|
||||||
|
};
|
||||||
|
# Legacy static files (for compatibility)
|
||||||
"^~ /loleaflet" = {
|
"^~ /loleaflet" = {
|
||||||
proxyPass = cfgC.local;
|
proxyPass = cfgC.local;
|
||||||
extraConfig = commonProxyConfig;
|
extraConfig = commonProxyConfig;
|
||||||
@ -202,11 +207,21 @@ in
|
|||||||
extraConfig = commonProxyConfig;
|
extraConfig = commonProxyConfig;
|
||||||
};
|
};
|
||||||
# download, presentation, image upload and websocket
|
# download, presentation, image upload and websocket
|
||||||
|
"~ ^/cool" = {
|
||||||
|
proxyPass = cfgC.local;
|
||||||
|
extraConfig = commonWebsocketConfig;
|
||||||
|
};
|
||||||
|
# Legacy websocket (for compatibility)
|
||||||
"~ ^/lool" = {
|
"~ ^/lool" = {
|
||||||
proxyPass = cfgC.local;
|
proxyPass = cfgC.local;
|
||||||
extraConfig = commonWebsocketConfig;
|
extraConfig = commonWebsocketConfig;
|
||||||
};
|
};
|
||||||
# Admin Console websocket
|
# Admin Console websocket
|
||||||
|
"^~ /cool/adminws" = {
|
||||||
|
proxyPass = cfgC.local;
|
||||||
|
extraConfig = commonWebsocketConfig;
|
||||||
|
};
|
||||||
|
# Legacy Admin Console websocket (for compatibility)
|
||||||
"^~ /lool/adminws" = {
|
"^~ /lool/adminws" = {
|
||||||
proxyPass = cfgC.local;
|
proxyPass = cfgC.local;
|
||||||
extraConfig = commonWebsocketConfig;
|
extraConfig = commonWebsocketConfig;
|
||||||
@ -231,23 +246,23 @@ in
|
|||||||
};
|
};
|
||||||
collabora = lib.mkIf cfgC.enable {
|
collabora = lib.mkIf cfgC.enable {
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
image = "collabora/code";
|
image = "collabora/code:latest";
|
||||||
imageFile = pkgs.dockerTools.pullImage {
|
|
||||||
imageName = "collabora/code";
|
|
||||||
imageDigest = "sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
|
|
||||||
sha256 = "sha256-M66lynhzaOEFnE15Sy1N6lBbGDxwNw6ap+IUJAvoCLs=";
|
|
||||||
};
|
|
||||||
ports = [ "9980:9980" ];
|
ports = [ "9980:9980" ];
|
||||||
environment = {
|
environment = {
|
||||||
TZ = config.my.timeZone;
|
TZ = config.my.timeZone;
|
||||||
domain = cfg.host;
|
domain = cfg.host;
|
||||||
aliasgroup1 = "${cfg.host}:443";
|
aliasgroup1 = "${cfg.url}:443";
|
||||||
aliasgroup2 = "cloud.rotehaare.art:443";
|
aliasgroup2 = "https://cloud.rotehaare.art:443";
|
||||||
|
server_name = cfgC.host;
|
||||||
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 = ''
|
||||||
--o:ssl.enable=false
|
--o:ssl.enable=false
|
||||||
--o:ssl.termination=true
|
--o:ssl.termination=true
|
||||||
|
--o:remote_font_config.url=${cfg.url}/apps/richdocuments/settings/fonts.json
|
||||||
|
--o:logging.level=information
|
||||||
'';
|
'';
|
||||||
|
DONT_GEN_SSL_CERT = "1";
|
||||||
|
SLEEPFORDEBUGGER = "0";
|
||||||
};
|
};
|
||||||
extraOptions = [
|
extraOptions = [
|
||||||
"--cap-add"
|
"--cap-add"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user