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

COLLABORA WORKS!!!

Browse Source
This commit is contained in:
Danilo Reyes 2023-12-20 21:38:49 -06:00
parent 67a5e79952
commit d0afa9fa27
3 changed files with 99 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
server/docker.nix
View File

@ -9,39 +9,38 @@
storageDriver = "btrfs";
};
oci-containers = {
backend = "docker";
containers.collabora = {
image = "collabora/code";
imageFile = pkgs.dockerTools.pullImage {
imageName = "collabora/code";
imageDigest =
"sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
sha256 = "sha256-M66lynhzaOEFnE15Sy1N6lBbGDxwNw6ap+IUJAvoCLs=";
};
ports = [ "9980:9980" ];
environment = {
domain = "cloud.servidos.lat";
dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
extra_params = "--o:ssl.enable=false --o:ssl.termination=true";
};
extraOptions = [ "--cap-add" "MKNOD" ];
};
};
# arion = {
# oci-containers = {
# backend = "docker";
# "collabora".settings.services."collabora".service = {
# image = "collabora/code";
# ports = [ "9980:9980/tcp" ];
# containers = {
# flaresolverr = {
# image = "ghcr.io/flaresolverr/flaresolverr:latest";
# # imageFile = pkgs.dockerTools.pullImage {
# # imageName = "ghcr.io/flaresolverr/flaresolverr:latest";
# # };
# ports = [ "8191:8191" ];
# environment = {
# server_name = "collabora.servidos.lat";
# aliasgroup1 = "https://cloud.servidos.lat:443";
# dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
# username = "jawz";
# password = "password";
# extra_params = "--o:ssl.enable=false --o:ssl.termination=true";
# TZ = "America/Mexico_City";
# LOG_LEVEL = "\${LOG_LEVEL:-info}";
# LOG_HTML = "\${LOG_HTML:-false}";
# CAPTCHA_SOLVER = "\${CAPTCHA_SOLVER:-none}";
# };
# extraOptions = [ "--pull=newer" ];
# };
# # # collabora = {
# # # image = "collabora/code";
# # # imageFile = pkgs.dockerTools.pullImage {
# # # imageName = "collabora/code";
# # # imageDigest =
# # # "sha256:aab41379baf5652832e9237fcc06a768096a5a7fccc66cf8bd4fdb06d2cbba7f";
# # # sha256 = "sha256-M66lynhzaOEFnE15Sy1N6lBbGDxwNw6ap+IUJAvoCLs=";
# # # };
# # # ports = [ "9980:9980" ];
# # # environment = {
# # # domain = "cloud.servidos.lat";
# # # dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
# # # extra_params = "--o:ssl.enable=false --o:ssl.termination=true";
# # # };
# # # extraOptions = [ "--cap-add" "MKNOD" ];
# # # };
# };
# };
};

29
server/nginx.nix
View File

@ -6,7 +6,6 @@
let
localhost = "127.0.0.1";
workstation = "192.168.1.64";
collabora = "http://127.0.0.1:9980";
jellyfinPort = "8096";
nextcloudPort = 80;
flamePort = 5005;
@ -75,6 +74,7 @@ in {
map $request_uri $h264Level { ~(h264-level=)(.+?)& $2; }
map $request_uri $h264Profile { ~(h264-profile=)(.+?)& $2; }
## upload configs
proxy_read_timeout 600;
proxy_connect_timeout 600;
@ -141,33 +141,6 @@ in {
};
};
};
"collabora.servidos.lat" = let
collaboraLocation = {
proxyPass = collabora;
extraConfig = ''
proxy_set_header Host $host;
'';
};
socketConfig = ''
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
proxy_read_timeout 36000s;
'';
in base {
"^~ /browser" = collaboraLocation;
"^~ /hosting/discovery" = collaboraLocation;
"^~ /hosting/capabilities" = collaboraLocation;
"~ ^/(c|l)ool" = collaboraLocation;
"~ ^/cool/(.*)/ws$" = {
proxyPass = collabora;
extraConfig = socketConfig;
};
"^~ /cool/adminws" = {
proxyPass = collabora;
extraConfig = socketConfig;
};
};
"flix.servidos.lat" = {
forceSSL = true;
enableACME = true;

40
server/servers.nix
View File

@ -198,26 +198,26 @@ in {
};
systemd = {
services = {
# docker-compose = {
# enable = true;
# restartIfChanged = true;
# description = "Start docker-compose servers";
# after = [ "docker.service" "docker.socket" ];
# requires = [ "docker.service" "docker.socket" ];
# wantedBy = [ "default.target" ];
# environment = {
# FILE = "/home/jawz/Development/Docker/docker-compose.yml";
# };
# path = [ pkgs.docker-compose ];
# serviceConfig = {
# Restart = "on-failure";
# RestartSec = 30;
# ExecStart =
# "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
# ExecStop =
# "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down";
# };
# };
docker-compose = {
enable = true;
restartIfChanged = true;
description = "Start docker-compose servers";
after = [ "docker.service" "docker.socket" ];
requires = [ "docker.service" "docker.socket" ];
wantedBy = [ "default.target" ];
environment = {
FILE = "/home/jawz/Development/Docker/docker-compose.yml";
};
path = [ pkgs.docker-compose ];
serviceConfig = {
Restart = "on-failure";
RestartSec = 30;
ExecStart =
"${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
ExecStop =
"${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down";
};
};
nextcloud-cronjob = let
jawzNextcloudCronjob = pkgs.writeScriptBin "nextcloud-cronjob"
(builtins.readFile ../scripts/nextcloud-cronjob.sh);