feat(nextcloud): Deploy collabora without docker
All checks were successful
Check meta / check_dns (pull_request) Successful in 20s
Check meta / check_meta (pull_request) Successful in 17s
Check workflows / check_workflows (pull_request) Successful in 23s
Build all the nodes / ap01 (pull_request) Successful in 1m18s
Build all the nodes / bridge01 (pull_request) Successful in 1m54s
Build all the nodes / geo01 (pull_request) Successful in 1m55s
Build all the nodes / geo02 (pull_request) Successful in 2m0s
Build all the nodes / compute01 (pull_request) Successful in 2m19s
Build all the nodes / rescue01 (pull_request) Successful in 2m21s
Build all the nodes / storage01 (pull_request) Successful in 2m7s
Run pre-commit on all files / check (pull_request) Successful in 38s
Build all the nodes / vault01 (pull_request) Successful in 2m1s
Build all the nodes / web02 (pull_request) Successful in 1m52s
Build all the nodes / web03 (pull_request) Successful in 1m46s
Build all the nodes / web01 (pull_request) Successful in 2m37s
Build all the nodes / ap01 (push) Successful in 1m24s
Build all the nodes / bridge01 (push) Successful in 1m56s
Build all the nodes / geo02 (push) Successful in 1m56s
Build all the nodes / geo01 (push) Successful in 2m4s
Build all the nodes / rescue01 (push) Successful in 2m30s
Build all the nodes / compute01 (push) Successful in 2m31s
Run pre-commit on all files / check (push) Successful in 38s
Build all the nodes / storage01 (push) Successful in 2m1s
Build all the nodes / web02 (push) Successful in 1m55s
Build all the nodes / vault01 (push) Successful in 2m8s
Build all the nodes / web03 (push) Successful in 1m49s
Build all the nodes / web01 (push) Successful in 2m38s

This commit is contained in:
Tom Hubrecht 2024-12-10 15:40:30 +01:00 committed by thubrecht
parent b23312dcaa
commit fe19171d85
2 changed files with 164 additions and 157 deletions

View file

@ -1,4 +1,9 @@
{ config, pkgs, ... }: {
config,
pkgs,
nixpkgs,
...
}:
let let
host = "cloud.dgnum.eu"; host = "cloud.dgnum.eu";
@ -7,7 +12,9 @@ let
port = 9980; port = 9980;
in in
{ {
services.nextcloud = {
services = {
nextcloud = {
enable = true; enable = true;
hostName = host; hostName = host;
@ -87,43 +94,30 @@ in
}; };
}; };
virtualisation = { collabora-online = {
podman = {
enable = true; enable = true;
defaultNetwork.settings = { inherit port;
dns_enable = true;
ipv6_enabled = true; package = nixpkgs.nixos.unstable.collabora-online;
};
}; settings = {
server_name = "code.dgnum.eu";
ssl = {
enable = false;
termination = true;
}; };
virtualisation.oci-containers = { remote_font_config.url = "https://cloud.dgnum.eu/apps/richdocuments/settings/fonts.json";
containers.collabora = {
image = "collabora/code"; net.proto = "IPv4";
imageFile = pkgs.dockerTools.pullImage {
imageName = "collabora/code";
imageDigest = "sha256:07da8a191b37058514dfdf921ea8c2270c6634fa659acee774cf8594f86950e4";
sha256 = "sha256-5oaz07NQScHUVN/HznzZGQ2bGrU/V1GhI+9btXHz0GM=";
};
ports = [ "${builtins.toString port}:${builtins.toString port}" ];
environment = {
domain = "cloud.dgnum.eu";
extra_params = "--o:ssl.enable=false --o:ssl.termination=true --o:remote_font_config.url=https://cloud.dgnum.eu/apps/richdocuments/settings/fonts.json";
};
extraOptions = [
"--network=host"
"--cap-add"
"MKNOD"
"--cap-add"
"SYS_ADMIN"
];
};
}; };
dgn-web.internalPorts.collabora = port; aliasGroups = [ { host = "https://cloud.dgnum.eu"; } ];
};
services.nginx.virtualHosts = { nginx.virtualHosts = {
${host} = { ${host} = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
@ -182,6 +176,9 @@ in
''; '';
}; };
}; };
};
dgn-web.internalPorts.collabora = port;
systemd.services = { systemd.services = {
nextcloud-preview = { nextcloud-preview = {
@ -200,6 +197,10 @@ in
networking.hosts = { networking.hosts = {
"129.199.146.148" = [ "s3.dgnum.eu" ]; "129.199.146.148" = [ "s3.dgnum.eu" ];
"129.199.146.147" = [
"code.dgnum.eu"
"cloud.dgnum.eu"
];
}; };
age-secrets.autoMatch = [ "nextcloud" ]; age-secrets.autoMatch = [ "nextcloud" ];

View file

@ -48,6 +48,12 @@ in
excludes = [ ".git-blame-ignore-revs" ]; excludes = [ ".git-blame-ignore-revs" ];
hash = "sha256-ca7CsPuWJqucC77ejsvoDAt+wxWLUP30IdXtZQVQrko="; hash = "sha256-ca7CsPuWJqucC77ejsvoDAt+wxWLUP30IdXtZQVQrko=";
} }
# Add Collabora Online
{
id = 330708;
hash = "sha256-655zkmch5VLXEUzhT6+b7QpywslDoIMZ8mY0II55Wlw=";
}
]; ];
"nixos-unstable" = [ "nixos-unstable" = [